]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Properly reset spiceMigration flag
authorJiri Denemark <jdenemar@redhat.com>
Tue, 5 Jul 2016 08:07:24 +0000 (10:07 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 8 Jul 2016 11:35:17 +0000 (13:35 +0200)
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>
src/qemu/qemu_domain.c

index 42b5511e4b7342336545abb5d3ad5e02c270fcec..930e0b7cc2fec7f2aa9140ee052f8c693fcc7299 100644 (file)
@@ -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);