aboutsummaryrefslogtreecommitdiff
path: root/migration.c
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 /migration.c
parent9287ac271d83166f99e050a0e0a4ebd462f7eb2b (diff)
downloadqemu-arm-02edd2e7665bceb307bedd8afe625c0f7e8d7cfa.tar.gz
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 'migration.c')
-rw-r--r--migration.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/migration.c b/migration.c
index a5ed26b0ba..9fc72943fb 100644
--- a/migration.c
+++ b/migration.c
@@ -338,9 +338,9 @@ void remove_migration_state_change_notifier(Notifier *notify)
notifier_remove(notify);
}
-bool migration_is_active(MigrationState *s)
+bool migration_in_setup(MigrationState *s)
{
- return s->state == MIG_STATE_ACTIVE;
+ return s->state == MIG_STATE_SETUP;
}
bool migration_has_finished(MigrationState *s)