From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 26 Sep 2011 11:36:37 +0000 (+0200)
Subject: qemu: Always remove domain object if MigratePrepare fails
X-Git-Tag: v0.9.7-rc1~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb031a2bb3f1ea6b02fad8f677171e330767cff;p=thirdparty%2Flibvirt.git

qemu: Always remove domain object if MigratePrepare fails

If migration failed in Prepare phase after virDomainAssignDef and before
a job was started, the domain object was not properly removed.
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index ef48d65af0..be6d0e0f41 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1178,8 +1178,12 @@ cleanup:
     virDomainDefFree(def);
     VIR_FORCE_CLOSE(dataFD[0]);
     VIR_FORCE_CLOSE(dataFD[1]);
-    if (vm)
-        virDomainObjUnlock(vm);
+    if (vm) {
+        if (ret >= 0 || vm->persistent)
+            virDomainObjUnlock(vm);
+        else
+            qemuDomainRemoveInactive(driver, vm);
+    }
     if (event)
         qemuDomainEventQueue(driver, event);
     qemuMigrationCookieFree(mig);
@@ -1188,9 +1192,6 @@ cleanup:
 endjob:
     if (qemuMigrationJobFinish(driver, vm) == 0) {
         vm = NULL;
-    } else if (!vm->persistent) {
-        qemuDomainRemoveInactive(driver, vm);
-        vm = NULL;
     }
     goto cleanup;
 }