From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 8 Jan 2016 13:06:52 +0000 (+0100)
Subject: qemu: Don't kill running migrated domain on daemon restart
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f6ea8a9f19d4e1820e6e4be39ee7bf8297a01626;p=libvirt.git

qemu: Don't kill running migrated domain on daemon restart

When destination libvirtd is restarted during migration in Finish phase
just after the point we started guest CPUs, we should not kill the
domain.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 52a30f2e3c..ae47fe0c5c 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3173,9 +3173,13 @@ qemuProcessRecoverMigration(virQEMUDriverPtr driver,
 
         case QEMU_MIGRATION_PHASE_FINISH3:
             /* migration finished, we started resuming the domain but didn't
-             * confirm success or failure yet; killing it seems safest */
-            VIR_DEBUG("Killing migrated domain %s", vm->def->name);
-            return -1;
+             * confirm success or failure yet; killing it seems safest unless
+             * we already started guest CPUs */
+            if (state != VIR_DOMAIN_RUNNING) {
+                VIR_DEBUG("Killing migrated domain %s", vm->def->name);
+                return -1;
+            }
+            break;
         }
     } else if (job == QEMU_ASYNC_JOB_MIGRATION_OUT) {
         switch (phase) {