Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 10:25:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migration: Drop current address parameter from save_zero_page()

Browse Source 
It already has RAMBlock and offset, it can calculate it itself.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2018-01-08 18:58:17 +01:00 committed by Dr. David Alan Gilbert
parent 0781c1ed1c
commit 7faccdc3e7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/ram.c
View File

@ -907,11 +907,10 @@ static void migration_bitmap_sync(RAMState *rs)
* @rs: current RAM state * @rs: current RAM state
* @block: block that contains the page we want to send * @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
* @p: pointer to the page
*/ */
static int save_zero_page(RAMState *rs, RAMBlock *block, ram_addr_t offset, static int save_zero_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
uint8_t *p)
{ {
uint8_t *p = block->host + offset;
int pages = -1; int pages = -1;
if (is_zero_range(p, TARGET_PAGE_SIZE)) { if (is_zero_range(p, TARGET_PAGE_SIZE)) {
@ -984,7 +983,7 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss, bool last_stage)
} }
} }
} else { } else {
pages = save_zero_page(rs, block, offset, p); pages = save_zero_page(rs, block, offset);
if (pages > 0) { if (pages > 0) {
/* 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
@ -1160,7 +1159,7 @@ static int ram_save_compressed_page(RAMState *rs, PageSearchStatus *pss,
*/ */
if (block != rs->last_sent_block) { if (block != rs->last_sent_block) {
flush_compressed_data(rs); flush_compressed_data(rs);
pages = save_zero_page(rs, block, offset, p); pages = save_zero_page(rs, block, offset);
if (pages == -1) { if (pages == -1) {
/* Make sure the first page is sent out before other pages */ /* Make sure the first page is sent out before other pages */
bytes_xmit = save_page_header(rs, rs->f, block, offset | bytes_xmit = save_page_header(rs, rs->f, block, offset |
@ -1180,7 +1179,7 @@ static int ram_save_compressed_page(RAMState *rs, PageSearchStatus *pss,
ram_release_pages(block->idstr, offset, pages); ram_release_pages(block->idstr, offset, pages);
} }
} else { } else {
pages = save_zero_page(rs, block, offset, p); pages = save_zero_page(rs, block, offset);
if (pages == -1) { if (pages == -1) {
pages = compress_page_with_multi_thread(rs, block, offset); pages = compress_page_with_multi_thread(rs, block, offset);
} else { } else {