From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 5 Apr 2017 12:44:26 +0000 (+0200)
Subject: qemu: Don't reset TLS in qemuMigrationCancel
X-Git-Tag: v3.3.0-rc1~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=133c73e75f278c4943cbe03333bb9a7ee897c23f;p=thirdparty%2Flibvirt.git

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 <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 87506c73ad..392632566f 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;