|
 |
6d3351 |
From e2f2737b6f9aa4ba8399e87e2eecbfbc77f9b2a4 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <e2f2737b6f9aa4ba8399e87e2eecbfbc77f9b2a4@dist-git>
|
|
|
6d3351 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
Date: Tue, 4 Apr 2017 12:46:37 +0200
|
|
|
6d3351 |
Subject: [PATCH] qemu: Break endless loop if qemuMigrationResetTLS fails
|
|
|
6d3351 |
|
|
|
6d3351 |
Jumping to "endjob" label from a code after this label is not a very
|
|
|
6d3351 |
good idea.
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
(cherry picked from commit d658c8594e05d286de6af22ea88689d1d5e2a82b)
|
|
|
6d3351 |
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1300769
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/qemu/qemu_migration.c | 4 +---
|
|
|
6d3351 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
6d3351 |
index fcd3a38a1..992b6bd4a 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_migration.c
|
|
|
6d3351 |
+++ b/src/qemu/qemu_migration.c
|
|
|
6d3351 |
@@ -5356,9 +5356,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
|
|
|
6d3351 |
QEMU_ASYNC_JOB_MIGRATION_IN);
|
|
|
6d3351 |
}
|
|
|
6d3351 |
|
|
|
6d3351 |
- if (qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN,
|
|
|
6d3351 |
- NULL, NULL) < 0)
|
|
|
6d3351 |
- goto endjob;
|
|
|
6d3351 |
+ qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, NULL, NULL);
|
|
|
6d3351 |
|
|
|
6d3351 |
qemuMigrationJobFinish(driver, vm);
|
|
|
6d3351 |
if (!virDomainObjIsActive(vm))
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|