Remove migrate_params_apply so the logic of setting migration parameters is all in one spot.
Suggested-by: Prasad Pandit <[email protected]> Reviewed-by: Peter Xu <[email protected]> Signed-off-by: Fabiano Rosas <[email protected]> --- migration/options.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/migration/options.c b/migration/options.c index de091d2eee3..f7c154079bd 100644 --- a/migration/options.c +++ b/migration/options.c @@ -1386,21 +1386,6 @@ bool migrate_params_check(MigrationParameters *params, Error **errp) return true; } -/* - * Caller must ensure the has_* fields of @params are true so they all - * get copied and the pointer members don't dangle. - */ -static void migrate_params_apply(MigrationParameters *params) -{ - MigrationState *s = migrate_get_current(); - MigrationParameters *cur = &s->parameters; - - migrate_tls_opts_free(cur); - qapi_free_BitmapMigrationNodeAliasList(cur->block_bitmap_mapping); - qapi_free_strList(cur->cpr_exec_command); - QAPI_CLONE_MEMBERS(MigrationParameters, cur, params); -} - void qmp_migrate_set_parameters(MigrationParameters *input, Error **errp) { MigrationParameters *cur = &migrate_get_current()->parameters; @@ -1423,8 +1408,15 @@ void qmp_migrate_set_parameters(MigrationParameters *input, Error **errp) return; } - if (migrate_params_check(new, errp)) { - migrate_params_apply(new); - migrate_post_update_params(input, errp); + if (!migrate_params_check(new, errp)) { + return; } + + migrate_tls_opts_free(cur); + qapi_free_BitmapMigrationNodeAliasList(cur->block_bitmap_mapping); + qapi_free_strList(cur->cpr_exec_command); + + QAPI_CLONE_MEMBERS(MigrationParameters, cur, new); + + migrate_post_update_params(input, errp); } -- 2.53.0
