diff options
| author | Isaku Yamahata <yamahata@private.email.ne.jp> | 2013-09-21 01:23:37 +0900 |
|---|---|---|
| committer | Juan Quintela <quintela@trasno.org> | 2013-09-24 13:22:50 +0200 |
| commit | d613a56f845788412a442c6b5aff88b38244f99a (patch) | |
| tree | c9463be2793075a408421a75d35aa883ac548e1a /arch_init.c | |
| parent | dc3c26a479e5bd19c1b3c04f696b8f70ad57f0b7 (diff) | |
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>
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 11 |
1 files changed, 6 insertions, 5 deletions
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 } |