From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiJkZ-0005rj-7e for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:36:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiJkU-0004sI-7k for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:36:51 -0400 Received: from mga09.intel.com ([134.134.136.24]:4177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiJkU-0004rs-27 for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:36:46 -0400 From: Liang Li Date: Wed, 15 Apr 2015 17:26:16 +0800 Message-Id: <1429089983-24644-8-git-send-email-liang.z.li@intel.com> In-Reply-To: <1429089983-24644-1-git-send-email-liang.z.li@intel.com> References: <1429089983-24644-1-git-send-email-liang.z.li@intel.com> Subject: [Qemu-devel] [v8 07/14] migration: Split save_zero_page from ram_save_page List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: quintela@redhat.com, Liang Li , armbru@redhat.com, lcapitulino@redhat.com, yang.z.zhang@intel.com, amit.shah@redhat.com, dgilbert@redhat.com Split the function save_zero_page from ram_save_page so that we can reuse it later. Signed-off-by: Liang Li Signed-off-by: Yang Zhang Reviewed-by: Juan Quintela --- 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