ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Split save_zero_page from ram_save_page 

Split the function save_zero_page from ram_save_page so that we can
reuse it later.

Signed-off-by: Liang Li <liang.z.li@intel.com>
Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Liang Li 2015-03-23 16:32:22 +08:00 committed by Juan Quintela
parent 3caf633dbd
commit e2102428c0
1 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
arch_init.c
View File

@ -715,6 +715,34 @@ static void migration_bitmap_sync(void)
} }
} }
/**
* save_zero_page: Send the zero page to the stream
*
* Returns: Number of pages written.
*
* @f: QEMUFile where to send the data
* @block: block that contains the page we want to send
* @offset: offset inside the block for the page
* @p: pointer to the page
* @bytes_transferred: increase it with the number of transferred bytes
*/
static int save_zero_page(QEMUFile *f, RAMBlock *block, ram_addr_t offset,
uint8_t *p, uint64_t *bytes_transferred)
{
int pages = -1;
if (is_zero_range(p, TARGET_PAGE_SIZE)) {
acct_info.dup_pages++;
*bytes_transferred += save_page_header(f, block,
offset | RAM_SAVE_FLAG_COMPRESS);
qemu_put_byte(f, 0);
*bytes_transferred += 1;
pages = 1;
}
return pages;
}
/** /**
* ram_save_page: Send the given page to the stream * ram_save_page: Send the given page to the stream
* *
@ -763,13 +791,9 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset,
acct_info.dup_pages++; acct_info.dup_pages++;
} }
} }
} else if (is_zero_range(p, TARGET_PAGE_SIZE)) { } else {
acct_info.dup_pages++; pages = save_zero_page(f, block, offset, p, bytes_transferred);
*bytes_transferred += save_page_header(f, block, if (pages > 0) {
offset | RAM_SAVE_FLAG_COMPRESS);
qemu_put_byte(f, 0);
*bytes_transferred += 1;
pages = 1;
/* 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
*/ */
@ -784,6 +808,7 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset,
send_async = false; send_async = false;
} }
} }
}
/* XBZRLE overflow or normal page */ /* XBZRLE overflow or normal page */
if (pages == -1) { if (pages == -1) {