External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 21:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Properly reset TLS in qemuProcessRecoverMigrationIn

Browse Source 
There is no async job running when a freshly started libvirtd is trying
to recover from an interrupted incoming migration. While at it, let's
call qemuMigrationResetTLS every time we don't kill the domain. This is
not strictly necessary since TLS is not supported when v2 migration
protocol is used, but doing so makes more sense.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
(cherry picked from commit 59b28ecab845adb6fefe3280675f95d1f2135e3b)
This commit is contained in:
Jiri Denemark 2017-04-04 19:43:13 +02:00 committed by Cole Robinson
parent afb435d813
commit bca95e752a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_process.c
View File

@ -2973,9 +2973,6 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver,
/* migration finished, we started resuming the domain but didn't
* confirm success or failure yet; killing it seems safest unless
* we already started guest CPUs or we were in post-copy mode */
ignore_value(qemuMigrationResetTLS(driver, vm,
QEMU_ASYNC_JOB_MIGRATION_IN,
NULL, NULL));
if (postcopy) {
qemuMigrationPostcopyFailed(driver, vm);
} else if (state != VIR_DOMAIN_RUNNING) {
@ -2985,6 +2982,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver,
break;
}
qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_NONE, NULL, NULL);
return 0;
}