From patchwork Tue Oct 19 10:40:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [08/10] Add RAM -> physical addr mapping in MCE simulation From: Marcelo Tosatti X-Patchwork-Id: 68321 Message-Id: To: Anthony Liguori Cc: Avi Kivity , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Huang Ying Date: Tue, 19 Oct 2010 08:40:34 -0200 From: Huang Ying 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 | 3 +++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 1cc696f..37b99c7 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 50b6c01..8f5a754 100644 --- a/kvm.h +++ b/kvm.h @@ -174,6 +174,9 @@ static inline void cpu_synchronize_post_init(CPUState *env) } } +int kvm_physical_memory_addr_from_ram(KVMState *s, ram_addr_t ram_addr, + target_phys_addr_t *phys_addr); + #endif int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign);