From 983dfc3b135de0a4808a41a8ca71e1809ba6a62e Mon Sep 17 00:00:00 2001 From: Huang Ying Date: Mon, 11 Oct 2010 15:31:20 -0300 Subject: [PATCH] Add RAM -> physical addr mapping in MCE simulation In QEMU-KVM, physical address != RAM address. While MCE simulation needs physical address instead of RAM address. So kvm_physical_memory_addr_from_ram() is implemented to do the conversion, and it is invoked before being filled in the IA32_MCi_ADDR MSR. Reported-by: Dean Nelson Signed-off-by: Huang Ying Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity --- kvm-all.c | 18 ++++++++++++++++++ kvm.h | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/kvm-all.c b/kvm-all.c index 1cc696f3c5..37b99c7510 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -137,6 +137,24 @@ static KVMSlot *kvm_lookup_overlapping_slot(KVMState *s, return found; } +int kvm_physical_memory_addr_from_ram(KVMState *s, ram_addr_t ram_addr, + target_phys_addr_t *phys_addr) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(s->slots); i++) { + KVMSlot *mem = &s->slots[i]; + + if (ram_addr >= mem->phys_offset && + ram_addr < mem->phys_offset + mem->memory_size) { + *phys_addr = mem->start_addr + (ram_addr - mem->phys_offset); + return 1; + } + } + + return 0; +} + static int kvm_set_user_memory_region(KVMState *s, KVMSlot *slot) { struct kvm_userspace_memory_region mem; diff --git a/kvm.h b/kvm.h index 50b6c01ec7..b2fb3af8aa 100644 --- a/kvm.h +++ b/kvm.h @@ -174,6 +174,12 @@ static inline void cpu_synchronize_post_init(CPUState *env) } } + +#if !defined(CONFIG_USER_ONLY) +int kvm_physical_memory_addr_from_ram(KVMState *s, ram_addr_t ram_addr, + target_phys_addr_t *phys_addr); +#endif + #endif int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign);