KVM: PPC: e500: refactor core-specific TLB code

[karo-tx-linux.git] / arch / powerpc / kvm / e500_emulate.c

diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 7e2d592bf562deac04b03404ca2534ab35aa2e4e..c80794d097d33cd911791da6a66ff7475dca3c02 100644 (file)
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -174,9 +174,9 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
                kvmppc_set_gpr(vcpu, rt, val);
                break;
        case SPRN_TLB0CFG:
-               kvmppc_set_gpr(vcpu, rt, vcpu_e500->tlb0cfg); break;
+               kvmppc_set_gpr(vcpu, rt, vcpu->arch.tlbcfg[0]); break;
        case SPRN_TLB1CFG:
-               kvmppc_set_gpr(vcpu, rt, vcpu_e500->tlb1cfg); break;
+               kvmppc_set_gpr(vcpu, rt, vcpu->arch.tlbcfg[1]); break;
        case SPRN_L1CSR0:
                kvmppc_set_gpr(vcpu, rt, vcpu_e500->l1csr0); break;
        case SPRN_L1CSR1:
@@ -192,7 +192,7 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
                kvmppc_set_gpr(vcpu, rt, 0); break;
 
        case SPRN_MMUCFG:
-               kvmppc_set_gpr(vcpu, rt, mfspr(SPRN_MMUCFG)); break;
+               kvmppc_set_gpr(vcpu, rt, vcpu->arch.mmucfg); break;
 
        /* extra exceptions */
        case SPRN_IVOR32: