diff options
| -rw-r--r-- | ui/spice-core.c | 54 |
1 files changed, 53 insertions, 1 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 50c0d7d83..5cd9940bc 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -288,6 +288,37 @@ static SpiceCoreInterface core_interface = { #endif }; +#ifdef SPICE_INTERFACE_MIGRATION +typedef struct SpiceMigration { + SpiceMigrateInstance sin; + struct { + MonitorCompletion *cb; + void *opaque; + } info_complete; +} SpiceMigration; + +static void migrate_info_complete_cb(SpiceMigrateInstance *sin); + +static const SpiceMigrateInterface migrate_interface = { + .base.type = SPICE_INTERFACE_MIGRATION, + .base.description = "migration", + .base.major_version = SPICE_INTERFACE_MIGRATION_MAJOR, + .base.minor_version = SPICE_INTERFACE_MIGRATION_MINOR, + .migrate_info_complete = migrate_info_complete_cb, +}; + +static SpiceMigration spice_migrate; + +static void migrate_info_complete_cb(SpiceMigrateInstance *sin) +{ + SpiceMigration *sm = container_of(sin, SpiceMigration, sin); + if (sm->info_complete.cb) { + sm->info_complete.cb(sm->info_complete.opaque, NULL); + } + sm->info_complete.cb = NULL; +} +#endif + /* config string parsing */ static int name2enum(const char *string, const char *table[], int entries) @@ -449,9 +480,19 @@ static void migration_state_notifier(Notifier *notifier, void *data) { int state = get_migration_state(); - if (state == MIG_STATE_COMPLETED) { + if (state == MIG_STATE_ACTIVE) { +#ifdef SPICE_INTERFACE_MIGRATION + spice_server_migrate_start(spice_server); +#endif + } else if (state == MIG_STATE_COMPLETED) { #if SPICE_SERVER_VERSION >= 0x000701 /* 0.7.1 */ +#ifndef SPICE_INTERFACE_MIGRATION spice_server_migrate_switch(spice_server); +#else + spice_server_migrate_end(spice_server, true); + } else if (state == MIG_STATE_CANCELLED || state == MIG_STATE_ERROR) { + spice_server_migrate_end(spice_server, false); +#endif #endif } } @@ -461,9 +502,15 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port, MonitorCompletion *cb, void *opaque) { int ret; +#ifdef SPICE_INTERFACE_MIGRATION + spice_migrate.info_complete.cb = cb; + spice_migrate.info_complete.opaque = opaque; +#endif ret = spice_server_migrate_info(spice_server, hostname, port, tls_port, subject); +#ifndef SPICE_INTERFACE_MIGRATION cb(opaque, NULL); +#endif return ret; } @@ -654,6 +701,11 @@ void qemu_spice_init(void) migration_state.notify = migration_state_notifier; add_migration_state_change_notifier(&migration_state); +#ifdef SPICE_INTERFACE_MIGRATION + spice_migrate.sin.base.sif = &migrate_interface.base; + spice_migrate.info_complete.cb = NULL; + qemu_spice_add_interface(&spice_migrate.sin.base); +#endif qemu_spice_input_init(); qemu_spice_audio_init(); |