]> git.baikalelectronics.ru Git - kernel.git/commit
kvm-vfio: do not use module_init
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 24 Sep 2014 11:02:46 +0000 (13:02 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 24 Sep 2014 12:06:36 +0000 (14:06 +0200)
commitd6202bc87f9f70b2b5cee808f9a7fbb807e4d0e1
tree69a96edbbe94bb5ab6ad6c3f239b72eda13f7593
parentc4440fdbd1634bfe844e49948eaa30ad17ea1f19
kvm-vfio: do not use module_init

/me got confused between the kernel and QEMU.  In the kernel, you can
only have one module_init function, and it will prevent unloading the
module unless you also have the corresponding module_exit function.

So, commit 7429d37f0cc8 (KVM: VFIO: register kvm_device_ops dynamically,
2014-09-02) broke unloading of the kvm module, by adding a module_init
function and no module_exit.

Repair it by making kvm_vfio_ops_init weak, and checking it in
kvm_init.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Alex Williamson <Alex.Williamson@redhat.com>
Fixes: 7429d37f0cc8af5ef6c25c3d3f0c5b8ad2510d59
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
virt/kvm/kvm_main.c
virt/kvm/vfio.c
virt/kvm/vfio.h [new file with mode: 0644]