KVM: VFIO: register kvm_device_ops dynamically

Now that we have a dynamic means to register kvm_device_ops, use that
for the VFIO kvm device, instead of relying on the static table.

This is achieved by a module_init call to register the ops with KVM.

Cc: Gleb Natapov <gleb@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Alex Williamson <Alex.Williamson@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 80ce1639727e9d38729c34f162378508c307ca25)
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index ed20bc0d209b20ee5440c2d49a63ed3e7eba1388..f64e941a4213ecd0fffc274e274b6f51be24f1e2 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1026,7 +1026,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);
 
 extern struct kvm_device_ops kvm_mpic_ops;
 extern struct kvm_device_ops kvm_xics_ops;
-extern struct kvm_device_ops kvm_vfio_ops;
 
 #ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
 

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 111d560418f3d4eec8d552a285495873efb75bdf..f019669674a5936336e0aa3bda33034582a4e5b5 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2270,10 +2270,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = {
 #ifdef CONFIG_KVM_XICS
        [KVM_DEV_TYPE_XICS]             = &kvm_xics_ops,
 #endif
-
-#ifdef CONFIG_KVM_VFIO
-       [KVM_DEV_TYPE_VFIO]             = &kvm_vfio_ops,
-#endif
 };
 
 int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type)

diff --git a/virt/kvm/vfio.c b/virt/kvm/vfio.c
index 597c258245eaaa66ef61618ad398fd4ac04cdaa0..475487e238e1ef5fefd64893836b1afbacb97215 100644 (file)
--- a/virt/kvm/vfio.c
+++ b/virt/kvm/vfio.c
@@ -189,6 +189,16 @@ static void kvm_vfio_destroy(struct kvm_device *dev)
        kfree(dev); /* alloc by kvm_ioctl_create_device, free by .destroy */
 }
 
+static int kvm_vfio_create(struct kvm_device *dev, u32 type);
+
+static struct kvm_device_ops kvm_vfio_ops = {
+       .name = "kvm-vfio",
+       .create = kvm_vfio_create,
+       .destroy = kvm_vfio_destroy,
+       .set_attr = kvm_vfio_set_attr,
+       .has_attr = kvm_vfio_has_attr,
+};
+
 static int kvm_vfio_create(struct kvm_device *dev, u32 type)
 {
        struct kvm_device *tmp;
@@ -211,10 +221,8 @@ static int kvm_vfio_create(struct kvm_device *dev, u32 type)
        return 0;
 }
 
-struct kvm_device_ops kvm_vfio_ops = {
-       .name = "kvm-vfio",
-       .create = kvm_vfio_create,
-       .destroy = kvm_vfio_destroy,
-       .set_attr = kvm_vfio_set_attr,
-       .has_attr = kvm_vfio_has_attr,
-};
+static int __init kvm_vfio_ops_init(void)
+{
+       return kvm_register_device_ops(&kvm_vfio_ops, KVM_DEV_TYPE_VFIO);
+}
+module_init(kvm_vfio_ops_init);