Attachment 890679 Details for Bug 1010670 – qemu spice fix

[patch] qemu spice fix

0001-spice-fix-libvirt-snapshots.patch (text/plain), 1.81 KB, created by Gerd Hoffmann on 2014-04-29 07:34:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerd Hoffmann

Created: 2014-04-29 07:34:52 UTC

Size: 1.81 KB

patch

obsolete

>From 07de91ef4b550cf14ab398e98416887a5d97eef1 Mon Sep 17 00:00:00 2001
>From: Gerd Hoffmann <kraxel@redhat.com>
>Date: Tue, 29 Apr 2014 09:27:31 +0200
>Subject: [PATCH] spice: fix libvirt snapshots
>
>Only notify spice-server about migration events in case we got
>target host information beforehand.  So we kick the seamless spice
>client migration only in case a actual live migration happens, not
>when libvirt uses live-migration-to-file for snapshotting.
>
>Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>---
> ui/spice-core.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/ui/spice-core.c b/ui/spice-core.c
>index 6825579..d10818a 100644
>--- a/ui/spice-core.c
>+++ b/ui/spice-core.c
>@@ -48,6 +48,7 @@ static char *auth_passwd;
> static time_t auth_expires = TIME_MAX;
> static int spice_migration_completed;
> static int spice_display_is_running;
>+static int spice_have_target_host;
> int using_spice = 0;
> 
> static QemuThread me;
>@@ -564,12 +565,18 @@ static void migration_state_notifier(Notifier *notifier, void *data)
> {
>     MigrationState *s = data;
> 
>+    if (!spice_have_target_host) {
>+        return;
>+    }
>+
>     if (migration_in_setup(s)) {
>         spice_server_migrate_start(spice_server);
>     } else if (migration_has_finished(s)) {
>         spice_server_migrate_end(spice_server, true);
>+        spice_have_target_host = false;
>     } else if (migration_has_failed(s)) {
>         spice_server_migrate_end(spice_server, false);
>+        spice_have_target_host = false;
>     }
> }
> 
>@@ -583,6 +590,7 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
>     spice_migrate.connect_complete.opaque = opaque;
>     ret = spice_server_migrate_connect(spice_server, hostname,
>                                        port, tls_port, subject);
>+    spice_have_target_host = true;
>     return ret;
> }
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1010670: 890679