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.
Signed-off-by: Hongyong Zang <zanghongyong@xxxxxxxxxx>
---
tools/kvm/x86/bios.c | 2 +-
tools/kvm/x86/kvm.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/kvm/x86/bios.c b/tools/kvm/x86/bios.c
index ded0717..06ec708 100644
--- a/tools/kvm/x86/bios.c
+++ b/tools/kvm/x86/bios.c
@@ -93,7 +93,7 @@ static void e820_setup(struct kvm *kvm)
};
mem_map[i++] = (struct e820entry) {
.addr = 0x100000000ULL,
- .size = kvm->ram_size - KVM_32BIT_GAP_START,
+ .size = kvm->ram_size - 0x100000000ULL,
.type = E820_RAM,
};
}
diff --git a/tools/kvm/x86/kvm.c b/tools/kvm/x86/kvm.c
index d2fbbe2..11a726e 100644
--- a/tools/kvm/x86/kvm.c
+++ b/tools/kvm/x86/kvm.c
@@ -111,7 +111,7 @@ 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_size = kvm->ram_size - phys_start;
host_mem = kvm->ram_start + phys_start;
kvm__register_mem(kvm, phys_start, phys_size, host_mem);
@@ -156,12 +156,12 @@ void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, const char *hugetlbfs_
if (ret < 0)
die_perror("KVM_CREATE_PIT2 ioctl");
- kvm->ram_size = ram_size;
-
- if (kvm->ram_size < KVM_32BIT_GAP_START) {
- kvm->ram_start = mmap_anon_or_hugetlbfs(hugetlbfs_path, ram_size);
+ if (ram_size < KVM_32BIT_GAP_START) {
+ kvm->ram_size = ram_size;
+ kvm->ram_start = mmap_anon_or_hugetlbfs(hugetlbfs_path, kvm->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;
+ kvm->ram_start = mmap_anon_or_hugetlbfs(hugetlbfs_path, kvm->ram_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
