kvm: powerpc: book3s: Allow the HV and PR selection per virtual machine

This moves the kvmppc_ops callbacks to be a per VM entity. This
enables us to select HV and PR mode when creating a VM. We also
allow both kvm-hv and kvm-pr kernel module to be loaded. To
achieve this we move /dev/kvm ownership to kvm.ko module. Depending on
which KVM mode we select during VM creation we take a reference
count on respective module

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[agraf: fix coding style]
Signed-off-by: Alexander Graf <agraf@suse.de>

1 files changed, 7 insertions, 1 deletions

diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index d225d5ebddcc..497b142f651c 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -555,13 +555,19 @@ static int __init kvmppc_e500_init(void)
         flush_icache_range(kvmppc_booke_handlers, kvmppc_booke_handlers +
                            ivor[max_ivor] + handler_len);
 
-        r = kvm_init(&kvm_ops_e500, sizeof(struct kvmppc_vcpu_e500), 0, THIS_MODULE);
+        r = kvm_init(NULL, sizeof(struct kvmppc_vcpu_e500), 0, THIS_MODULE);
+        if (r)
+                goto err_out;
+        kvm_ops_e500.owner = THIS_MODULE;
+        kvmppc_pr_ops = &kvm_ops_e500;
+
 err_out:
         return r;
 }
 
 static void __exit kvmppc_e500_exit(void)
 {
+        kvmppc_pr_ops = NULL;
         kvmppc_booke_exit();
 }