From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 5 Jul 2016 08:07:24 +0000 (+0200)
Subject: qemu: Properly reset spiceMigration flag
X-Git-Tag: v2.1.0-rc1~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a16ea1a0f3e6b9eb8be4be7a664af76e47bbceba;p=thirdparty%2Flibvirt.git

qemu: Properly reset spiceMigration flag

Otherwise migration during which we didn't send client_migrate_info QMP
command will get stuck waiting for SPICE migration to finish if libvirtd
sent the QMP command in a previous migration attempt.

Broken by bd7c8a69.

https://bugzilla.redhat.com/show_bug.cgi?id=1151723

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 42b5511e4b..930e0b7cc2 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -217,6 +217,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv)
     job->mask = QEMU_JOB_DEFAULT_MASK;
     job->dump_memory_only = false;
     job->abortJob = false;
+    job->spiceMigration = false;
     job->spiceMigrated = false;
     job->postcopyEnabled = false;
     VIR_FREE(job->current);