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