diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-08 10:57:25 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-08 10:57:25 +0100 |
| commit | 6b342cc9c872e82620fdd32730cd92affa8a19b3 (patch) | |
| tree | b2550c7d42449af6e316a509c28d233140c1ef97 | |
| parent | ff788b6fe67f694666781f821c1af812e8c7999b (diff) | |
| parent | a76a2f729aae21c45c7e9eef8d1d80e94d1cc930 (diff) | |
| download | qemu-6b342cc9c872e82620fdd32730cd92affa8a19b3.tar.gz | |
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-7' into staging
spice: small fixes
# gpg: Signature made Thu 08 May 2014 09:50:21 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/spice/tags/pull-spice-7:
spice: fix libvirt snapshots
spice: fix "info spice"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | ui/spice-core.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 4cce3b38c0..d10818a925 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; @@ -532,7 +533,7 @@ SpiceInfo *qmp_query_spice(Error **errp) info->auth = g_strdup(auth); info->has_host = true; - info->host = g_strdup(addr ? addr : "0.0.0.0"); + info->host = g_strdup(addr ? addr : "*"); info->has_compiled_version = true; major = (SPICE_SERVER_VERSION & 0xff0000) >> 16; @@ -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; } |