mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 07:22:46 +00:00
migration: Move migrate_set_block_incremental() to options.c
Once there, make it more regular and remove the need for MigrationState parameter. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
This commit is contained in:
parent
f5da8ba477
commit
87c2290109
|
@ -1164,17 +1164,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)
|
static void block_cleanup_parameters(MigrationState *s)
|
||||||
{
|
{
|
||||||
if (s->must_remove_block_options) {
|
if (s->must_remove_block_options) {
|
||||||
/* setting to false can never fail */
|
/* setting to false can never fail */
|
||||||
migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort);
|
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;
|
s->must_remove_block_options = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1668,7 +1663,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (blk_inc) {
|
if (blk_inc) {
|
||||||
migrate_set_block_incremental(s, true);
|
migrate_set_block_incremental(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
migrate_init(s);
|
migrate_init(s);
|
||||||
|
|
|
@ -589,6 +589,15 @@ uint64_t migrate_xbzrle_cache_size(void)
|
||||||
return s->parameters.xbzrle_cache_size;
|
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 */
|
/* parameters helpers */
|
||||||
|
|
||||||
AnnounceParameters *migrate_announce_params(void)
|
AnnounceParameters *migrate_announce_params(void)
|
||||||
|
|
|
@ -82,6 +82,10 @@ int migrate_multifd_zstd_level(void);
|
||||||
uint8_t migrate_throttle_trigger_threshold(void);
|
uint8_t migrate_throttle_trigger_threshold(void);
|
||||||
uint64_t migrate_xbzrle_cache_size(void);
|
uint64_t migrate_xbzrle_cache_size(void);
|
||||||
|
|
||||||
|
/* parameters setters */
|
||||||
|
|
||||||
|
void migrate_set_block_incremental(bool value);
|
||||||
|
|
||||||
/* parameters helpers */
|
/* parameters helpers */
|
||||||
|
|
||||||
bool migrate_params_check(MigrationParameters *params, Error **errp);
|
bool migrate_params_check(MigrationParameters *params, Error **errp);
|
||||||
|
|
Loading…
Reference in a new issue