]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Avoid removing persistent config if migration fails
authorLuyao Huang <lhuang@redhat.com>
Thu, 25 Jun 2015 01:38:57 +0000 (09:38 +0800)
committerJiri Denemark <jdenemar@redhat.com>
Thu, 25 Jun 2015 08:18:39 +0000 (10:18 +0200)
When migration fails in qemuMigrationPrepareAny, we unconditionally call
qemuDomainRemoveInactive, which should only be called for transient
domains. The check for !vm->persistent was accidentally removed by
commit 540c339.

Signed-off-by: Luyao Huang <lhuang@redhat.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
src/qemu/qemu_migration.c

index 47d49cdf8133c6a6a91440ae2e1dae584f6720e0..a57a177f7f2f66057197c484de164df5f6f1ac52 100644 (file)
@@ -3432,7 +3432,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
         VIR_FREE(priv->origname);
         virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
         priv->nbdPort = 0;
-        qemuDomainRemoveInactive(driver, vm);
+        if (!vm->persistent)
+            qemuDomainRemoveInactive(driver, vm);
     }
     virDomainObjEndAPI(&vm);
     if (event)