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

migration: save_zero_page() can take block through pss

Browse Source 
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-06-13 13:38:30 +02:00
parent 944853c201
commit e8e4e7acd8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
migration/ram.c
View File

@ -1144,13 +1144,12 @@ void ram_release_page(const char *rbname, uint64_t offset)
* *
* @rs: current RAM state * @rs: current RAM state
* @pss: current PSS channel * @pss: current PSS channel
* @block: block that contains the page we want to send
* @offset: offset inside the block for the page * @offset: offset inside the block for the page
*/ */
static int save_zero_page(RAMState *rs, PageSearchStatus *pss, RAMBlock *block, static int save_zero_page(RAMState *rs, PageSearchStatus *pss,
ram_addr_t offset) ram_addr_t offset)
{ {
uint8_t *p = block->host + offset; uint8_t *p = pss->block->host + offset;
QEMUFile *file = pss->pss_channel; QEMUFile *file = pss->pss_channel;
int len = 0; int len = 0;
@ -1158,10 +1157,10 @@ static int save_zero_page(RAMState *rs, PageSearchStatus *pss, RAMBlock *block,
return 0; return 0;
} }
len += save_page_header(pss, file, block, offset | RAM_SAVE_FLAG_ZERO); len += save_page_header(pss, file, pss->block, offset | RAM_SAVE_FLAG_ZERO);
qemu_put_byte(file, 0); qemu_put_byte(file, 0);
len += 1; len += 1;
ram_release_page(block->idstr, offset); ram_release_page(pss->block->idstr, offset);
stat64_add(&mig_stats.zero_pages, 1); stat64_add(&mig_stats.zero_pages, 1);
ram_transferred_add(len); ram_transferred_add(len);
@ -1172,7 +1171,7 @@ static int save_zero_page(RAMState *rs, PageSearchStatus *pss, RAMBlock *block,
*/ */
if (rs->xbzrle_started) { if (rs->xbzrle_started) {
XBZRLE_cache_lock(); XBZRLE_cache_lock();
xbzrle_cache_zero_page(block->offset + offset); xbzrle_cache_zero_page(pss->block->offset + offset);
XBZRLE_cache_unlock(); XBZRLE_cache_unlock();
} }
@ -2119,7 +2118,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)
return 1; return 1;
} }
if (save_zero_page(rs, pss, block, offset)) { if (save_zero_page(rs, pss, offset)) {
return 1; return 1;
} }