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, 4 insertions, 4 deletions

diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index fd2a4d531582..574b24fb6e0e 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -658,7 +658,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
         }
         case BOOK3S_INTERRUPT_SYSCALL:
 #ifdef EXIT_DEBUG
-                printk(KERN_INFO "Syscall Nr %d\n", (int)vcpu->arch.gpr[0]);
+                printk(KERN_INFO "Syscall Nr %d\n", (int)kvmppc_get_gpr(vcpu, 0));
 #endif
                 vcpu->stat.syscall_exits++;
                 kvmppc_book3s_queue_irqprio(vcpu, exit_nr);
@@ -734,7 +734,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         regs->sprg7 = vcpu->arch.sprg6;
 
         for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)
-                regs->gpr[i] = vcpu->arch.gpr[i];
+                regs->gpr[i] = kvmppc_get_gpr(vcpu, i);
 
         return 0;
 }
@@ -759,8 +759,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         vcpu->arch.sprg6 = regs->sprg5;
         vcpu->arch.sprg7 = regs->sprg6;
 
-        for (i = 0; i < ARRAY_SIZE(vcpu->arch.gpr); i++)
-                vcpu->arch.gpr[i] = regs->gpr[i];
+        for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)
+                kvmppc_set_gpr(vcpu, i, regs->gpr[i]);
 
         return 0;
 }