Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ce1639 authored by Will Deacon's avatar Will Deacon Committed by Paolo Bonzini
Browse files

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: default avatarAlex Williamson <Alex.Williamson@redhat.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 84877d93

include/linux/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,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

virt/kvm/kvm_main.c

+0 −4
Original line number Diff line number Diff line
@@ -2281,10 +2281,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)

virt/kvm/vfio.c

+15 −7
Original line number Diff line number Diff line
@@ -246,6 +246,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;
@@ -268,10 +278,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);