From e866e23959b45325414ac84a21f31dea79867ee6 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 23 Apr 2010 13:28:21 +0200 Subject: spice/vnc: client migration. Handle spice client migration, i.e. inform a spice client connected about the new host and connection parameters, so it can move over the connection automatically. The monitor command has a not-yet used protocol argument simliar to set_password and expire_password commands. This allows to add a simliar feature to vnc in the future. Daniel Berrange plans to work on this. Signed-off-by: Gerd Hoffmann --- ui/qemu-spice.h | 4 ++++ ui/spice-core.c | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+) (limited to 'ui') diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h index 48239c3..05dc50a 100644 --- a/ui/qemu-spice.h +++ b/ui/qemu-spice.h @@ -35,6 +35,8 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin); int qemu_spice_set_passwd(const char *passwd, bool fail_if_connected, bool disconnect_if_connected); int qemu_spice_set_pw_expire(time_t expires); +int qemu_spice_migrate_info(const char *hostname, int port, int tls_port, + const char *subject); void do_info_spice_print(Monitor *mon, const QObject *data); void do_info_spice(Monitor *mon, QObject **ret_data); @@ -44,6 +46,8 @@ void do_info_spice(Monitor *mon, QObject **ret_data); #define using_spice 0 #define qemu_spice_set_passwd(_p, _f1, _f2) (-1) #define qemu_spice_set_pw_expire(_e) (-1) +static inline int qemu_spice_migrate_info(const char *h, int p, int t, const char *s) +{ return -1; } #endif /* CONFIG_SPICE */ diff --git a/ui/spice-core.c b/ui/spice-core.c index 27a1ced..1aa1a5e 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -30,11 +30,15 @@ #include "qbool.h" #include "qstring.h" #include "qjson.h" +#include "notify.h" +#include "migration.h" #include "monitor.h" +#include "hw/hw.h" /* core bits */ static SpiceServer *spice_server; +static Notifier migration_state; static const char *auth = "spice"; static char *auth_passwd; static time_t auth_expires = TIME_MAX; @@ -416,6 +420,24 @@ void do_info_spice(Monitor *mon, QObject **ret_data) *ret_data = QOBJECT(server); } +static void migration_state_notifier(Notifier *notifier) +{ + int state = get_migration_state(); + + if (state == MIG_STATE_COMPLETED) { +#if SPICE_SERVER_VERSION >= 0x000701 /* 0.7.1 */ + spice_server_migrate_switch(spice_server); +#endif + } +} + +int qemu_spice_migrate_info(const char *hostname, int port, int tls_port, + const char *subject) +{ + return spice_server_migrate_info(spice_server, hostname, + port, tls_port, subject); +} + static int add_channel(const char *name, const char *value, void *opaque) { int security = 0; @@ -573,6 +595,9 @@ void qemu_spice_init(void) spice_server_init(spice_server, &core_interface); using_spice = 1; + migration_state.notify = migration_state_notifier; + add_migration_state_change_notifier(&migration_state); + qemu_spice_input_init(); qemu_spice_audio_init(); -- cgit v1.1