KVM: PPC: Move fields between struct kvm_vcpu_arch and kvmppc_vcpu_book3s

This moves the slb field, which represents the state of the emulated
SLB, from the kvmppc_vcpu_book3s struct to the kvm_vcpu_arch, and the
hpte_hash_[v]pte[_long] fields from kvm_vcpu_arch to kvmppc_vcpu_book3s.
This is in accord with the principle that the kvm_vcpu_arch struct
represents the state of the emulated CPU, and the kvmppc_vcpu_book3s
struct holds the auxiliary data structures used in the emulation.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>

1 files changed, 25 insertions, 29 deletions

diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c
index d7889ef3211e..c6d3e194b6b4 100644
--- a/arch/powerpc/kvm/book3s_64_mmu.c
+++ b/arch/powerpc/kvm/book3s_64_mmu.c
@@ -41,36 +41,36 @@ static void kvmppc_mmu_book3s_64_reset_msr(struct kvm_vcpu *vcpu)
 }
 
 static struct kvmppc_slb *kvmppc_mmu_book3s_64_find_slbe(
-                                struct kvmppc_vcpu_book3s *vcpu_book3s,
+                                struct kvm_vcpu *vcpu,
                                 gva_t eaddr)
 {
         int i;
         u64 esid = GET_ESID(eaddr);
         u64 esid_1t = GET_ESID_1T(eaddr);
 
-        for (i = 0; i < vcpu_book3s->slb_nr; i++) {
+        for (i = 0; i < vcpu->arch.slb_nr; i++) {
                 u64 cmp_esid = esid;
 
-                if (!vcpu_book3s->slb[i].valid)
+                if (!vcpu->arch.slb[i].valid)
                         continue;
 
-                if (vcpu_book3s->slb[i].tb)
+                if (vcpu->arch.slb[i].tb)
                         cmp_esid = esid_1t;
 
-                if (vcpu_book3s->slb[i].esid == cmp_esid)
-                        return &vcpu_book3s->slb[i];
+                if (vcpu->arch.slb[i].esid == cmp_esid)
+                        return &vcpu->arch.slb[i];
         }
 
         dprintk("KVM: No SLB entry found for 0x%lx [%llx | %llx]\n",
                 eaddr, esid, esid_1t);
-        for (i = 0; i < vcpu_book3s->slb_nr; i++) {
-            if (vcpu_book3s->slb[i].vsid)
+        for (i = 0; i < vcpu->arch.slb_nr; i++) {
+            if (vcpu->arch.slb[i].vsid)
                 dprintk("  %d: %c%c%c %llx %llx\n", i,
-                        vcpu_book3s->slb[i].valid ? 'v' : ' ',
-                        vcpu_book3s->slb[i].large ? 'l' : ' ',
-                        vcpu_book3s->slb[i].tb    ? 't' : ' ',
-                        vcpu_book3s->slb[i].esid,
-                        vcpu_book3s->slb[i].vsid);
+                        vcpu->arch.slb[i].valid ? 'v' : ' ',
+                        vcpu->arch.slb[i].large ? 'l' : ' ',
+                        vcpu->arch.slb[i].tb    ? 't' : ' ',
+                        vcpu->arch.slb[i].esid,
+                        vcpu->arch.slb[i].vsid);
         }
 
         return NULL;
@@ -81,7 +81,7 @@ static u64 kvmppc_mmu_book3s_64_ea_to_vp(struct kvm_vcpu *vcpu, gva_t eaddr,
 {
         struct kvmppc_slb *slb;
 
-        slb = kvmppc_mmu_book3s_64_find_slbe(to_book3s(vcpu), eaddr);
+        slb = kvmppc_mmu_book3s_64_find_slbe(vcpu, eaddr);
         if (!slb)
                 return 0;
 
@@ -180,7 +180,7 @@ static int kvmppc_mmu_book3s_64_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
                 return 0;
         }
 
-        slbe = kvmppc_mmu_book3s_64_find_slbe(vcpu_book3s, eaddr);
+        slbe = kvmppc_mmu_book3s_64_find_slbe(vcpu, eaddr);
         if (!slbe)
                 goto no_seg_found;
 
@@ -320,10 +320,10 @@ static void kvmppc_mmu_book3s_64_slbmte(struct kvm_vcpu *vcpu, u64 rs, u64 rb)
         esid_1t = GET_ESID_1T(rb);
         slb_nr = rb & 0xfff;
 
-        if (slb_nr > vcpu_book3s->slb_nr)
+        if (slb_nr > vcpu->arch.slb_nr)
                 return;
 
-        slbe = &vcpu_book3s->slb[slb_nr];
+        slbe = &vcpu->arch.slb[slb_nr];
 
         slbe->large = (rs & SLB_VSID_L) ? 1 : 0;
         slbe->tb    = (rs & SLB_VSID_B_1T) ? 1 : 0;
@@ -344,38 +344,35 @@ static void kvmppc_mmu_book3s_64_slbmte(struct kvm_vcpu *vcpu, u64 rs, u64 rb)
 
 static u64 kvmppc_mmu_book3s_64_slbmfee(struct kvm_vcpu *vcpu, u64 slb_nr)
 {
-        struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu);
         struct kvmppc_slb *slbe;
 
-        if (slb_nr > vcpu_book3s->slb_nr)
+        if (slb_nr > vcpu->arch.slb_nr)
                 return 0;
 
-        slbe = &vcpu_book3s->slb[slb_nr];
+        slbe = &vcpu->arch.slb[slb_nr];
 
         return slbe->orige;
 }
 
 static u64 kvmppc_mmu_book3s_64_slbmfev(struct kvm_vcpu *vcpu, u64 slb_nr)
 {
-        struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu);
         struct kvmppc_slb *slbe;
 
-        if (slb_nr > vcpu_book3s->slb_nr)
+        if (slb_nr > vcpu->arch.slb_nr)
                 return 0;
 
-        slbe = &vcpu_book3s->slb[slb_nr];
+        slbe = &vcpu->arch.slb[slb_nr];
 
         return slbe->origv;
 }
 
 static void kvmppc_mmu_book3s_64_slbie(struct kvm_vcpu *vcpu, u64 ea)
 {
-        struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu);
         struct kvmppc_slb *slbe;
 
         dprintk("KVM MMU: slbie(0x%llx)\n", ea);
 
-        slbe = kvmppc_mmu_book3s_64_find_slbe(vcpu_book3s, ea);
+        slbe = kvmppc_mmu_book3s_64_find_slbe(vcpu, ea);
 
         if (!slbe)
                 return;
@@ -389,13 +386,12 @@ static void kvmppc_mmu_book3s_64_slbie(struct kvm_vcpu *vcpu, u64 ea)
 
 static void kvmppc_mmu_book3s_64_slbia(struct kvm_vcpu *vcpu)
 {
-        struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu);
         int i;
 
         dprintk("KVM MMU: slbia()\n");
 
-        for (i = 1; i < vcpu_book3s->slb_nr; i++)
-                vcpu_book3s->slb[i].valid = false;
+        for (i = 1; i < vcpu->arch.slb_nr; i++)
+                vcpu->arch.slb[i].valid = false;
 
         if (vcpu->arch.shared->msr & MSR_IR) {
                 kvmppc_mmu_flush_segments(vcpu);
@@ -464,7 +460,7 @@ static int kvmppc_mmu_book3s_64_esid_to_vsid(struct kvm_vcpu *vcpu, ulong esid,
         ulong mp_ea = vcpu->arch.magic_page_ea;
 
         if (vcpu->arch.shared->msr & (MSR_DR|MSR_IR)) {
-                slb = kvmppc_mmu_book3s_64_find_slbe(to_book3s(vcpu), ea);
+                slb = kvmppc_mmu_book3s_64_find_slbe(vcpu, ea);
                 if (slb)
                         gvsid = slb->vsid;
         }