openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration: fix spice migration 

Commit 29ae8a4133 ("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>
This commit is contained in:
Stefan Hajnoczi 2013-07-29 15:01:58 +02:00
parent 9287ac271d
commit 02edd2e766
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/migration/migration.h
View File

@ -90,7 +90,7 @@ int migrate_fd_close(MigrationState *s);
void add_migration_state_change_notifier(Notifier *notify); void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify);
bool migration_is_active(MigrationState *); bool migration_in_setup(MigrationState *);
bool migration_has_finished(MigrationState *); bool migration_has_finished(MigrationState *);
bool migration_has_failed(MigrationState *); bool migration_has_failed(MigrationState *);
MigrationState *migrate_get_current(void); MigrationState *migrate_get_current(void);

4
migration.c
View File

@ -338,9 +338,9 @@ void remove_migration_state_change_notifier(Notifier *notify)
notifier_remove(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) bool migration_has_finished(MigrationState *s)

2
ui/spice-core.c
View File

@ -563,7 +563,7 @@ static void migration_state_notifier(Notifier *notifier, void *data)
{ {
MigrationState *s = data; MigrationState *s = data;
if (migration_is_active(s)) { if (migration_in_setup(s)) {
spice_server_migrate_start(spice_server); spice_server_migrate_start(spice_server);
} else if (migration_has_finished(s)) { } else if (migration_has_finished(s)) {
spice_server_migrate_end(spice_server, true); spice_server_migrate_end(spice_server, true);