diff options
| author | Yonit Halperin <yhalperi@redhat.com> | 2012-08-21 11:51:58 +0300 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-09-05 17:11:55 +0200 |
| commit | 61c4efe2cb85b0a9c6bc68f6a2dd107c8d7ec080 (patch) | |
| tree | 7fb8d0359bb5e8d34e0cb17a7fea20aed64f44c9 /ui | |
| parent | 2fdd16e239c2a2763aa3266e637718123328688c (diff) | |
| download | qemu-61c4efe2cb85b0a9c6bc68f6a2dd107c8d7ec080.zip qemu-61c4efe2cb85b0a9c6bc68f6a2dd107c8d7ec080.tar.gz qemu-61c4efe2cb85b0a9c6bc68f6a2dd107c8d7ec080.tar.bz2 | |
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: Yonit Halperin <yhalperi@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/spice-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 851e869..ab069c5 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -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)) { |