ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Move block_cleanup_parameters() to options.c 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
This commit is contained in:
Juan Quintela 2023-03-02 12:08:45 +01:00
parent 87c2290109
commit b7b73122dd
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
migration/migration.c
View File

@ -1164,16 +1164,6 @@ void migrate_set_state(int *state, int old_state, int new_state)
} }
} }
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(false);
s->must_remove_block_options = false;
}
}
static void migrate_fd_cleanup(MigrationState *s) static void migrate_fd_cleanup(MigrationState *s)
{ {
qemu_bh_delete(s->cleanup_bh); qemu_bh_delete(s->cleanup_bh);

10
migration/options.c
View File

@ -600,6 +600,16 @@ void migrate_set_block_incremental(bool value)
/* parameters helpers */ /* parameters helpers */
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(false);
s->must_remove_block_options = false;
}
}
AnnounceParameters *migrate_announce_params(void) AnnounceParameters *migrate_announce_params(void)
{ {
static AnnounceParameters ap; static AnnounceParameters ap;

1
migration/options.h
View File

@ -90,5 +90,6 @@ void migrate_set_block_incremental(bool value);
bool migrate_params_check(MigrationParameters *params, Error **errp); bool migrate_params_check(MigrationParameters *params, Error **errp);
void migrate_params_init(MigrationParameters *params); void migrate_params_init(MigrationParameters *params);
void block_cleanup_parameters(MigrationState *s);
#endif #endif