File 555de7bb-xl-migrate-live.patch of Package xen.7317

commit ab373fcac40a50fcb35cf7a6ccd0243d7cd18ee0
Author: Ian Jackson <ian.jackson@eu.citrix.com>
Date:   Thu May 14 13:41:26 2015 +0100

    xl: Support (by ignoring) xl migrate --live
    
    xm migrate would do non-live migration (effectively, save, transfer
    and restore) by default, unless you specified --live.
    
    xl migrate always does live migration.  Honour (by ignoring) --live
    for compatibility with old callers.  Document this.
    
    (This patch should be backported as far as possible.)
    
    See Also: c2d58b03d138a999ca7f1b894121489eba70b8e7

    Reported-by: Matthew Vernon <mcv21@cam.ac.uk>
    Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
    CC: Matthew Vernon <mcv21@cam.ac.uk>
    Acked-by: Ian Campbell <ian.campbell@citrix.com>

Index: xen-4.4.4-testing/docs/man/xl.pod.1
===================================================================
--- xen-4.4.4-testing.orig/docs/man/xl.pod.1
+++ xen-4.4.4-testing/docs/man/xl.pod.1
@@ -1336,6 +1336,18 @@ policy. Loading new security policy will
 
 =back
 
+=head1 IGNORED FOR COMPATIBILITY WITH XM
+
+xl is mostly command-line compatible with the old xm utility used with
+the old Python xend.  For compatibility, the following options are
+ignored:
+
+=over 4
+
+=item B<xl migrate --live>
+
+=back
+
 =head1 TO BE DOCUMENTED
 
 We need better documentation for:
Index: xen-4.4.4-testing/tools/libxl/xl_cmdimpl.c
===================================================================
--- xen-4.4.4-testing.orig/tools/libxl/xl_cmdimpl.c
+++ xen-4.4.4-testing/tools/libxl/xl_cmdimpl.c
@@ -4077,6 +4077,7 @@ int main_migrate(int argc, char **argv)
     int opt, daemonize = 1, monitor = 1, debug = 0;
     static struct option opts[] = {
         {"debug", 0, 0, 0x100},
+        {"live", 0, 0, 0x200},
         COMMON_LONG_OPTS,
         {0, 0, 0, 0}
     };
@@ -4095,9 +4096,12 @@ int main_migrate(int argc, char **argv)
         daemonize = 0;
         monitor = 0;
         break;
-    case 0x100:
+    case 0x100: /* --debug */
         debug = 1;
         break;
+    case 0x200: /* --live */
+        /* ignored for compatibility with xm */
+        break;
     }
 
     domid = find_domain(argv[optind]);
openSUSE Build Service is sponsored by