qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH v9 03/10] Add save_block_hdr function


From: Anthony Liguori
Subject: Re: [Qemu-devel] [PATCH v9 03/10] Add save_block_hdr function
Date: Wed, 18 Apr 2012 12:22:46 -0500
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1

On 04/11/2012 01:49 PM, Orit Wasserman wrote:
Signed-off-by: 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>
---
  arch_init.c |   26 ++++++++++++++------------
  1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/arch_init.c b/arch_init.c
index 2e534f1..47b9fef 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -347,6 +347,18 @@ void cache_resize(int64_t new_size)
      g_free(old_page_cache);
  }

+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));
+        }
+
+}


Any time we're changing protocols/formats, we need to document it. We need a docs/xbzrle.txt (and it should be before this patch).

It's not clear to me how we preserve compatibility here either. You're potentially passing garbage to an older QEMU.

I thought I had previously asked for a monitor command to negotiate extensions for migration?

Regards,

Anthony Liguori

+
  static RAMBlock *last_block;
  static ram_addr_t last_offset;

@@ -373,21 +385,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;We
              }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]