[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] rename save_block_hdr to save_page_header
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 08/11] rename save_block_hdr to save_page_header |
Date: |
Mon, 16 Mar 2015 14:41:09 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] [PULL 01/11] Add -incoming defer, (continued)
- [Qemu-devel] [PULL 01/11] Add -incoming defer, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 02/11] Add migrate_incoming, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 06/11] save_xbzrle_page: change calling convention, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 04/11] ram_find_and_save_block: change calling convention, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 05/11] ram_save_page: change calling covention, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 03/11] ram: make all save_page functions take a uint64_t parameter, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 07/11] save_block_hdr: we can recalculate the cont parameter here, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 08/11] rename save_block_hdr to save_page_header,
Juan Quintela <=
- [Qemu-devel] [PULL 09/11] migration: Read JSON VM description on incoming migration, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 10/11] migration: Allow to suppress vmdesc submission, Juan Quintela, 2015/03/16
- [Qemu-devel] [PULL 11/11] pc: Disable vmdesc submission for old machines, Juan Quintela, 2015/03/16
- Re: [Qemu-devel] [PULL 00/11] Migration pull request, Markus Armbruster, 2015/03/16
- Re: [Qemu-devel] [PULL 00/11] Migration pull request, Peter Maydell, 2015/03/16