|
 |
3e5111 |
From 4b3819d67eaf7c9ed31a2d306968d24fecae68ea Mon Sep 17 00:00:00 2001
|
|
|
3e5111 |
Message-Id: <4b3819d67eaf7c9ed31a2d306968d24fecae68ea@dist-git>
|
|
|
3e5111 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
Date: Wed, 5 Apr 2017 12:04:09 +0200
|
|
|
3e5111 |
Subject: [PATCH] qemu: Always reset TLS in qemuProcessRecoverMigrationOut
|
|
|
3e5111 |
|
|
|
3e5111 |
qemuProcessRecoverMigrationOut doesn't explicitly call
|
|
|
3e5111 |
qemuMigrationResetTLS relying on two things:
|
|
|
3e5111 |
|
|
|
3e5111 |
- qemuMigrationCancel resets TLS parameters
|
|
|
3e5111 |
- our migration code resets TLS before entering
|
|
|
3e5111 |
QEMU_MIGRATION_PHASE_PERFORM3_DONE phase
|
|
|
3e5111 |
|
|
|
3e5111 |
But this is not obvious and the assumptions will be broken soon. Let's
|
|
|
3e5111 |
explicitly reset TLS parameters on all paths which do not kill the
|
|
|
3e5111 |
domain.
|
|
|
3e5111 |
|
|
|
3e5111 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
(cherry picked from commit 9d677e6a6ba075f489f791b6922a5dadf0e0c79f)
|
|
|
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_process.c | 1 +
|
|
|
3e5111 |
1 file changed, 1 insertion(+)
|
|
|
3e5111 |
|
|
|
3e5111 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
3e5111 |
index 70b06a28f..2e0f859ce 100644
|
|
|
3e5111 |
--- a/src/qemu/qemu_process.c
|
|
|
3e5111 |
+++ b/src/qemu/qemu_process.c
|
|
|
3e5111 |
@@ -3077,6 +3077,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver,
|
|
|
3e5111 |
}
|
|
|
3e5111 |
}
|
|
|
3e5111 |
|
|
|
3e5111 |
+ qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_NONE, NULL, NULL);
|
|
|
3e5111 |
return 0;
|
|
|
3e5111 |
}
|
|
|
3e5111 |
|
|
|
3e5111 |
--
|
|
|
3e5111 |
2.12.2
|
|
|
3e5111 |
|