From 7073693bfbde541eca0cc778e1b2c30d43a65c4b Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 23 Feb 2011 00:43:59 +0100 Subject: [PATCH] migration: Export a function that tells if the migration has finished correctly This will allow us to hide the state values. Signed-off-by: Juan Quintela --- migration.c | 4 ++-- migration.h | 2 +- ui/spice-core.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/migration.c b/migration.c index 46db37b19f2..b5929db7efb 100644 --- a/migration.c +++ b/migration.c @@ -364,9 +364,9 @@ void remove_migration_state_change_notifier(Notifier *notify) notifier_list_remove(&migration_state_notifiers, notify); } -int get_migration_state(void) +bool migration_has_finished(MigrationState *s) { - return migrate_get_current()->state; + return s->state == MIG_STATE_COMPLETED; } void migrate_fd_connect(MigrationState *s) diff --git a/migration.h b/migration.h index e1299b9423e..23d347ae905 100644 --- a/migration.h +++ b/migration.h @@ -84,7 +84,7 @@ void migrate_fd_connect(MigrationState *s); void add_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify); -int get_migration_state(void); +bool migration_has_finished(MigrationState *); uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_transferred(void); diff --git a/ui/spice-core.c b/ui/spice-core.c index 3cbc721ee42..b33366e5d79 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -447,9 +447,9 @@ void do_info_spice(Monitor *mon, QObject **ret_data) static void migration_state_notifier(Notifier *notifier, void *data) { - int state = get_migration_state(); + MigrationState *s = data; - if (state == MIG_STATE_COMPLETED) { + if (migration_has_finished(s)) { #if SPICE_SERVER_VERSION >= 0x000701 /* 0.7.1 */ spice_server_migrate_switch(spice_server); #endif -- 2.39.5