mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Rename xbzrle_enabled xbzrle_started

Browse Source 
Otherwise it is confusing with the function xbzrle_enabled().

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230504115323.24407-1-quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-05-04 13:53:23 +02:00
parent 40f240a764
commit f3095cc8a7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
migration/ram.c
View File

@ -388,8 +388,8 @@ struct RAMState {
uint64_t xbzrle_pages_prev; uint64_t xbzrle_pages_prev;
/* Amount of xbzrle encoded bytes since the beginning of the period */ /* Amount of xbzrle encoded bytes since the beginning of the period */
uint64_t xbzrle_bytes_prev; uint64_t xbzrle_bytes_prev;
/* Start using XBZRLE (e.g., after the first round). */ /* Are we really using XBZRLE (e.g., after the first round). */
bool xbzrle_enabled; bool xbzrle_started;
/* Are we on the last stage of migration */ /* Are we on the last stage of migration */
bool last_stage; bool last_stage;
/* compression statistics since the beginning of the period */ /* compression statistics since the beginning of the period */
@ -1420,7 +1420,7 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss)
trace_ram_save_page(block->idstr, (uint64_t)offset, p); trace_ram_save_page(block->idstr, (uint64_t)offset, p);
XBZRLE_cache_lock(); XBZRLE_cache_lock();
if (rs->xbzrle_enabled && !migration_in_postcopy()) { if (rs->xbzrle_started && !migration_in_postcopy()) {
pages = save_xbzrle_page(rs, pss, &p, current_addr, pages = save_xbzrle_page(rs, pss, &p, current_addr,
block, offset); block, offset);
if (!rs->last_stage) { if (!rs->last_stage) {
@ -1636,7 +1636,7 @@ static int find_dirty_block(RAMState *rs, PageSearchStatus *pss)
pss->complete_round = true; pss->complete_round = true;
/* After the first round, enable XBZRLE. */ /* After the first round, enable XBZRLE. */
if (migrate_xbzrle()) { if (migrate_xbzrle()) {
rs->xbzrle_enabled = true; rs->xbzrle_started = true;
} }
} }
/* Didn't find anything this time, but try again on the new block */ /* Didn't find anything this time, but try again on the new block */
@ -2288,7 +2288,7 @@ static bool save_page_use_compression(RAMState *rs)
* using the data compression. In theory, xbzrle can do better than * using the data compression. In theory, xbzrle can do better than
* compression. * compression.
*/ */
if (rs->xbzrle_enabled) { if (rs->xbzrle_started) {
return false; return false;
} }
@ -2357,7 +2357,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)
/* Must let xbzrle know, otherwise a previous (now 0'd) cached /* Must let xbzrle know, otherwise a previous (now 0'd) cached
* page would be stale * page would be stale
*/ */
if (rs->xbzrle_enabled) { if (rs->xbzrle_started) {
XBZRLE_cache_lock(); XBZRLE_cache_lock();
xbzrle_cache_zero_page(rs, block->offset + offset); xbzrle_cache_zero_page(rs, block->offset + offset);
XBZRLE_cache_unlock(); XBZRLE_cache_unlock();
@ -2738,7 +2738,7 @@ static void ram_state_reset(RAMState *rs)
rs->last_seen_block = NULL; rs->last_seen_block = NULL;
rs->last_page = 0; rs->last_page = 0;
rs->last_version = ram_list.version; rs->last_version = ram_list.version;
rs->xbzrle_enabled = false; rs->xbzrle_started = false;
} }
#define MAX_WAIT 50 /* ms, half buffered_file limit */ #define MAX_WAIT 50 /* ms, half buffered_file limit */