system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-14 15:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

migration: Move migrate_use_block() to options.c

Browse source 
Once that we are there, we rename the function to migrate_block()
to be consistent with all other capabilities.

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-01 22:23:57 +01:00
parent 87dca0c9bb
commit 9d4b1e5f22
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
migration/block.c
View file

@ -1001,7 +1001,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id)
static bool block_is_active(void *opaque) static bool block_is_active(void *opaque)
{ {
return migrate_use_block(); return migrate_block();
} }
static SaveVMHandlers savevm_block_handlers = { static SaveVMHandlers savevm_block_handlers = {

11
migration/migration.c
View file

@ -2415,7 +2415,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
error_setg(errp, "No disk migration is required in COLO mode"); error_setg(errp, "No disk migration is required in COLO mode");
return false; return false;
} }
if (migrate_use_block() || migrate_use_block_incremental()) { if (migrate_block() || migrate_use_block_incremental()) {
error_setg(errp, "Command options are incompatible with " error_setg(errp, "Command options are incompatible with "
"current migration capabilities"); "current migration capabilities");
return false; return false;
@ -2622,15 +2622,6 @@ static int64_t migrate_max_postcopy_bandwidth(void)
return s->parameters.max_postcopy_bandwidth; return s->parameters.max_postcopy_bandwidth;
} }
bool migrate_use_block(void)
{
MigrationState *s;
s = migrate_get_current();
return s->capabilities[MIGRATION_CAPABILITY_BLOCK];
}
bool migrate_use_return_path(void) bool migrate_use_return_path(void)
{ {
MigrationState *s; MigrationState *s;

1
migration/migration.h
View file

@ -457,7 +457,6 @@ int migrate_multifd_zstd_level(void);
int migrate_use_tls(void); int migrate_use_tls(void);
uint64_t migrate_xbzrle_cache_size(void); uint64_t migrate_xbzrle_cache_size(void);
bool migrate_use_block(void);
bool migrate_use_block_incremental(void); bool migrate_use_block_incremental(void);
int migrate_max_cpu_throttle(void); int migrate_max_cpu_throttle(void);
bool migrate_use_return_path(void); bool migrate_use_return_path(void);

9
migration/options.c
View file

@ -33,6 +33,15 @@ bool migrate_background_snapshot(void)
return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT]; return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
} }
bool migrate_block(void)
{
MigrationState *s;
s = migrate_get_current();
return s->capabilities[MIGRATION_CAPABILITY_BLOCK];
}
bool migrate_colo(void) bool migrate_colo(void)
{ {
MigrationState *s = migrate_get_current(); MigrationState *s = migrate_get_current();

1
migration/options.h
View file

@ -18,6 +18,7 @@
bool migrate_auto_converge(void); bool migrate_auto_converge(void);
bool migrate_background_snapshot(void); bool migrate_background_snapshot(void);
bool migrate_block(void);
bool migrate_colo(void); bool migrate_colo(void);
bool migrate_compress(void); bool migrate_compress(void);
bool migrate_dirty_bitmaps(void); bool migrate_dirty_bitmaps(void);

2
migration/savevm.c
View file

@ -1612,7 +1612,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
return -EINVAL; return -EINVAL;
} }
if (migrate_use_block()) { if (migrate_block()) {
error_setg(errp, "Block migration and snapshots are incompatible"); error_setg(errp, "Block migration and snapshots are incompatible");
return -EINVAL; return -EINVAL;
} }