Commit 0a2672b7 authored by James Hogan's avatar James Hogan Committed by Paolo Bonzini
Browse files

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: default avatarJames Hogan <james.hogan@imgtec.com>
Reviewed-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9d9de254

target-mips/translate.c

+7 −1
Original line number Diff line number Diff line
@@ -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. */