KVM: PPC: Improve indirect svcpu accessors

We already have some inline fuctions we use to access vcpu or svcpu structs,
depending on whether we're on booke or book3s. Since we just put a few more
registers into the svcpu, we also need to make sure the respective callbacks
are available and get used.

So this patch moves direct use of the now in the svcpu struct fields to
inline function calls. While at it, it also moves the definition of those
inline function calls to respective header files for booke and book3s,
greatly improving readability.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index dbb5d6842a51..c6db28cdc594 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -132,7 +132,7 @@ void kvmppc_emulate_dec(struct kvm_vcpu *vcpu)
  * from opcode tables in the future. */
 int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 {
-        u32 inst = vcpu->arch.last_inst;
+        u32 inst = kvmppc_get_last_inst(vcpu);
         u32 ea;
         int ra;
         int rb;
@@ -516,10 +516,11 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 }
         }
 
-        trace_kvm_ppc_instr(inst, vcpu->arch.pc, emulated);
+        trace_kvm_ppc_instr(inst, kvmppc_get_pc(vcpu), emulated);
 
+        /* Advance past emulated instruction. */
         if (advance)
-                vcpu->arch.pc += 4; /* Advance past emulated instruction. */
+                kvmppc_set_pc(vcpu, kvmppc_get_pc(vcpu) + 4);
 
         return emulated;
 }