* Wei Yang (richardw.y...@linux.intel.com) wrote:
> Wrap the check into a function to make it easy to read.
>
> Signed-off-by: Wei Yang <richardw.y...@linux.intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> include/migration/misc.h | 1 +
> migration/migration.c | 12 ++++++++----
> 2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/include/migration/misc.h b/include/migration/misc.h
> index 5cdbabd094..42d6abc920 100644
> --- a/include/migration/misc.h
> +++ b/include/migration/misc.h
> @@ -61,6 +61,7 @@ void migration_object_init(void);
> void migration_shutdown(void);
> void qemu_start_incoming_migration(const char *uri, Error **errp);
> bool migration_is_idle(void);
> +bool migration_is_active(MigrationState *);
> void add_migration_state_change_notifier(Notifier *notify);
> void remove_migration_state_change_notifier(Notifier *notify);
> bool migration_in_setup(MigrationState *);
> diff --git a/migration/migration.c b/migration/migration.c
> index 43fd8297ef..4c066fc85c 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1529,8 +1529,7 @@ static void migrate_fd_cleanup(MigrationState *s)
> qemu_fclose(tmp);
> }
>
> - assert((s->state != MIGRATION_STATUS_ACTIVE) &&
> - (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE));
> + assert(!migration_is_active(s));
>
> if (s->state == MIGRATION_STATUS_CANCELLING) {
> migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
> @@ -1690,6 +1689,12 @@ bool migration_is_idle(void)
> return false;
> }
>
> +bool migration_is_active(MigrationState *s)
> +{
> + return (s->state == MIGRATION_STATUS_ACTIVE ||
> + s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
> +}
> +
> void migrate_init(MigrationState *s)
> {
> /*
> @@ -3226,8 +3231,7 @@ static void *migration_thread(void *opaque)
>
> trace_migration_thread_setup_complete();
>
> - while (s->state == MIGRATION_STATUS_ACTIVE ||
> - s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
> + while (migration_is_active(s)) {
> int64_t current_time;
>
> if (urgent || !qemu_file_rate_limit(s->to_dst_file)) {
> --
> 2.17.1
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
