From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 4 Apr 2017 10:46:37 +0000 (+0200)
Subject: qemu: Break endless loop if qemuMigrationResetTLS fails
X-Git-Tag: v3.2.1~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3feb8fb79da1a52b95454509dec5172afcbaa5b8;p=thirdparty%2Flibvirt.git

qemu: Break endless loop if qemuMigrationResetTLS fails

Jumping to "endjob" label from a code after this label is not a very
good idea.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
(cherry picked from commit d658c8594e05d286de6af22ea88689d1d5e2a82b)
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index fcd3a38a19..992b6bd4a2 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -5356,9 +5356,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
                                  QEMU_ASYNC_JOB_MIGRATION_IN);
     }
 
-    if (qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN,
-                              NULL, NULL) < 0)
-        goto endjob;
+    qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, NULL, NULL);
 
     qemuMigrationJobFinish(driver, vm);
     if (!virDomainObjIsActive(vm))