From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXVGu-0001uI-JM for qemu-devel@nongnu.org; Mon, 16 Mar 2015 09:41:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXVGo-0000vU-DR for qemu-devel@nongnu.org; Mon, 16 Mar 2015 09:41:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXVGo-0000vJ-4n for qemu-devel@nongnu.org; Mon, 16 Mar 2015 09:41:26 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2GDfP9a024210 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 16 Mar 2015 09:41:25 -0400 From: Juan Quintela Date: Mon, 16 Mar 2015 14:41:09 +0100 Message-Id: <1426513272-20070-9-git-send-email-quintela@redhat.com> In-Reply-To: <1426513272-20070-1-git-send-email-quintela@redhat.com> References: <1426513272-20070-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 08/11] rename save_block_hdr to save_page_header List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org It has always been a page header, not a block header. Once there, the flag argument was only passed to make a bit or with it, just do the or on the caller. Signed-off-by: Juan Quintela --- arch_init.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/arch_init.c b/arch_init.c index 7377a07..c3f7d3f 100644 --- a/arch_init.c +++ b/arch_init.c @@ -316,8 +316,19 @@ static uint64_t migration_dirty_pages; static uint32_t last_version; static bool ram_bulk_stage; -static size_t save_block_hdr(QEMUFile *f, RAMBlock *block, ram_addr_t offset, - int flag) +/** + * save_page_header: Write page header to wire + * + * If this is the 1st block, it also writes the block identification + * + * Returns: Number of bytes 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 + * in the lower bits, it contains flags + */ +static size_t save_page_header(QEMUFile *f, RAMBlock *block, ram_addr_t offset) { size_t size; @@ -325,7 +336,7 @@ static size_t save_block_hdr(QEMUFile *f, RAMBlock *block, ram_addr_t offset, offset |= RAM_SAVE_FLAG_CONTINUE; } - qemu_put_be64(f, offset | flag); + qemu_put_be64(f, offset); size = 8; if (block != last_sent_block) { @@ -425,7 +436,7 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t **current_data, } /* Send XBZRLE based compressed page */ - bytes_xbzrle = save_block_hdr(f, block, offset, RAM_SAVE_FLAG_XBZRLE); + bytes_xbzrle = save_page_header(f, block, offset | RAM_SAVE_FLAG_XBZRLE); qemu_put_byte(f, ENCODING_FLAG_XBZRLE); qemu_put_be16(f, encoded_len); qemu_put_buffer(f, XBZRLE.encoded_buf, encoded_len); @@ -643,8 +654,8 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset, } } else if (is_zero_range(p, TARGET_PAGE_SIZE)) { acct_info.dup_pages++; - *bytes_transferred += save_block_hdr(f, block, offset, - RAM_SAVE_FLAG_COMPRESS); + *bytes_transferred += save_page_header(f, block, + offset | RAM_SAVE_FLAG_COMPRESS); qemu_put_byte(f, 0); *bytes_transferred += 1; pages = 1; @@ -665,8 +676,8 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset, /* XBZRLE overflow or normal page */ if (pages == -1) { - *bytes_transferred += save_block_hdr(f, block, offset, - RAM_SAVE_FLAG_PAGE); + *bytes_transferred += save_page_header(f, block, + offset | RAM_SAVE_FLAG_PAGE); if (send_async) { qemu_put_buffer_async(f, p, TARGET_PAGE_SIZE); } else { -- 2.1.0