Re: [Qemu-devel] [PATCH] migration: current_migration is never NULL

[Dr. David Alan Gilbert]

* Wei Yang (address@hidden) wrote:
> migration_object_init() create and assign current_migration, which means
> it will never be null until migration_shutdown().
> 
> Signed-off-by: Wei Yang <address@hidden>
> ---
>  migration/migration.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index 0fd2364961..43fd8297ef 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1667,10 +1667,6 @@ bool migration_is_idle(void)
>  {
>      MigrationState *s = current_migration;
>  
> -    if (!s) {
> -        return true;
> -    }
> -

I'd prefer to keep that because it's used by migrate_add_blocker
and without this check it means we'd only be able to add a blocker
after the migration object init - which is probably fine but we
would have to check all the cases and make sure no one breaks it in
the future;  where as this check makes it just work and we don't
need to worry about the order.

Dave

>      switch (s->state) {
>      case MIGRATION_STATUS_NONE:
>      case MIGRATION_STATUS_CANCELLED:
> -- 
> 2.19.1
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK