Blame SOURCES/libvirt-qemu-Don-t-reset-TLS-in-qemuMigrationCancel.patch
|
 |
3e5111 |
From 4060e79aee023bf56323ad6daf82c4aa1bde308b Mon Sep 17 00:00:00 2001
|
|
|
3e5111 |
Message-Id: <4060e79aee023bf56323ad6daf82c4aa1bde308b@dist-git>
|
|
|
3e5111 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
Date: Wed, 5 Apr 2017 14:44:26 +0200
|
|
|
3e5111 |
Subject: [PATCH] qemu: Don't reset TLS in qemuMigrationCancel
|
|
|
3e5111 |
|
|
|
3e5111 |
Migration parameters are either reset by the main migration code path or
|
|
|
3e5111 |
from qemuProcessRecoverMigration* in case libvirtd is restarted during
|
|
|
3e5111 |
migration.
|
|
|
3e5111 |
|
|
|
3e5111 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
(cherry picked from commit 133c73e75f278c4943cbe03333bb9a7ee897c23f)
|
|
|
3e5111 |
|
|
|
3e5111 |
https://bugzilla.redhat.com/show_bug.cgi?id=1425003
|
|
|
3e5111 |
|
|
|
3e5111 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
---
|
|
|
3e5111 |
src/qemu/qemu_migration.c | 3 ---
|
|
|
3e5111 |
1 file changed, 3 deletions(-)
|
|
|
3e5111 |
|
|
|
3e5111 |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
3e5111 |
index d8d89b011..6c9f14245 100644
|
|
|
3e5111 |
--- a/src/qemu/qemu_migration.c
|
|
|
3e5111 |
+++ b/src/qemu/qemu_migration.c
|
|
|
3e5111 |
@@ -5560,9 +5560,6 @@ qemuMigrationCancel(virQEMUDriverPtr driver,
|
|
|
3e5111 |
if (qemuDomainObjExitMonitor(driver, vm) < 0 || (storage && !blockJobs))
|
|
|
3e5111 |
goto endsyncjob;
|
|
|
3e5111 |
|
|
|
3e5111 |
- ignore_value(qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_NONE,
|
|
|
3e5111 |
- NULL, NULL));
|
|
|
3e5111 |
-
|
|
|
3e5111 |
if (!storage) {
|
|
|
3e5111 |
ret = 0;
|
|
|
3e5111 |
goto cleanup;
|
|
|
3e5111 |
--
|
|
|
3e5111 |
2.12.2
|
|
|
3e5111 |
|