[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [v7 07/14] migration: Split save_zero_page from ram_save_pa
From: |
Liang Li |
Subject: |
[Qemu-devel] [v7 07/14] migration: Split save_zero_page from ram_save_page |
Date: |
Wed, 8 Apr 2015 14:20:04 +0800 |
Split the function save_zero_page from ram_save_page so that we can
reuse it later.
Signed-off-by: Liang Li <address@hidden>
Signed-off-by: Yang Zhang <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
arch_init.c | 61 +++++++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 43 insertions(+), 18 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 67f5a24..44ac002 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -714,6 +714,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
*
* Returns: Number of pages written.
@@ -761,25 +789,22 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block,
ram_addr_t offset,
acct_info.dup_pages++;
}
}
- } else 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;
- /* Must let xbzrle know, otherwise a previous (now 0'd) cached
- * page would be stale
- */
- xbzrle_cache_zero_page(current_addr);
- } else if (!ram_bulk_stage && migrate_use_xbzrle()) {
- pages = save_xbzrle_page(f, &p, current_addr, block,
- offset, last_stage, bytes_transferred);
- if (!last_stage) {
- /* Can't send this cached data async, since the cache page
- * might get updated before it gets to the wire
+ } else {
+ pages = save_zero_page(f, block, offset, p, bytes_transferred);
+ if (pages > 0) {
+ /* Must let xbzrle know, otherwise a previous (now 0'd) cached
+ * page would be stale
*/
- send_async = false;
+ xbzrle_cache_zero_page(current_addr);
+ } else if (!ram_bulk_stage && migrate_use_xbzrle()) {
+ pages = save_xbzrle_page(f, &p, current_addr, block,
+ offset, last_stage, bytes_transferred);
+ if (!last_stage) {
+ /* Can't send this cached data async, since the cache page
+ * might get updated before it gets to the wire
+ */
+ send_async = false;
+ }
}
}
--
1.9.1
- [Qemu-devel] [PATCH v7 0/14] migration: Add a new feature to do live migration, Liang Li, 2015/04/08
- [Qemu-devel] [v7 01/14] docs: Add a doc about multiple thread compression, Liang Li, 2015/04/08
- [Qemu-devel] [v7 04/14] qemu-file: Add compression functions to QEMUFile, Liang Li, 2015/04/08
- [Qemu-devel] [v7 02/14] migration: Add the framework of multi-thread compression, Liang Li, 2015/04/08
- [Qemu-devel] [v7 03/14] migration: Add the framework of multi-thread decompression, Liang Li, 2015/04/08
- [Qemu-devel] [v7 05/14] arch_init: Alloc and free data struct for compression, Liang Li, 2015/04/08
- [Qemu-devel] [v7 06/14] arch_init: Add and free data struct for decompression, Liang Li, 2015/04/08
- [Qemu-devel] [v7 07/14] migration: Split save_zero_page from ram_save_page,
Liang Li <=
- [Qemu-devel] [v7 08/14] migration: Add the core code of multi-thread compression, Liang Li, 2015/04/08
- [Qemu-devel] [v7 09/14] migration: Make compression co-work with xbzrle, Liang Li, 2015/04/08
- [Qemu-devel] [v7 10/14] migration: Add the core code for decompression, Liang Li, 2015/04/08
- [Qemu-devel] [v7 11/14] migration: Add interface to control compression, Liang Li, 2015/04/08