]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: fix error propagation in qemuMigrationBegin
authorMichael Chapman <mike@very.puzzling.org>
Mon, 30 Mar 2015 02:40:59 +0000 (13:40 +1100)
committerCole Robinson <crobinso@redhat.com>
Tue, 28 Apr 2015 15:09:59 +0000 (11:09 -0400)
If virCloseCallbacksSet fails, qemuMigrationBegin must return NULL to
indicate an error occurred.

Signed-off-by: Michael Chapman <mike@very.puzzling.org>
(cherry picked from commit 77ddd0bba2379b4ba33980d8f3976f9344451cca)

src/qemu/qemu_migration.c

index 945860682748a827bb82c1f594afce2660b4c33a..21432c0b9830ba44d61e95e53239fe2a14706074 100644 (file)
@@ -2745,8 +2745,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;