Commit 61c4efe2 authored by Yonit Halperin's avatar Yonit Halperin Committed by Gerd Hoffmann
Browse files

spice: add 'migrated' flag to spice info 



The flag is 'true' when spice migration has completed on the src side.
It is needed for a case where libvirt dies before migration completes
and it misses the event QEVENT_SPICE_MIGRATE_COMPLETED.
When libvirt is restored and queries the migration status, it also needs
to query spice and check if its migration has completed.

Signed-off-by: default avatarYonit Halperin <yhalperi@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 2fdd16e2

hmp.c

+2 −0
Original line number Diff line number Diff line
@@ -413,6 +413,8 @@ void hmp_info_spice(Monitor *mon) 
        monitor_printf(mon, "     address: %s:%" PRId64 " [tls]\n",

                       info->host, info->tls_port);

    }

    monitor_printf(mon, "    migrated: %s\n",

                   info->migrated ? "true" : "false");

    monitor_printf(mon, "        auth: %s\n", info->auth);

    monitor_printf(mon, "    compiled: %s\n", info->compiled_version);

    monitor_printf(mon, "  mouse-mode: %s\n",

qapi-schema.json

+4 −1
Original line number Diff line number Diff line
@@ -808,6 +808,9 @@ 
#

# @enabled: true if the SPICE server is enabled, false otherwise

#

# @migrated: true if the last guest migration completed and spice

#            migration had completed as well. false otherwise.

#

# @host: #optional The hostname the SPICE server is bound to.  This depends on

#        the name resolution on the host and may be an IP address.

#
@@ -833,7 +836,7 @@ 
# Since: 0.14.0

##

{ 'type': 'SpiceInfo',

  'data': {'enabled': 'bool', '*host': 'str', '*port': 'int',

  'data': {'enabled': 'bool', 'migrated': 'bool', '*host': 'str', '*port': 'int',

           '*tls-port': 'int', '*auth': 'str', '*compiled-version': 'str',

           'mouse-mode': 'SpiceQueryMouseMode', '*channels': ['SpiceChannel']} }

ui/spice-core.c

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static Notifier migration_state; 
static const char *auth = "spice";

static char *auth_passwd;

static time_t auth_expires = TIME_MAX;

static int spice_migration_completed;

int using_spice = 0;



static QemuThread me;
@@ -310,6 +311,7 @@ static void migrate_connect_complete_cb(SpiceMigrateInstance *sin) 
static void migrate_end_complete_cb(SpiceMigrateInstance *sin)

{

    monitor_protocol_event(QEVENT_SPICE_MIGRATE_COMPLETED, NULL);

    spice_migration_completed = true;

}

#endif
@@ -443,6 +445,7 @@ SpiceInfo *qmp_query_spice(Error **errp) 
    }



    info->enabled = true;

    info->migrated = spice_migration_completed;



    addr = qemu_opt_get(opts, "addr");

    port = qemu_opt_get_number(opts, "port", 0);
@@ -496,6 +499,7 @@ static void migration_state_notifier(Notifier *notifier, void *data) 
#ifndef SPICE_INTERFACE_MIGRATION

        spice_server_migrate_switch(spice_server);

        monitor_protocol_event(QEVENT_SPICE_MIGRATE_COMPLETED, NULL);

        spice_migration_completed = true;

#else

        spice_server_migrate_end(spice_server, true);

    } else if (migration_has_failed(s)) {