From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 15 Feb 2012 15:48:54 +0000 (+0100)
Subject: qemu: Unlock monitor when connecting to dest qemu fails
X-Git-Tag: v0.9.11-rc1~248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0d4b0db9e4cc045d9660f955ddccfabd098a91b;p=thirdparty%2Flibvirt.git

qemu: Unlock monitor when connecting to dest qemu fails

When migrating a qemu domain, we enter the monitor, send some commands,
try to connect to destination qemu, send other commands, end exit the
monitor. However, if we couldn't connect to destination qemu we forgot
to exit the monitor.

Bug introduced by commit d9d518b1c8ef3b65658cc91f85ba33a63c0959a4.
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a513b3c078..f0af49417a 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1624,8 +1624,10 @@ qemuMigrationRun(struct qemud_driver *driver,
 
     /* connect to the destination qemu if needed */
     if (spec->destType == MIGRATION_DEST_CONNECT_HOST &&
-        qemuMigrationConnect(driver, vm, spec) < 0)
+        qemuMigrationConnect(driver, vm, spec) < 0) {
+        qemuDomainObjExitMonitorWithDriver(driver, vm);
         goto cleanup;
+    }
 
     switch (spec->destType) {
     case MIGRATION_DEST_HOST: