* zhanghailiang (zhang.zhanghaili...@huawei.com) wrote:
> Fix the first parameter of migrate_set_state(), and export it.
> We will use it in later.
>
> Signed-off-by: zhanghailiang <zhang.zhanghaili...@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> v11:
> - New patch which is split from patch
> 'migration: Add state records for migration incoming' (Juan's suggestion)
> ---
> include/migration/migration.h | 2 ++
> migration/migration.c | 36 +++++++++++++++++++++---------------
> 2 files changed, 23 insertions(+), 15 deletions(-)
>
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index 1f004e4..4b19e80 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -169,6 +169,8 @@ struct MigrationState
> RAMBlock *last_req_rb;
> };
>
> +void migrate_set_state(int *state, int old_state, int new_state);
> +
> void process_incoming_migration(QEMUFile *f);
>
> void qemu_start_incoming_migration(const char *uri, Error **errp);
> diff --git a/migration/migration.c b/migration/migration.c
> index efacf52..7d98a3e 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -798,9 +798,9 @@ void qmp_migrate_start_postcopy(Error **errp)
>
> /* shared migration helpers */
>
> -static void migrate_set_state(MigrationState *s, int old_state, int
> new_state)
> +void migrate_set_state(int *state, int old_state, int new_state)
> {
> - if (atomic_cmpxchg(&s->state, old_state, new_state) == old_state) {
> + if (atomic_cmpxchg(state, old_state, new_state) == old_state) {
> trace_migrate_set_state(new_state);
> migrate_generate_event(new_state);
> }
> @@ -833,7 +833,7 @@ static void migrate_fd_cleanup(void *opaque)
> (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE));
>
> if (s->state == MIGRATION_STATUS_CANCELLING) {
> - migrate_set_state(s, MIGRATION_STATUS_CANCELLING,
> + migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
> MIGRATION_STATUS_CANCELLED);
> }
>
> @@ -844,7 +844,8 @@ void migrate_fd_error(MigrationState *s)
> {
> trace_migrate_fd_error();
> assert(s->file == NULL);
> - migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED);
> + migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
> + MIGRATION_STATUS_FAILED);
> notifier_list_notify(&migration_state_notifiers, s);
> }
>
> @@ -864,7 +865,7 @@ static void migrate_fd_cancel(MigrationState *s)
> if (!migration_is_setup_or_active(old_state)) {
> break;
> }
> - migrate_set_state(s, old_state, MIGRATION_STATUS_CANCELLING);
> + migrate_set_state(&s->state, old_state, MIGRATION_STATUS_CANCELLING);
> } while (s->state != MIGRATION_STATUS_CANCELLING);
>
> /*
> @@ -938,7 +939,7 @@ MigrationState *migrate_init(const MigrationParams
> *params)
> s->migration_thread_running = false;
> s->last_req_rb = NULL;
>
> - migrate_set_state(s, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP);
> + migrate_set_state(&s->state, MIGRATION_STATUS_NONE,
> MIGRATION_STATUS_SETUP);
>
> QSIMPLEQ_INIT(&s->src_page_requests);
>
> @@ -1037,7 +1038,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool
> blk,
> } else {
> error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri",
> "a valid migration protocol");
> - migrate_set_state(s, MIGRATION_STATUS_SETUP,
> MIGRATION_STATUS_FAILED);
> + migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
> + MIGRATION_STATUS_FAILED);
> return;
> }
>
> @@ -1416,7 +1418,7 @@ static int postcopy_start(MigrationState *ms, bool
> *old_vm_running)
> int ret;
> const QEMUSizedBuffer *qsb;
> int64_t time_at_stop = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
> - migrate_set_state(ms, MIGRATION_STATUS_ACTIVE,
> + migrate_set_state(&ms->state, MIGRATION_STATUS_ACTIVE,
> MIGRATION_STATUS_POSTCOPY_ACTIVE);
>
> trace_postcopy_start();
> @@ -1507,7 +1509,7 @@ static int postcopy_start(MigrationState *ms, bool
> *old_vm_running)
> ret = qemu_file_get_error(ms->file);
> if (ret) {
> error_report("postcopy_start: Migration stream errored");
> - migrate_set_state(ms, MIGRATION_STATUS_POSTCOPY_ACTIVE,
> + migrate_set_state(&ms->state, MIGRATION_STATUS_POSTCOPY_ACTIVE,
> MIGRATION_STATUS_FAILED);
> }
>
> @@ -1516,7 +1518,7 @@ static int postcopy_start(MigrationState *ms, bool
> *old_vm_running)
> fail_closefb:
> qemu_fclose(fb);
> fail:
> - migrate_set_state(ms, MIGRATION_STATUS_POSTCOPY_ACTIVE,
> + migrate_set_state(&ms->state, MIGRATION_STATUS_POSTCOPY_ACTIVE,
> MIGRATION_STATUS_FAILED);
> qemu_mutex_unlock_iothread();
> return -1;
> @@ -1585,11 +1587,13 @@ static void migration_completion(MigrationState *s,
> int current_active_state,
> goto fail;
> }
>
> - migrate_set_state(s, current_active_state, MIGRATION_STATUS_COMPLETED);
> + migrate_set_state(&s->state, current_active_state,
> + MIGRATION_STATUS_COMPLETED);
> return;
>
> fail:
> - migrate_set_state(s, current_active_state, MIGRATION_STATUS_FAILED);
> + migrate_set_state(&s->state, current_active_state,
> + MIGRATION_STATUS_FAILED);
> }
>
> bool migrate_colo_enabled(void)
> @@ -1640,7 +1644,8 @@ static void *migration_thread(void *opaque)
>
> s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
> current_active_state = MIGRATION_STATUS_ACTIVE;
> - migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_ACTIVE);
> + migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
> + MIGRATION_STATUS_ACTIVE);
>
> trace_migration_thread_setup_complete();
>
> @@ -1683,7 +1688,8 @@ static void *migration_thread(void *opaque)
> }
>
> if (qemu_file_get_error(s->file)) {
> - migrate_set_state(s, current_active_state,
> MIGRATION_STATUS_FAILED);
> + migrate_set_state(&s->state, current_active_state,
> + MIGRATION_STATUS_FAILED);
> trace_migration_thread_file_err();
> break;
> }
> @@ -1764,7 +1770,7 @@ void migrate_fd_connect(MigrationState *s)
> if (migrate_postcopy_ram()) {
> if (open_return_path_on_source(s)) {
> error_report("Unable to open return-path for postcopy");
> - migrate_set_state(s, MIGRATION_STATUS_SETUP,
> + migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
> MIGRATION_STATUS_FAILED);
> migrate_fd_cleanup(s);
> return;
> --
> 1.8.3.1
>
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
