Once there, make it more regular and remove th eneed for MigrationState parameter.
Signed-off-by: Juan Quintela <[email protected]> --- migration/options.h | 4 ++++ migration/migration.c | 9 ++------- migration/options.c | 9 +++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/migration/options.h b/migration/options.h index 10a59b1172..0fbe294a65 100644 --- a/migration/options.h +++ b/migration/options.h @@ -84,6 +84,10 @@ int migrate_multifd_zstd_level(void); uint8_t migrate_throttle_trigger_threshold(void); uint64_t migrate_xbzrle_cache_size(void); +/* parameters setters */ + +void migrate_set_block_incremental(bool value); + /* parameters helpers */ bool migrate_params_check(MigrationParameters *params, Error **errp); diff --git a/migration/migration.c b/migration/migration.c index 9db8e09462..f293fb1fd6 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1162,17 +1162,12 @@ void migrate_set_state(int *state, int old_state, int new_state) } } -static void migrate_set_block_incremental(MigrationState *s, bool value) -{ - s->parameters.block_incremental = value; -} - static void block_cleanup_parameters(MigrationState *s) { if (s->must_remove_block_options) { /* setting to false can never fail */ migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort); - migrate_set_block_incremental(s, false); + migrate_set_block_incremental(false); s->must_remove_block_options = false; } } @@ -1666,7 +1661,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, } if (blk_inc) { - migrate_set_block_incremental(s, true); + migrate_set_block_incremental(true); } migrate_init(s); diff --git a/migration/options.c b/migration/options.c index 6034443cee..7838515991 100644 --- a/migration/options.c +++ b/migration/options.c @@ -590,6 +590,15 @@ uint64_t migrate_xbzrle_cache_size(void) return s->parameters.xbzrle_cache_size; } +/* parameter setters */ + +void migrate_set_block_incremental(bool value) +{ + MigrationState *s = migrate_get_current(); + + s->parameters.block_incremental = value; +} + /* parameters helpers */ AnnounceParameters *migrate_announce_params(void) -- 2.39.2
