KVM: PPC: Use accessor functions for GPR access

All code in PPC KVM currently accesses gprs in the vcpu struct directly.

While there's nothing wrong with that wrt the current way gprs are stored
and loaded, it doesn't suffice for the PACA acceleration that will follow
in this patchset.

So let's just create little wrapper inline functions that we call whenever
a GPR needs to be read from or written to. The compiled code shouldn't really
change at all for now.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 13 insertions, 12 deletions

diff --git a/arch/powerpc/kvm/44x_emulate.c b/arch/powerpc/kvm/44x_emulate.c
index 61af58fcecee..65ea083a5b27 100644
--- a/arch/powerpc/kvm/44x_emulate.c
+++ b/arch/powerpc/kvm/44x_emulate.c
@@ -65,13 +65,14 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                          */
                         switch (dcrn) {
                         case DCRN_CPR0_CONFIG_ADDR:
-                                vcpu->arch.gpr[rt] = vcpu->arch.cpr0_cfgaddr;
+                                kvmppc_set_gpr(vcpu, rt, vcpu->arch.cpr0_cfgaddr);
                                 break;
                         case DCRN_CPR0_CONFIG_DATA:
                                 local_irq_disable();
                                 mtdcr(DCRN_CPR0_CONFIG_ADDR,
                                           vcpu->arch.cpr0_cfgaddr);
-                                vcpu->arch.gpr[rt] = mfdcr(DCRN_CPR0_CONFIG_DATA);
+                                kvmppc_set_gpr(vcpu, rt,
+                                               mfdcr(DCRN_CPR0_CONFIG_DATA));
                                 local_irq_enable();
                                 break;
                         default:
@@ -93,11 +94,11 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
                         /* emulate some access in kernel */
                         switch (dcrn) {
                         case DCRN_CPR0_CONFIG_ADDR:
-                                vcpu->arch.cpr0_cfgaddr = vcpu->arch.gpr[rs];
+                                vcpu->arch.cpr0_cfgaddr = kvmppc_get_gpr(vcpu, rs);
                                 break;
                         default:
                                 run->dcr.dcrn = dcrn;
-                                run->dcr.data = vcpu->arch.gpr[rs];
+                                run->dcr.data = kvmppc_get_gpr(vcpu, rs);
                                 run->dcr.is_write = 1;
                                 vcpu->arch.dcr_needed = 1;
                                 kvmppc_account_exit(vcpu, DCR_EXITS);
@@ -146,13 +147,13 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
 
         switch (sprn) {
         case SPRN_PID:
-                kvmppc_set_pid(vcpu, vcpu->arch.gpr[rs]); break;
+                kvmppc_set_pid(vcpu, kvmppc_get_gpr(vcpu, rs)); break;
         case SPRN_MMUCR:
-                vcpu->arch.mmucr = vcpu->arch.gpr[rs]; break;
+                vcpu->arch.mmucr = kvmppc_get_gpr(vcpu, rs); break;
         case SPRN_CCR0:
-                vcpu->arch.ccr0 = vcpu->arch.gpr[rs]; break;
+                vcpu->arch.ccr0 = kvmppc_get_gpr(vcpu, rs); break;
         case SPRN_CCR1:
-                vcpu->arch.ccr1 = vcpu->arch.gpr[rs]; break;
+                vcpu->arch.ccr1 = kvmppc_get_gpr(vcpu, rs); break;
         default:
                 emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, rs);
         }
@@ -167,13 +168,13 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
 
         switch (sprn) {
         case SPRN_PID:
-                vcpu->arch.gpr[rt] = vcpu->arch.pid; break;
+                kvmppc_set_gpr(vcpu, rt, vcpu->arch.pid); break;
         case SPRN_MMUCR:
-                vcpu->arch.gpr[rt] = vcpu->arch.mmucr; break;
+                kvmppc_set_gpr(vcpu, rt, vcpu->arch.mmucr); break;
         case SPRN_CCR0:
-                vcpu->arch.gpr[rt] = vcpu->arch.ccr0; break;
+                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ccr0); break;
         case SPRN_CCR1:
-                vcpu->arch.gpr[rt] = vcpu->arch.ccr1; break;
+                kvmppc_set_gpr(vcpu, rt, vcpu->arch.ccr1); break;
         default:
                 emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, rt);
         }