From: iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Date: Tue, 11 May 2004 15:02:26 +0000 (+0000)
Subject: bitkeeper revision 1.897 (40a0eb02jGwqt6POLmCY0eC1hpHfvw)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~18224
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b9b46efd4f4454835d467a7e82296d3e91097120;p=xen.git

bitkeeper revision 1.897 (40a0eb02jGwqt6POLmCY0eC1hpHfvw)

trivial merge
---

b9b46efd4f4454835d467a7e82296d3e91097120
diff --cc tools/xc/py/Xc.c
index 97bff12492,974ad994b7..3b3081e262
--- a/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];