diff mbox

[v3,1/2] arch_init: make is_zero_page accept size

Message ID 7602d452904e2e9dbb59983385ff64722291a4c6.1379694109.git.yamahata@private.email.ne.jp
State New
Headers show

Commit Message

Isaku Yamahata Sept. 20, 2013, 4:23 p.m. UTC 
Later is_zero_page will be used for non TARGET_PAGE_SIZE
range.
And rename it to is_zero_range as it isn't page size any more.

Signed-off-by: Isaku Yamahata <yamahata@private.email.ne.jp>
---
 arch_init.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Juan Quintela Sept. 24, 2013, 8:28 a.m. UTC | #1 
Isaku Yamahata <yamahata@private.email.ne.jp> wrote:
> Later is_zero_page will be used for non TARGET_PAGE_SIZE
> range.
> And rename it to is_zero_range as it isn't page size any more.
>
> Signed-off-by: Isaku Yamahata <yamahata@private.email.ne.jp>

Reviewed-by: Juan Quintela <quintela@redhat.com>
diff mbox

Patch

diff --git a/arch_init.c b/arch_init.c
index e47e139..83b165b 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -150,10 +150,9 @@  int qemu_read_default_config_files(bool userconfig)
     return 0;
 }
 
-static inline bool is_zero_page(uint8_t *p)
+static inline bool is_zero_range(uint8_t *p, uint64_t size)
 {
-    return buffer_find_nonzero_offset(p, TARGET_PAGE_SIZE) ==
-        TARGET_PAGE_SIZE;
+    return buffer_find_nonzero_offset(p, size) == size;
 }
 
 /* struct contains XBZRLE cache and a static page
@@ -497,7 +496,7 @@  static int ram_save_block(QEMUFile *f, bool last_stage)
                         acct_info.dup_pages++;
                     }
                 }
-            } else if (is_zero_page(p)) {
+            } else if (is_zero_range(p, TARGET_PAGE_SIZE)) {
                 acct_info.dup_pages++;
                 bytes_sent = save_block_hdr(f, block, offset, cont,
                                             RAM_SAVE_FLAG_COMPRESS);
@@ -844,7 +843,7 @@  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_page(host)) {
+    if (ch != 0 || !is_zero_range(host, TARGET_PAGE_SIZE)) {
         memset(host, ch, size);
 #ifndef _WIN32
         if (ch == 0 &&