Patchwork [v7,03/11] Add save_block_hdr function

login
register
mail settings
Submitter Orit Wasserman
Date Jan. 26, 2012, 2:24 p.m.
Message ID <1327587897-31192-4-git-send-email-owasserm@redhat.com>
Download mbox | patch
Permalink /patch/137931/
State New
Headers show

Comments

Orit Wasserman - Jan. 26, 2012, 2:24 p.m.
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---
 arch_init.c |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

Patch

diff --git a/arch_init.c b/arch_init.c
index bdc74a9..ac21bc0 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -300,6 +300,17 @@  static void cache_insert(unsigned long addr, uint8_t *pdata)
     it->it_addr = addr;
 }
 
+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;
 
@@ -325,21 +336,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;
             }