]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
KVM: PPC: Always select KVM_VFIO, plus Makefile cleanup
authorPaul Mackerras <paulus@ozlabs.org>
Thu, 18 Aug 2016 06:04:41 +0000 (16:04 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 25 Aug 2016 12:25:49 +0000 (22:25 +1000)
commit4b3d173d0440d37534906b6d93c02dfb577c68ce
tree4af6ad381e16a30ea71ba6f46b6f2370b9136642
parent34a75b0f63356097ae9f706d64a793934891002f
KVM: PPC: Always select KVM_VFIO, plus Makefile cleanup

As discussed recently on the kvm mailing list, David Gibson's
intention in commit 178a78750212 ("vfio: Enable VFIO device for
powerpc", 2016-02-01) was to have the KVM VFIO device built in
on all powerpc platforms.  This patch adds the "select KVM_VFIO"
statement that makes this happen.

Currently, arch/powerpc/kvm/Makefile doesn't include vfio.o for
the 64-bit kvm module, because the list of objects doesn't use
the $(common-objs-y) list.  The reason it doesn't is because we
don't necessarily want coalesced_mmio.o or emulate.o (for example
if HV KVM is the only target), and common-objs-y includes both.

Since this is confusing, this patch adjusts the definitions so that
we now use $(common-objs-y) in the list for the 64-bit kvm.ko
module, emulate.o is removed from common-objs-y and added in the
places that need it, and the inclusion of coalesced_mmio.o now
depends on CONFIG_KVM_MMIO.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
arch/powerpc/kvm/Kconfig
arch/powerpc/kvm/Makefile