|
 |
6ae9ed |
From 5f25c4bb92d3fd8a8da377a156c2d49c34a2431d Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <5f25c4bb92d3fd8a8da377a156c2d49c34a2431d@dist-git>
|
|
|
6ae9ed |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6ae9ed |
Date: Tue, 5 Jul 2016 10:07:24 +0200
|
|
|
6ae9ed |
Subject: [PATCH] qemu: Properly reset spiceMigration flag
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Otherwise migration during which we didn't send client_migrate_info QMP
|
|
|
6ae9ed |
command will get stuck waiting for SPICE migration to finish if libvirtd
|
|
|
6ae9ed |
sent the QMP command in a previous migration attempt.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Broken by bd7c8a69.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1151723
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6ae9ed |
(cherry picked from commit a16ea1a0f3e6b9eb8be4be7a664af76e47bbceba)
|
|
|
6ae9ed |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/qemu/qemu_domain.c | 1 +
|
|
|
6ae9ed |
1 file changed, 1 insertion(+)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
6ae9ed |
index 0edcc04..4aef7ab 100644
|
|
|
6ae9ed |
--- a/src/qemu/qemu_domain.c
|
|
|
6ae9ed |
+++ b/src/qemu/qemu_domain.c
|
|
|
6ae9ed |
@@ -217,6 +217,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv)
|
|
|
6ae9ed |
job->mask = QEMU_JOB_DEFAULT_MASK;
|
|
|
6ae9ed |
job->dump_memory_only = false;
|
|
|
6ae9ed |
job->abortJob = false;
|
|
|
6ae9ed |
+ job->spiceMigration = false;
|
|
|
6ae9ed |
job->spiceMigrated = false;
|
|
|
6ae9ed |
job->postcopyEnabled = false;
|
|
|
6ae9ed |
VIR_FREE(job->current);
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.0
|
|
|
6ae9ed |
|