Re: [Qemu-devel] [PATCH 51/51] migration: Remove MigrationState parameter from migration_is_idle()

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> Only user don't have a MigrationState handly.
> 
> Signed-off-by: Juan Quintela <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  include/migration/migration.h | 2 +-
>  migration/migration.c         | 8 +++-----
>  2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index 39a8e7e..6f7221f 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -234,7 +234,7 @@ void remove_migration_state_change_notifier(Notifier 
> *notify);
>  MigrationState *migrate_init(const MigrationParams *params);
>  bool migration_is_blocked(Error **errp);
>  bool migration_in_setup(MigrationState *);
> -bool migration_is_idle(MigrationState *s);
> +bool migration_is_idle(void);
>  bool migration_has_finished(MigrationState *);
>  bool migration_has_failed(MigrationState *);
>  /* True if outgoing migration has entered postcopy phase */
> diff --git a/migration/migration.c b/migration/migration.c
> index fc19ba7..ba1d094 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1067,11 +1067,9 @@ bool 
> migration_in_postcopy_after_devices(MigrationState *s)
>      return migration_in_postcopy() && s->postcopy_after_devices;
>  }
>  
> -bool migration_is_idle(MigrationState *s)
> +bool migration_is_idle(void)
>  {
> -    if (!s) {
> -        s = migrate_get_current();
> -    }
> +    MigrationState *s = migrate_get_current();
>  
>      switch (s->state) {
>      case MIGRATION_STATUS_NONE:
> @@ -1136,7 +1134,7 @@ int migrate_add_blocker(Error *reason, Error **errp)
>          return -EACCES;
>      }
>  
> -    if (migration_is_idle(NULL)) {
> +    if (migration_is_idle()) {
>          migration_blockers = g_slist_prepend(migration_blockers, reason);
>          return 0;
>      }
> -- 
> 2.9.3
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK