[libvirt] [PATCH 1/2] Add exit_monitor label to qemuMigrationStartNBDServer

Wednesday, 30 October 2013

---
 src/qemu/qemu_migration.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index cb59620..5607098 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1117,14 +1117,11 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
         if (!port &&
             ((virPortAllocatorAcquire(driver->remotePorts, &port) < 0) ||
              (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0))) {
-            qemuDomainObjExitMonitor(driver, vm);
-            goto cleanup;
+            goto exit_monitor;
         }
 
-        if (qemuMonitorNBDServerAdd(priv->mon, diskAlias, true) < 0) {
-            qemuDomainObjExitMonitor(driver, vm);
-            goto cleanup;
-        }
+        if (qemuMonitorNBDServerAdd(priv->mon, diskAlias, true) < 0)
+            goto exit_monitor;
         qemuDomainObjExitMonitor(driver, vm);
     }
 
@@ -1136,6 +1133,10 @@ cleanup:
     if (ret < 0)
         virPortAllocatorRelease(driver->remotePorts, port);
     return ret;
+
+exit_monitor:
+    qemuDomainObjExitMonitor(driver, vm);
+    goto cleanup;
 }
 
 /**
-- 
1.8.1.5


    