motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: Move migrate_use_xbzrle() to options.c

Browse source 
Once that we are there, we rename the function to migrate_xbzrle()
to be consistent with all other capabilities.
We change the type to return bool also for consistency.

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:20:13 +01:00
parent b4bc342c76
commit 87dca0c9bb
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
migration/migration.c
View file

@ -1122,7 +1122,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
info->ram->downtime_bytes = stat64_get(&ram_counters.downtime_bytes); info->ram->downtime_bytes = stat64_get(&ram_counters.downtime_bytes);
info->ram->postcopy_bytes = stat64_get(&ram_counters.postcopy_bytes); info->ram->postcopy_bytes = stat64_get(&ram_counters.postcopy_bytes);
if (migrate_use_xbzrle()) { if (migrate_xbzrle()) {
info->xbzrle_cache = g_malloc0(sizeof(*info->xbzrle_cache)); info->xbzrle_cache = g_malloc0(sizeof(*info->xbzrle_cache));
info->xbzrle_cache->cache_size = migrate_xbzrle_cache_size(); info->xbzrle_cache->cache_size = migrate_xbzrle_cache_size();
info->xbzrle_cache->bytes = xbzrle_counters.bytes; info->xbzrle_cache->bytes = xbzrle_counters.bytes;
@ -2604,15 +2604,6 @@ int migrate_use_tls(void)
return s->parameters.tls_creds && *s->parameters.tls_creds; return s->parameters.tls_creds && *s->parameters.tls_creds;
} }
int migrate_use_xbzrle(void)
{
MigrationState *s;
s = migrate_get_current();
return s->capabilities[MIGRATION_CAPABILITY_XBZRLE];
}
uint64_t migrate_xbzrle_cache_size(void) uint64_t migrate_xbzrle_cache_size(void)
{ {
MigrationState *s; MigrationState *s;

1
migration/migration.h
View file

@ -455,7 +455,6 @@ int migrate_multifd_zlib_level(void);
int migrate_multifd_zstd_level(void); int migrate_multifd_zstd_level(void);
int migrate_use_tls(void); int migrate_use_tls(void);
int migrate_use_xbzrle(void);
uint64_t migrate_xbzrle_cache_size(void); uint64_t migrate_xbzrle_cache_size(void);
bool migrate_use_block(void); bool migrate_use_block(void);

9
migration/options.c
View file

@ -147,6 +147,15 @@ bool migrate_validate_uuid(void)
return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID]; return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID];
} }
bool migrate_xbzrle(void)
{
MigrationState *s;
s = migrate_get_current();
return s->capabilities[MIGRATION_CAPABILITY_XBZRLE];
}
bool migrate_zero_blocks(void) bool migrate_zero_blocks(void)
{ {
MigrationState *s; MigrationState *s;

1
migration/options.h
View file

@ -31,6 +31,7 @@ bool migrate_postcopy_preempt(void);
bool migrate_postcopy_ram(void); bool migrate_postcopy_ram(void);
bool migrate_release_ram(void); bool migrate_release_ram(void);
bool migrate_validate_uuid(void); bool migrate_validate_uuid(void);
bool migrate_xbzrle(void);
bool migrate_zero_blocks(void); bool migrate_zero_blocks(void);
bool migrate_zero_copy_send(void); bool migrate_zero_copy_send(void);

10
migration/ram.c
View file

@ -156,14 +156,14 @@ static struct {
static void XBZRLE_cache_lock(void) static void XBZRLE_cache_lock(void)
{ {
if (migrate_use_xbzrle()) { if (migrate_xbzrle()) {
qemu_mutex_lock(&XBZRLE.lock); qemu_mutex_lock(&XBZRLE.lock);
} }
} }
static void XBZRLE_cache_unlock(void) static void XBZRLE_cache_unlock(void)
{ {
if (migrate_use_xbzrle()) { if (migrate_xbzrle()) {
qemu_mutex_unlock(&XBZRLE.lock); qemu_mutex_unlock(&XBZRLE.lock);
} }
} }
@ -1137,7 +1137,7 @@ static void migration_update_rates(RAMState *rs, int64_t end_time)
return; return;
} }
if (migrate_use_xbzrle()) { if (migrate_xbzrle()) {
double encoded_size, unencoded_size; double encoded_size, unencoded_size;
xbzrle_counters.cache_miss_rate = (double)(xbzrle_counters.cache_miss - xbzrle_counters.cache_miss_rate = (double)(xbzrle_counters.cache_miss -
@ -1626,7 +1626,7 @@ static int find_dirty_block(RAMState *rs, PageSearchStatus *pss)
/* Flag that we've looped */ /* Flag that we've looped */
pss->complete_round = true; pss->complete_round = true;
/* After the first round, enable XBZRLE. */ /* After the first round, enable XBZRLE. */
if (migrate_use_xbzrle()) { if (migrate_xbzrle()) {
rs->xbzrle_enabled = true; rs->xbzrle_enabled = true;
} }
} }
@ -2979,7 +2979,7 @@ static int xbzrle_init(void)
{ {
Error *local_err = NULL; Error *local_err = NULL;
if (!migrate_use_xbzrle()) { if (!migrate_xbzrle()) {
return 0; return 0;
} }