|
 |
6ae9ed |
From 4dffbf5c8beda557fd741c01287655e3a476f5d6 Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <4dffbf5c8beda557fd741c01287655e3a476f5d6@dist-git>
|
|
|
6ae9ed |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6ae9ed |
Date: Wed, 29 Jun 2016 15:01:17 +0200
|
|
|
6ae9ed |
Subject: [PATCH] qemu: Drop useless SPICE migration code
|
|
|
6ae9ed |
|
|
|
6ae9ed |
The spiceMigration flag will never be true if there is no SPICE graphics
|
|
|
6ae9ed |
configured for the domain.
|
|
|
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 f34b981e403ce7abf41c0047e1b5610e1f5269db)
|
|
|
6ae9ed |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/qemu/qemu_migration.c | 12 ------------
|
|
|
6ae9ed |
1 file changed, 12 deletions(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
6ae9ed |
index 6a683f7..0b1770b 100644
|
|
|
6ae9ed |
--- a/src/qemu/qemu_migration.c
|
|
|
6ae9ed |
+++ b/src/qemu/qemu_migration.c
|
|
|
6ae9ed |
@@ -2522,23 +2522,11 @@ static int
|
|
|
6ae9ed |
qemuMigrationWaitForSpice(virDomainObjPtr vm)
|
|
|
6ae9ed |
{
|
|
|
6ae9ed |
qemuDomainObjPrivatePtr priv = vm->privateData;
|
|
|
6ae9ed |
- bool wait_for_spice = false;
|
|
|
6ae9ed |
- size_t i = 0;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION) ||
|
|
|
6ae9ed |
!priv->job.spiceMigration)
|
|
|
6ae9ed |
return 0;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
- for (i = 0; i < vm->def->ngraphics; i++) {
|
|
|
6ae9ed |
- if (vm->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
|
|
|
6ae9ed |
- wait_for_spice = true;
|
|
|
6ae9ed |
- break;
|
|
|
6ae9ed |
- }
|
|
|
6ae9ed |
- }
|
|
|
6ae9ed |
-
|
|
|
6ae9ed |
- if (!wait_for_spice)
|
|
|
6ae9ed |
- return 0;
|
|
|
6ae9ed |
-
|
|
|
6ae9ed |
VIR_DEBUG("Waiting for SPICE to finish migration");
|
|
|
6ae9ed |
while (!priv->job.spiceMigrated && !priv->job.abortJob) {
|
|
|
6ae9ed |
if (virDomainObjWait(vm) < 0)
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.0
|
|
|
6ae9ed |
|