From: Isaku Yamahata <yamahata@private.email.ne.jp>
Date: Fri, 20 Sep 2013 16:23:37 +0000 (+0900)
Subject: migration: ram_handle_compressed
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~524^2~3^2~132^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d613a56f845788412a442c6b5aff88b38244f99a;p=sdk%2Femulator%2Fqemu.git

migration: ram_handle_compressed

ram_handle_compressed() should be aware of size > TARGET_PAGE_SIZE.
migration-rdma can call it with larger size.

Signed-off-by: Isaku Yamahata <yamahata@private.email.ne.jp>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/arch_init.c b/arch_init.c
index c72790f804..d14457da60 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -848,13 +848,14 @@ static inline void *host_from_stream_offset(QEMUFile *f,
  */
 void ram_handle_compressed(void *host, uint8_t ch, uint64_t size)
 {
-    if (ch != 0 || !is_zero_range(host, TARGET_PAGE_SIZE)) {
+    if (ch != 0 || !is_zero_range(host, size)) {
         memset(host, ch, size);
 #ifndef _WIN32
-        if (ch == 0 &&
-            (!kvm_enabled() || kvm_has_sync_mmu()) &&
-            getpagesize() <= TARGET_PAGE_SIZE) {
-            qemu_madvise(host, TARGET_PAGE_SIZE, QEMU_MADV_DONTNEED);
+        if (ch == 0 && (!kvm_enabled() || kvm_has_sync_mmu())) {
+            size = size & ~(getpagesize() - 1);
+            if (size > 0) {
+                qemu_madvise(host, size, QEMU_MADV_DONTNEED);
+            }
         }
 #endif
     }