aboutsummaryrefslogtreecommitdiff
path: root/hw/mips
diff options
context:
space:
mode:
authorSanjay Lal <sanjayl@kymasys.com>2014-06-17 23:10:28 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-06-18 16:58:10 +0200
commit253fffe725e8ecc0147a4c6f0893493c1393f0f7 (patch)
treebd4f5a7e321bafe71e9d5020bfda73c12ce2b937 /hw/mips
parent353a243e22fae2b993ab7f2d123c2b81013b3c5d (diff)
downloadqemu-253fffe725e8ecc0147a4c6f0893493c1393f0f7.zip
qemu-253fffe725e8ecc0147a4c6f0893493c1393f0f7.tar.gz
qemu-253fffe725e8ecc0147a4c6f0893493c1393f0f7.tar.bz2
hw/mips: Add API to convert KVM guest KSEG0 <-> GPA
Add API for converting physical addresses to KVM guest KSEG0 addresses, and fix the existing API for converting KSEG0 addresses to physical addresses to work in the KVM case. Both have the same sized KSEG0, so it's just a case of fixing the mask. In KVM trap and emulate mode both the guest kernel and guest userspace execute in useg: Guest User address space: 0x00000000..0x3fffffff Guest Kernel Unmapped: 0x40000000..0x5fffffff Guest Kernel Mapped: 0x60000000..0x7fffffff Signed-off-by: Sanjay Lal <sanjayl@kymasys.com> Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/mips')
-rw-r--r--hw/mips/addr.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/mips/addr.c b/hw/mips/addr.c
index 99488f1..ff3b952 100644
--- a/hw/mips/addr.c
+++ b/hw/mips/addr.c
@@ -25,10 +25,15 @@
uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr)
{
- return addr & 0x7fffffffll;
+ return addr & 0x1fffffffll;
}
uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr)
{
return addr | ~0x7fffffffll;
}
+
+uint64_t cpu_mips_kvm_um_phys_to_kseg0(void *opaque, uint64_t addr)
+{
+ return addr | 0x40000000ll;
+}