bitkeeper revision 1.897 (40a0eb02jGwqt6POLmCY0eC1hpHfvw)

trivial merge

diff --cc tools/xc/py/Xc.c
index 97bff12492ee94679c685dc66259ac7458008b6b,974ad994b769da3767c1fad2bb4f989fda34f5e4..3b3081e2622e9e52c14f1df8ddd7b554cabdd658
--- 1/tools/xc/py/Xc.c
--- 2/tools/xc/py/Xc.c
+++ b/tools/xc/py/Xc.c
@@@ -190,19 -191,19 +191,19 @@@ static PyObject *pyxc_linux_save(PyObje
  
      u64   dom;
      char *state_file;
 -    int   progress = 1;
 +    int   progress = 1, live = 0;
      unsigned int flags = 0;
  
 -    static char *kwd_list[] = { "dom", "state_file", "progress", NULL };
 +    static char *kwd_list[] = { "dom", "state_file", "progress", "live", NULL };
  
 -    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "Ls|i", kwd_list, 
 -                                      &dom, &state_file, &progress) )
 +    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "Ls|ii", kwd_list, 
 +                                      &dom, &state_file, &progress, &live) )
          return NULL;
  
 -    if ( progress )
 -        flags |= XCFLAGS_VERBOSE;
 +    if (progress) flags |= XCFLAGS_VERBOSE;
 +    if (live)     flags |= XCFLAGS_LIVE;
  
-     if (strncmp(state_file,"tcp:", strlen("tcp:")) == 0)
+     if ( strncmp(state_file,"tcp:", strlen("tcp:")) == 0 )
      {
  #define max_namelen 64
        char server[max_namelen];

diff --cc xen/common/domain.c
Simple merge

diff --cc xen/common/memory.c
Simple merge

diff --cc xen/include/asm-i386/processor.h
Simple merge

diff --cc xenolinux-2.4.26-sparse/arch/xen/drivers/console/console.c
Simple merge

diff --cc xenolinux-2.4.26-sparse/arch/xen/mm/hypervisor.c
Simple merge

diff --cc xenolinux-2.4.26-sparse/arch/xen/mm/ioremap.c
Simple merge

diff --cc xenolinux-2.4.26-sparse/include/asm-xen/hypervisor.h
Simple merge