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, 11 insertions, 10 deletions

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 4633e7850dd2..2c291161df89 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -270,34 +270,35 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
 static void kvmppc_complete_dcr_load(struct kvm_vcpu *vcpu,
                                      struct kvm_run *run)
 {
-        ulong *gpr = &vcpu->arch.gpr[vcpu->arch.io_gpr];
-        *gpr = run->dcr.data;
+        kvmppc_set_gpr(vcpu, vcpu->arch.io_gpr, run->dcr.data);
 }
 
 static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu,
                                       struct kvm_run *run)
 {
-        ulong *gpr = &vcpu->arch.gpr[vcpu->arch.io_gpr];
+        ulong gpr;
 
-        if (run->mmio.len > sizeof(*gpr)) {
+        if (run->mmio.len > sizeof(gpr)) {
                 printk(KERN_ERR "bad MMIO length: %d\n", run->mmio.len);
                 return;
         }
 
         if (vcpu->arch.mmio_is_bigendian) {
                 switch (run->mmio.len) {
-                case 4: *gpr = *(u32 *)run->mmio.data; break;
-                case 2: *gpr = *(u16 *)run->mmio.data; break;
-                case 1: *gpr = *(u8 *)run->mmio.data; break;
+                case 4: gpr = *(u32 *)run->mmio.data; break;
+                case 2: gpr = *(u16 *)run->mmio.data; break;
+                case 1: gpr = *(u8 *)run->mmio.data; break;
                 }
         } else {
                 /* Convert BE data from userland back to LE. */
                 switch (run->mmio.len) {
-                case 4: *gpr = ld_le32((u32 *)run->mmio.data); break;
-                case 2: *gpr = ld_le16((u16 *)run->mmio.data); break;
-                case 1: *gpr = *(u8 *)run->mmio.data; break;
+                case 4: gpr = ld_le32((u32 *)run->mmio.data); break;
+                case 2: gpr = ld_le16((u16 *)run->mmio.data); break;
+                case 1: gpr = *(u8 *)run->mmio.data; break;
                 }
         }
+
+        kvmppc_set_gpr(vcpu, vcpu->arch.io_gpr, gpr);
 }
 
 int kvmppc_handle_load(struct kvm_run *run, struct kvm_vcpu *vcpu,