From d613a56f845788412a442c6b5aff88b38244f99a Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Sat, 21 Sep 2013 01:23:37 +0900 Subject: 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 Signed-off-by: Juan Quintela --- arch_init.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'arch_init.c') 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 } -- cgit v1.2.3