kvm: powerpc: Add kvmppc_ops callback

This patch add a new callback kvmppc_ops. This will help us in enabling
both HV and PR KVM together in the same kernel. The actual change to
enable them together is done in the later patch in the series.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[agraf: squash in booke changes]
Signed-off-by: Alexander Graf <agraf@suse.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index 751cd45f65a0..81762eb7957e 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -130,7 +130,7 @@ static int kvmppc_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
         case SPRN_PIR: break;
 
         default:
-                emulated = kvmppc_core_emulate_mtspr(vcpu, sprn,
+                emulated = kvmppc_ops->emulate_mtspr(vcpu, sprn,
                                                      spr_val);
                 if (emulated == EMULATE_FAIL)
                         printk(KERN_INFO "mtspr: unknown spr "
@@ -191,7 +191,7 @@ static int kvmppc_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
                 spr_val = kvmppc_get_dec(vcpu, get_tb());
                 break;
         default:
-                emulated = kvmppc_core_emulate_mfspr(vcpu, sprn,
+                emulated = kvmppc_ops->emulate_mfspr(vcpu, sprn,
                                                      &spr_val);
                 if (unlikely(emulated == EMULATE_FAIL)) {
                         printk(KERN_INFO "mfspr: unknown spr "
@@ -464,7 +464,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
         }
 
         if (emulated == EMULATE_FAIL) {
-                emulated = kvmppc_core_emulate_op(run, vcpu, inst, &advance);
+                emulated = kvmppc_ops->emulate_op(run, vcpu, inst, &advance);
                 if (emulated == EMULATE_AGAIN) {
                         advance = 0;
                 } else if (emulated == EMULATE_FAIL) {