KVM: ppc: create struct kvm_vcpu_44x and introduce container_of() accessor

This patch doesn't yet move all 44x-specific data into the new structure, but
is the first step down that path. In the future we may also want to create a
struct kvm_vcpu_booke.

Based on patch from Liu Yu <yu.liu@freescale.com>.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
index 95e165baf85f..8d6929b7fdb6 100644
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -349,8 +349,8 @@ lightweight_exit:
         lis     r5, tlb_44x_hwater@ha
         lwz     r5, tlb_44x_hwater@l(r5)
         mtctr   r5
-        addi    r9, r4, VCPU_SHADOW_TLB
-        addi    r5, r4, VCPU_SHADOW_MOD
+        addi    r9, r4, -VCPU_TO_44X + VCPU44x_SHADOW_TLB
+        addi    r5, r4, -VCPU_TO_44X + VCPU44x_SHADOW_MOD
         li      r3, 0
 1:
         lbzx    r7, r3, r5
@@ -377,7 +377,7 @@ lightweight_exit:
         /* Clear bitmap of modified TLB entries */
         li      r5, PPC44x_TLB_SIZE>>2
         mtctr   r5
-        addi    r5, r4, VCPU_SHADOW_MOD - 4
+        addi    r5, r4, -VCPU_TO_44X + VCPU44x_SHADOW_MOD - 4
         li      r6, 0
 1:
         stwu    r6, 4(r5)