[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 6/9] Add save_block_hdr function
From: |
Orit Wasserman |
Subject: |
[Qemu-devel] [PATCH v11 6/9] Add save_block_hdr function |
Date: |
Tue, 22 May 2012 15:57:02 +0300 |
Signed-off-by: Benoit Hudzia <address@hidden>
Signed-off-by: Petter Svard <address@hidden>
Signed-off-by: Aidan Shribman <address@hidden>
Signed-off-by: Orit Wasserman <address@hidden>
---
arch_init.c | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 988adca..071dc8d 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -157,6 +157,18 @@ static int is_dup_page(uint8_t *page)
return 1;
}
+static void save_block_hdr(QEMUFile *f, RAMBlock *block, ram_addr_t offset,
+ int cont, int flag)
+{
+ qemu_put_be64(f, offset | cont | flag);
+ if (!cont) {
+ qemu_put_byte(f, strlen(block->idstr));
+ qemu_put_buffer(f, (uint8_t *)block->idstr,
+ strlen(block->idstr));
+ }
+
+}
+
static RAMBlock *last_block;
static ram_addr_t last_offset;
@@ -183,21 +195,11 @@ static int ram_save_block(QEMUFile *f)
p = memory_region_get_ram_ptr(mr) + offset;
if (is_dup_page(p)) {
- qemu_put_be64(f, offset | cont | RAM_SAVE_FLAG_COMPRESS);
- if (!cont) {
- qemu_put_byte(f, strlen(block->idstr));
- qemu_put_buffer(f, (uint8_t *)block->idstr,
- strlen(block->idstr));
- }
+ save_block_hdr(f, block, offset, cont, RAM_SAVE_FLAG_COMPRESS);
qemu_put_byte(f, *p);
bytes_sent = 1;
} else {
- qemu_put_be64(f, offset | cont | RAM_SAVE_FLAG_PAGE);
- if (!cont) {
- qemu_put_byte(f, strlen(block->idstr));
- qemu_put_buffer(f, (uint8_t *)block->idstr,
- strlen(block->idstr));
- }
+ save_block_hdr(f, block, offset, cont, RAM_SAVE_FLAG_PAGE);
qemu_put_buffer(f, p, TARGET_PAGE_SIZE);
bytes_sent = TARGET_PAGE_SIZE;
}
--
1.7.7.6
- [Qemu-devel] [PATCH v11 0/9] XBZRLE delta for live migration of large memory app, Orit Wasserman, 2012/05/22
- [Qemu-devel] [PATCH v11 1/9] Add MigrationParams structure, Orit Wasserman, 2012/05/22
- [Qemu-devel] [PATCH v11 3/9] Add XBZRLE documentation, Orit Wasserman, 2012/05/22
- [Qemu-devel] [PATCH v11 6/9] Add save_block_hdr function,
Orit Wasserman <=
- [Qemu-devel] [PATCH v11 5/9] Add uleb encoding/decoding functions, Orit Wasserman, 2012/05/22
- [Qemu-devel] [PATCH v11 7/9] Add XBZRLE to ram_save_block and ram_save_live, Orit Wasserman, 2012/05/22
- [Qemu-devel] [PATCH v11 2/9] Add migration capabilites, Orit Wasserman, 2012/05/22
- [Qemu-devel] [PATCH v11 8/9] Add set_cachesize command, Orit Wasserman, 2012/05/22
- [Qemu-devel] [PATCH v11 4/9] Add cache handling functions, Orit Wasserman, 2012/05/22
- [Qemu-devel] [PATCH v11 9/9] Add XBZRLE statistics, Orit Wasserman, 2012/05/22