diff options
| author | Isaku Yamahata <yamahata@private.email.ne.jp> | 2013-09-21 01:23:36 +0900 |
|---|---|---|
| committer | Juan Quintela <quintela@trasno.org> | 2013-09-24 13:22:50 +0200 |
| commit | dc3c26a479e5bd19c1b3c04f696b8f70ad57f0b7 (patch) | |
| tree | ed41befb8546ddacb7545df1fad4fc1e5b3513f2 | |
| parent | 5016e2df569bc7d67637060103dd360ed2f0d557 (diff) | |
| download | focaccia-qemu-dc3c26a479e5bd19c1b3c04f696b8f70ad57f0b7.tar.gz focaccia-qemu-dc3c26a479e5bd19c1b3c04f696b8f70ad57f0b7.zip | |
arch_init: make is_zero_page accept size
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> Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | arch_init.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch_init.c b/arch_init.c index 18cd9a1f11..c72790f804 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); @@ -849,7 +848,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 && |