[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] migration: ram_handle_compressed
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 9/9] migration: ram_handle_compressed |
Date: |
Tue, 24 Sep 2013 14:03:23 +0200 |
From: Isaku Yamahata <address@hidden>
ram_handle_compressed() should be aware of size > TARGET_PAGE_SIZE.
migration-rdma can call it with larger size.
Signed-off-by: Isaku Yamahata <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index c72790f..d14457d 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
}
--
1.8.3.1
- [Qemu-devel] [PULL 0/9] migration queue, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 1/9] savevm: add comments for qemu_file_get_error(), Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 2/9] savevm: fix wrong initialization by ram_control_load_hook, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 4/9] rdma: clean up of qemu_rdma_cleanup(), Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 5/9] rdma: constify ram_chunk_{index, start, end}, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 6/9] migration: add version supporting macros for struct pointer, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 7/9] migration: Fix debug print type, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 9/9] migration: ram_handle_compressed,
Juan Quintela <=
- [Qemu-devel] [PATCH 8/9] arch_init: make is_zero_page accept size, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 3/9] arch_init: right return for ram_save_iterate, Juan Quintela, 2013/09/24