diff options
| author | James Hogan <james.hogan@imgtec.com> | 2014-06-26 10:44:22 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-07-05 11:53:07 +0200 |
| commit | 0a2672b7ead72b7c788200499a63a4d5f2faa74a (patch) | |
| tree | ba14ad323614b6116820f1fd162a320c452357f3 | |
| parent | 9d9de254c2b81b68cd48f2324cc753a570a4cdd8 (diff) | |
| download | qemu-0a2672b7ead72b7c788200499a63a4d5f2faa74a.zip qemu-0a2672b7ead72b7c788200499a63a4d5f2faa74a.tar.gz qemu-0a2672b7ead72b7c788200499a63a4d5f2faa74a.tar.bz2 | |
mips/kvm: Init EBase to correct KSEG0
The EBase CP0 register is initialised to 0x80000000, however with KVM
the guest's KSEG0 is at 0x40000000. The incorrect value doesn't get
passed to KVM yet as KVM doesn't implement the EBase register, however
we should set it correctly now so as not to break migration/loadvm to a
future version of QEMU that does support EBase.
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | target-mips/translate.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/target-mips/translate.c b/target-mips/translate.c index 2f91959..d7b8c4d 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -28,6 +28,7 @@ #include "exec/helper-proto.h" #include "exec/helper-gen.h" +#include "sysemu/kvm.h" #define MIPS_DEBUG_DISAS 0 //#define MIPS_DEBUG_SIGN_EXTENSIONS @@ -16076,7 +16077,12 @@ void cpu_state_reset(CPUMIPSState *env) env->CP0_Random = env->tlb->nb_tlb - 1; env->tlb->tlb_in_use = env->tlb->nb_tlb; env->CP0_Wired = 0; - env->CP0_EBase = 0x80000000 | (cs->cpu_index & 0x3FF); + env->CP0_EBase = (cs->cpu_index & 0x3FF); + if (kvm_enabled()) { + env->CP0_EBase |= 0x40000000; + } else { + env->CP0_EBase |= 0x80000000; + } env->CP0_Status = (1 << CP0St_BEV) | (1 << CP0St_ERL); /* vectored interrupts not implemented, timer on int 7, no performance counters. */ |