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

[profile/ivi/kernel-adaptation-intel-automotive.git] / arch / powerpc / include / asm / kvm_host.h

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index 2655e2a..765d8ec 100644 (file)
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -64,7 +64,7 @@ struct kvm_vcpu_stat {
        u32 halt_wakeup;
 };
 
-struct tlbe {
+struct kvmppc_44x_tlbe {
        u32 tid; /* Only the low 8 bits are used. */
        u32 word0;
        u32 word1;
@@ -75,17 +75,13 @@ struct kvm_arch {
 };
 
 struct kvm_vcpu_arch {
-       /* Unmodified copy of the guest's TLB. */
-       struct tlbe guest_tlb[PPC44x_TLB_SIZE];
-       /* TLB that's actually used when the guest is running. */
-       struct tlbe shadow_tlb[PPC44x_TLB_SIZE];
-       /* Pages which are referenced in the shadow TLB. */
-       struct page *shadow_pages[PPC44x_TLB_SIZE];
-       /* Copy of the host's TLB. */
-       struct tlbe host_tlb[PPC44x_TLB_SIZE];
-
        u32 host_stack;
        u32 host_pid;
+       u32 host_dbcr0;
+       u32 host_dbcr1;
+       u32 host_dbcr2;
+       u32 host_iac[4];
+       u32 host_msr;
 
        u64 fpr[32];
        u32 gpr[32];
@@ -123,7 +119,11 @@ struct kvm_vcpu_arch {
        u32 ivor[16];
        u32 ivpr;
        u32 pir;
+
+       u32 shadow_pid;
        u32 pid;
+       u32 swap_pid;
+
        u32 pvr;
        u32 ccr0;
        u32 ccr1;