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 <dnelson@redhat.com> Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
e890261f67
commit
983dfc3b13
18
kvm-all.c
18
kvm-all.c
@ -137,6 +137,24 @@ static KVMSlot *kvm_lookup_overlapping_slot(KVMState *s,
|
|||||||
return found;
|
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)
|
static int kvm_set_user_memory_region(KVMState *s, KVMSlot *slot)
|
||||||
{
|
{
|
||||||
struct kvm_userspace_memory_region mem;
|
struct kvm_userspace_memory_region mem;
|
||||||
|
6
kvm.h
6
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
|
#endif
|
||||||
int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign);
|
int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user