From: Hongyong Zang <zanghongyong@xxxxxxxxxx>
If a guest's ram_size exceeds KVM_32BIT_GAP_START, the corresponding kvm tool's
virtual address size should be (ram_size + KVM_32BIT_GAP_SIZE), rather than ram_size.
Use macro define KVM_32BIT_MAX_MEM_SIZE instead of magic number "0x100000000ULL".
Signed-off-by: Hongyong Zang <zanghongyong@xxxxxxxxxx>
---
tools/kvm/x86/bios.c | 4 ++--
tools/kvm/x86/include/kvm/kvm-arch.h | 3 ++-
tools/kvm/x86/kvm.c | 10 +++++-----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tools/kvm/x86/bios.c b/tools/kvm/x86/bios.c
index 64a072c..0f1bd85 100644
--- a/tools/kvm/x86/bios.c
+++ b/tools/kvm/x86/bios.c
@@ -92,8 +92,8 @@ static void e820_setup(struct kvm *kvm)
.type = E820_RAM,
};
mem_map[i++] = (struct e820entry) {
- .addr = 0x100000000ULL,
- .size = kvm->ram_size - KVM_32BIT_GAP_START,
+ .addr = KVM_32BIT_MAX_MEM_SIZE,
+ .size = kvm->ram_size - KVM_32BIT_MAX_MEM_SIZE,
.type = E820_RAM,
};
}
diff --git a/tools/kvm/x86/include/kvm/kvm-arch.h b/tools/kvm/x86/include/kvm/kvm-arch.h
index 244d36c..ba04561 100644
--- a/tools/kvm/x86/include/kvm/kvm-arch.h
+++ b/tools/kvm/x86/include/kvm/kvm-arch.h
@@ -11,8 +11,9 @@
/*
* The hole includes VESA framebuffer and PCI memory.
*/
+#define KVM_32BIT_MAX_MEM_SIZE (1ULL << 32)
#define KVM_32BIT_GAP_SIZE (768 << 20)
-#define KVM_32BIT_GAP_START ((1ULL << 32) - KVM_32BIT_GAP_SIZE)
+#define KVM_32BIT_GAP_START (KVM_32BIT_MAX_MEM_SIZE - KVM_32BIT_GAP_SIZE)
#define KVM_MMIO_START KVM_32BIT_GAP_START
diff --git a/tools/kvm/x86/kvm.c b/tools/kvm/x86/kvm.c
index 286f106..a218881 100644
--- a/tools/kvm/x86/kvm.c
+++ b/tools/kvm/x86/kvm.c
@@ -109,8 +109,8 @@ void kvm__init_ram(struct kvm *kvm)
/* Second RAM range from 4GB to the end of RAM: */
- phys_start = 0x100000000ULL;
- phys_size = kvm->ram_size - phys_size;
+ phys_start = KVM_32BIT_MAX_MEM_SIZE;
+ phys_size = kvm->ram_size - phys_start;
host_mem = kvm->ram_start + phys_start;
kvm__register_mem(kvm, phys_start, phys_size, host_mem);
@@ -155,12 +155,12 @@ void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size)
if (ret < 0)
die_perror("KVM_CREATE_PIT2 ioctl");
- kvm->ram_size = ram_size;
-
- if (kvm->ram_size < KVM_32BIT_GAP_START) {
+ if (ram_size < KVM_32BIT_GAP_START) {
+ kvm->ram_size = ram_size;
kvm->ram_start = mmap_anon_or_hugetlbfs(hugetlbfs_path, ram_size);
} else {
kvm->ram_start = mmap_anon_or_hugetlbfs(hugetlbfs_path, ram_size + KVM_32BIT_GAP_SIZE);
+ kvm->ram_size = ram_size + KVM_32BIT_GAP_SIZE;
if (kvm->ram_start != MAP_FAILED)
/*
* We mprotect the gap (see kvm__init_ram() for details) PROT_NONE so that
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
