On 06/25/2015 04:25 PM, Jiri Denemark wrote:
On Thu, Jun 25, 2015 at 09:38:57 +0800, Luyao Huang wrote:
If we get fail in qemuMigrationPrepareAny, we forget
check if the vm is persistent then always call
qemuDomainRemoveInactive to clean the inactive settings.
Add a check to avoid this. This issue was introduce in
commit 540c339.
Signed-off-by: Luyao Huang <lhu...@redhat.com>
---
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 47d49cd..a57a177 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)
ACK.
I rewrote the commit message and pushed this patch, thanks.
You are welcome, thanks for your quick review.
Jirka
Luyao
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
