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

login
register
mail settings
Submitter Juan Quintela
Date Feb. 23, 2011, 12:44 a.m.
Message ID <04af1ac60cffc5b9bf4d3e0cfded8f8bd2978699.1298421307.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/84036/
State New
Headers show

Comments

Juan Quintela - Feb. 23, 2011, 12:44 a.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(-)
Yoshiaki Tamura - Feb. 23, 2011, 8:50 a.m.
2011/2/23 Juan Quintela <quintela@redhat.com>:
> 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(-)
>
> diff --git a/migration.c b/migration.c
> index 312a029..383ebaf 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -335,9 +335,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 6477b51..9457807 100644
> --- a/migration.h
> +++ b/migration.h
> @@ -82,6 +82,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

I agree to add migration_has_finished, but I don't see why we
want to remove get_migration_state.  Are we going to make
migration_has_* for each state even migration gets complicated?

Yoshi

> --
> 1.7.4
>
>
>

Patch

diff --git a/migration.c b/migration.c
index 312a029..383ebaf 100644
--- a/migration.c
+++ b/migration.c
@@ -335,9 +335,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 6477b51..9457807 100644
--- a/migration.h
+++ b/migration.h
@@ -82,6 +82,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