Patchwork [20/28] migration: Export a function that tells if the migration has finished correctly

login
register
mail settings
Submitter Juan Quintela
Date Feb. 23, 2011, 9:47 p.m.
Message ID <78cdbbd2250745346065d826d478f1b2d1d2976d.1298492768.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/84281/
State New
Headers show

Comments

Juan Quintela - Feb. 23, 2011, 9:47 p.m.
This will allows us to hide the status values.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration.c     |    4 ++--
 migration.h     |    2 +-
 ui/spice-core.c |    4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

Patch

diff --git a/migration.c b/migration.c
index 49cdf72..493c2d7 100644
--- a/migration.c
+++ b/migration.c
@@ -341,9 +341,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(void)
 {
-    return current_migration.state;
+    return current_migration.state == MIG_STATE_COMPLETED;
 }

 void migrate_fd_connect(MigrationState *s)
diff --git a/migration.h b/migration.h
index 347e7e8..3c5bb6a 100644
--- a/migration.h
+++ b/migration.h
@@ -84,6 +84,6 @@  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(void);

 #endif
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 1aa1a5e..997603d 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -422,9 +422,7 @@  void do_info_spice(Monitor *mon, QObject **ret_data)

 static void migration_state_notifier(Notifier *notifier)
 {
-    int state = get_migration_state();
-
-    if (state == MIG_STATE_COMPLETED) {
+    if (migration_has_finished()) {
 #if SPICE_SERVER_VERSION >= 0x000701 /* 0.7.1 */
         spice_server_migrate_switch(spice_server);
 #endif