OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: Move migrate_use_block_incremental() to option.c

Browse Source 
To be consistent with every other parameter, rename to
migrate_block_incremental().

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 00:49:47 +01:00
parent 5390adec03
commit 6f8be7080a
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/block.c
View File

@ -417,7 +417,7 @@ static int init_blk_migration(QEMUFile *f)
bmds->bulk_completed = 0; bmds->bulk_completed = 0;
bmds->total_sectors = sectors; bmds->total_sectors = sectors;
bmds->completed_sectors = 0; bmds->completed_sectors = 0;
bmds->shared_base = migrate_use_block_incremental(); bmds->shared_base = migrate_block_incremental();
assert(i < num_bs); assert(i < num_bs);
bmds_bs[i].bmds = bmds; bmds_bs[i].bmds = bmds;

11
migration/migration.c
View File

@ -2157,7 +2157,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_block() || migrate_use_block_incremental()) { if (migrate_block() || migrate_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;
@ -2273,15 +2273,6 @@ int migrate_use_tls(void)
return s->parameters.tls_creds && *s->parameters.tls_creds; return s->parameters.tls_creds && *s->parameters.tls_creds;
} }
bool migrate_use_block_incremental(void)
{
MigrationState *s;
s = migrate_get_current();
return s->parameters.block_incremental;
}
/* migration thread support */ /* migration thread support */
/* /*
* Something bad happened to the RP stream, mark an error * Something bad happened to the RP stream, mark an error

1
migration/migration.h
View File

@ -451,7 +451,6 @@ bool migrate_postcopy(void);
int migrate_use_tls(void); int migrate_use_tls(void);
bool migrate_use_block_incremental(void);
int migrate_max_cpu_throttle(void); int migrate_max_cpu_throttle(void);
uint64_t ram_get_total_transferred_pages(void); uint64_t ram_get_total_transferred_pages(void);

9
migration/options.c
View File

@ -463,6 +463,15 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
/* parameters */ /* parameters */
bool migrate_block_incremental(void)
{
MigrationState *s;
s = migrate_get_current();
return s->parameters.block_incremental;
}
int migrate_compress_level(void) int migrate_compress_level(void)
{ {
MigrationState *s; MigrationState *s;

1
migration/options.h
View File

@ -45,6 +45,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp);
/* parameters */ /* parameters */
bool migrate_block_incremental(void);
int migrate_compress_level(void); int migrate_compress_level(void);
int migrate_compress_threads(void); int migrate_compress_threads(void);
int migrate_compress_wait_thread(void); int migrate_compress_wait_thread(void);