summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2013-07-29 15:01:58 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2013-07-29 17:19:02 +0200
commit02edd2e7665bceb307bedd8afe625c0f7e8d7cfa (patch)
treee0418b93b16a262893e69f83b9bcc94638fe96e4 /ui
parent9287ac271d83166f99e050a0e0a4ebd462f7eb2b (diff)
downloadqemu-02edd2e7665bceb307bedd8afe625c0f7e8d7cfa.tar.gz
qemu-02edd2e7665bceb307bedd8afe625c0f7e8d7cfa.tar.bz2
qemu-02edd2e7665bceb307bedd8afe625c0f7e8d7cfa.zip
migration: fix spice migration
Commit 29ae8a4133082e16970c9d4be09f4b6a15034617 ("rdma: introduce MIG_STATE_NONE and change MIG_STATE_SETUP state transition") changed the state transitions during migration setup. Spice used to be notified with MIG_STATE_ACTIVE and it detected this using migration_is_active(). Spice is now notified with MIG_STATE_SETUP and migration_is_active() no longer works. Replace migration_is_active() with migration_in_setup() to fix spice migration. Cc: Michael R. Hines <mrhines@us.ibm.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/spice-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c
index f308fd9d5e..033fd8925b 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -563,7 +563,7 @@ static void migration_state_notifier(Notifier *notifier, void *data)
{
MigrationState *s = data;
- if (migration_is_active(s)) {
+ if (migration_in_setup(s)) {
spice_server_migrate_start(spice_server);
} else if (migration_has_finished(s)) {
spice_server_migrate_end(spice_server, true);