[Xen-changelog] [xen master] xl: Support (by ignoring) xl migrate --live

[patchbot@xxxxxxx]

commit ab373fcac40a50fcb35cf7a6ccd0243d7cd18ee0
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Thu May 14 13:41:26 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu May 21 15:12:11 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.)
    
    Reported-by: Matthew Vernon <mcv21@xxxxxxxxx>
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    CC: Matthew Vernon <mcv21@xxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 docs/man/xl.pod.1        |    8 ++++++++
 tools/libxl/xl_cmdimpl.c |    6 +++++-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1
index 02bf531..e16dbf7 100644
--- a/docs/man/xl.pod.1
+++ b/docs/man/xl.pod.1
@@ -1520,6 +1520,14 @@ monitor types are:
 
 =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:
+
+=item B<xl migrate --live>
+
 =head1 TO BE DOCUMENTED
 
 We need better documentation for:
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 8eaf1c7..5f23c8b 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -4521,6 +4521,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}
     };
@@ -4539,9 +4540,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]);
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog