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, 14 insertions, 44 deletions

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 07c0106fab76..69b930550d2e 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -39,6 +39,8 @@
 #define CREATE_TRACE_POINTS
 #include "trace.h"
 
+struct kvmppc_ops *kvmppc_ops;
+
 int kvm_arch_vcpu_runnable(struct kvm_vcpu *v)
 {
         return !!(v->arch.pending_exceptions) ||
@@ -1024,52 +1026,11 @@ long kvm_arch_vm_ioctl(struct file *filp,
                 r = kvm_vm_ioctl_create_spapr_tce(kvm, &create_tce);
                 goto out;
         }
-#endif /* CONFIG_PPC_BOOK3S_64 */
-
-#ifdef CONFIG_KVM_BOOK3S_64_HV
-        case KVM_ALLOCATE_RMA: {
-                struct kvm_allocate_rma rma;
-                struct kvm *kvm = filp->private_data;
-
-                r = kvm_vm_ioctl_allocate_rma(kvm, &rma);
-                if (r >= 0 && copy_to_user(argp, &rma, sizeof(rma)))
-                        r = -EFAULT;
-                break;
-        }
-
-        case KVM_PPC_ALLOCATE_HTAB: {
-                u32 htab_order;
-
-                r = -EFAULT;
-                if (get_user(htab_order, (u32 __user *)argp))
-                        break;
-                r = kvmppc_alloc_reset_hpt(kvm, &htab_order);
-                if (r)
-                        break;
-                r = -EFAULT;
-                if (put_user(htab_order, (u32 __user *)argp))
-                        break;
-                r = 0;
-                break;
-        }
-
-        case KVM_PPC_GET_HTAB_FD: {
-                struct kvm_get_htab_fd ghf;
-
-                r = -EFAULT;
-                if (copy_from_user(&ghf, argp, sizeof(ghf)))
-                        break;
-                r = kvm_vm_ioctl_get_htab_fd(kvm, &ghf);
-                break;
-        }
-#endif /* CONFIG_KVM_BOOK3S_64_HV */
-
-#ifdef CONFIG_PPC_BOOK3S_64
         case KVM_PPC_GET_SMMU_INFO: {
                 struct kvm_ppc_smmu_info info;
 
                 memset(&info, 0, sizeof(info));
-                r = kvm_vm_ioctl_get_smmu_info(kvm, &info);
+                r = kvmppc_ops->get_smmu_info(kvm, &info);
                 if (r >= 0 && copy_to_user(argp, &info, sizeof(info)))
                         r = -EFAULT;
                 break;
@@ -1080,11 +1041,14 @@ long kvm_arch_vm_ioctl(struct file *filp,
                 r = kvm_vm_ioctl_rtas_define_token(kvm, argp);
                 break;
         }
-#endif /* CONFIG_PPC_BOOK3S_64 */
+        default:
+                r = kvmppc_ops->arch_vm_ioctl(filp, ioctl, arg);
+
+#else /* CONFIG_PPC_BOOK3S_64 */
         default:
                 r = -ENOTTY;
+#endif
         }
-
 out:
         return r;
 }
@@ -1125,9 +1089,15 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
 
 int kvm_arch_init(void *opaque)
 {
+        if (kvmppc_ops) {
+                printk(KERN_ERR "kvm: already loaded the other module\n");
+                return -EEXIST;
+        }
+        kvmppc_ops = (struct kvmppc_ops *)opaque;
         return 0;
 }
 
 void kvm_arch_exit(void)
 {
+        kvmppc_ops = NULL;
 }