On Fri, Apr 08, 2016 at 07:13:06PM +1000, Alexey Kardashevskiy wrote: > On 03/09/2016 04:45 PM, David Gibson wrote: > > >>diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile > >>index 7f7b6d8..71f577c 100644 > >>--- a/arch/powerpc/kvm/Makefile > >>+++ b/arch/powerpc/kvm/Makefile > >>@@ -8,7 +8,7 @@ ccflags-y := -Ivirt/kvm -Iarch/powerpc/kvm > >> KVM := ../../../virt/kvm > >> > >> common-objs-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o \ > >>- $(KVM)/eventfd.o $(KVM)/vfio.o > >>+ $(KVM)/eventfd.o > > > >Please don't disable the VFIO device for the non-book3s case. I added > >it (even though it didn't do anything until now) so that libvirt > >wouldn't choke when it finds it's not available. Obviously the new > >ioctl needs to be only for the right IOMMU setup, but the device > >itself should be available always. > > > After having a closer look, the statement above does not enable VFIO KVM > device on book3s but does for everything else: > > > common-objs-$(CONFIG_KVM_VFIO) += $(KVM)/vfio.o > [...] > kvm-e500-objs := \ > $(common-objs-y) \ > [...] > kvm-objs-$(CONFIG_KVM_E500V2) := $(kvm-e500-objs) > [...] > kvm-e500mc-objs := \ > $(common-objs-y) \ > [...] > kvm-objs-$(CONFIG_KVM_E500MC) := $(kvm-e500mc-objs) > [...] > kvm-book3s_32-objs := \ > $(common-objs-y) \ > [...] > kvm-objs-$(CONFIG_KVM_BOOK3S_32) := $(kvm-book3s_32-objs) > > > This is becaise CONFIG_KVM_BOOK3S_64 does not use "common-objs-y": Oh, good grief. > kvm-objs-$(CONFIG_KVM_BOOK3S_64) := $(kvm-book3s_64-module-objs) > > > So I will keep vfio.o in the "common-objs-y" list and add: > > +kvm-book3s_64-objs-$(CONFIG_KVM_VFIO) += \ > + $(KVM)/vfio.o Ok. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
