diff options
| author | Avi Kivity <avi@redhat.com> | 2011-12-15 19:55:26 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-12-20 14:14:07 +0200 |
| commit | 9f213ed92c5ccc3d0aa19359bb1783760d01dae9 (patch) | |
| tree | 75f5fe5e181737f69de73935b20cba4405b91df7 /target-i386 | |
| parent | 7664e80c84700d8b7e88ae854d1d74806c63f013 (diff) | |
| download | qemu-9f213ed92c5ccc3d0aa19359bb1783760d01dae9.zip qemu-9f213ed92c5ccc3d0aa19359bb1783760d01dae9.tar.gz qemu-9f213ed92c5ccc3d0aa19359bb1783760d01dae9.tar.bz2 | |
kvm: switch kvm slots to use host virtual address instead of ram_addr_t
This simplifies a later switch to the memory API in slot management.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/kvm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 5bfc21f..74d81ef 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -253,8 +253,7 @@ int kvm_arch_on_sigbus_vcpu(CPUState *env, int code, void *addr) if ((env->mcg_cap & MCG_SER_P) && addr && (code == BUS_MCEERR_AR || code == BUS_MCEERR_AO)) { if (qemu_ram_addr_from_host(addr, &ram_addr) || - !kvm_physical_memory_addr_from_ram(env->kvm_state, ram_addr, - &paddr)) { + !kvm_physical_memory_addr_from_host(env->kvm_state, addr, &paddr)) { fprintf(stderr, "Hardware memory error for memory used by " "QEMU itself instead of guest system!\n"); /* Hope we are lucky for AO MCE */ @@ -286,8 +285,8 @@ int kvm_arch_on_sigbus(int code, void *addr) /* Hope we are lucky for AO MCE */ if (qemu_ram_addr_from_host(addr, &ram_addr) || - !kvm_physical_memory_addr_from_ram(first_cpu->kvm_state, ram_addr, - &paddr)) { + !kvm_physical_memory_addr_from_host(first_cpu->kvm_state, addr, + &paddr)) { fprintf(stderr, "Hardware memory error for memory used by " "QEMU itself instead of guest system!: %p\n", addr); return 0; |