From: Michael Chapman <mike@very.puzzling.org>
Date: Mon, 30 Mar 2015 02:40:59 +0000 (+1100)
Subject: qemu: fix error propagation in qemuMigrationBegin
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=77ddd0bba2379b4ba33980d8f3976f9344451cca;p=libvirt.git

qemu: fix error propagation in qemuMigrationBegin

If virCloseCallbacksSet fails, qemuMigrationBegin must return NULL to
indicate an error occurred.

Signed-off-by: Michael Chapman <mike@very.puzzling.org>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 8c45415b7e..724e3ff24b 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2761,8 +2761,10 @@ qemuMigrationBegin(virConnectPtr conn,
          * place.
          */
         if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn,
-                                 qemuMigrationCleanup) < 0)
+                                 qemuMigrationCleanup) < 0) {
+            VIR_FREE(xml);
             goto endjob;
+        }
         qemuMigrationJobContinue(vm);
     } else {
         goto endjob;