[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/13] Add save_block_hdr function
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 03/13] Add save_block_hdr function |
Date: |
Fri, 29 Jun 2012 18:43:54 +0200 |
From: Orit Wasserman <address@hidden>
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>
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 81c2e54..cfa1af2 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -161,6 +161,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;
@@ -187,21 +199,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.10.4
- [Qemu-devel] [PATCH v3 00/13] Migration tree, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 02/13] Add MigrationParams structure, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 01/13] Add missing check for host_from_stream_offset return value for RAM_SAVE_FLAG_PAGE, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 05/13] Add migration_end function, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 07/13] Add tracepoints for savevm section start/end, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 04/13] Add debugging infrastructure, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 11/13] Exit loop if we have been there too long, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 06/13] Add spent time for migration, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 03/13] Add save_block_hdr function,
Juan Quintela <=
- [Qemu-devel] [PATCH 08/13] No need to iterate if we already are over the limit, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 12/13] dirty bitmap: abstract its use, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 10/13] Only calculate expected_time for stage 2, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 13/13] Maintain the number of dirty pages, Juan Quintela, 2012/06/29
- [Qemu-devel] [PATCH 09/13] Only TCG needs TLB handling, Juan Quintela, 2012/06/29