From 09444724bc85d75ea3250778701e2e3b3d016df5 Mon Sep 17 00:00:00 2001 From: Luyao Huang Date: Thu, 25 Jun 2015 09:38:57 +0800 Subject: [PATCH] qemu: Avoid removing persistent config if migration fails 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 Signed-off-by: Jiri Denemark --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 47d49cdf81..a57a177f7f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -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)