[Xen-changelog] [xen-unstable] libxl: do not try to redo incoming migration on reboot of migrated domain

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1317145155 -3600
# Node ID 59c7213b5949e9a2401c60aa5c88726db66112fc
# Parent  bfa65eb40b2a78c78491617af3897f0d86007046
libxl: do not try to redo incoming migration on reboot of migrated domain

After a migration, reboot was trying to receive another incoming
migration, instead of restarting the domain it already has.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Tested-by: Andreas Olsowski <andreas.olsowski@xxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r bfa65eb40b2a -r 59c7213b5949 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Tue Sep 27 18:03:11 2011 +0100
+++ b/tools/libxl/xl_cmdimpl.c  Tue Sep 27 18:39:15 2011 +0100
@@ -1516,6 +1516,11 @@
         ret = libxl_domain_create_restore(ctx, &d_config,
                                             cb, &child_console_pid,
                                             &domid, restore_fd);
+        /*
+         * On subsequent reboot etc we should create the domain, not
+         * restore/migrate-receive it again.
+         */
+        restore_file = NULL;
     }else{
         ret = libxl_domain_create_new(ctx, &d_config,
                                         cb, &child_console_pid, &domid);

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