From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id EBFD31A021A for ; Wed, 6 Aug 2014 13:13:01 +1000 (EST) Message-ID: <1407294770.316.76.camel@ul30vt.home> Subject: Re: [PATCH v2 2/4] vfio: spapr: Fix build error From: Alex Williamson To: Alexey Kardashevskiy Date: Tue, 05 Aug 2014 21:12:50 -0600 In-Reply-To: <1407293313-24894-3-git-send-email-aik@ozlabs.ru> References: <1407293313-24894-1-git-send-email-aik@ozlabs.ru> <1407293313-24894-3-git-send-email-aik@ozlabs.ru> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Cc: linuxppc-dev@lists.ozlabs.org, Gavin Shan , kvm@vger.kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, 2014-08-06 at 12:48 +1000, Alexey Kardashevskiy wrote: > From: Gavin Shan > > The VFIO related components could be built as dynamic modules. > Unfortunately, CONFIG_EEH can't be configured to "m". The patch > fixes the build errors when configuring VFIO related components > as dynamic modules as follows: > > CC [M] drivers/vfio/vfio_iommu_spapr_tce.o > In file included from drivers/vfio/vfio.c:33:0: > include/linux/vfio.h:101:43: warning: ‘struct pci_dev’ declared \ > inside parameter list [enabled by default] > : > WRAP arch/powerpc/boot/zImage.pseries > WRAP arch/powerpc/boot/zImage.maple > WRAP arch/powerpc/boot/zImage.pmac > WRAP arch/powerpc/boot/zImage.epapr > MODPOST 1818 modules > ERROR: ".vfio_spapr_iommu_eeh_ioctl" [drivers/vfio/vfio_iommu_spapr_tce.ko]\ > undefined! > ERROR: ".vfio_spapr_pci_eeh_open" [drivers/vfio/pci/vfio-pci.ko] undefined! > ERROR: ".vfio_spapr_pci_eeh_release" [drivers/vfio/pci/vfio-pci.ko] undefined! > > Reported-by: Alexey Kardashevskiy > Signed-off-by: Gavin Shan > [removed include "pci.h" in vfio.c] > Signed-off-by: Alexey Kardashevskiy > --- > Changes: > v2: > * removed #include from vfio.c and tested I also commented regarding the ifdef around all of vfio_spapr_eeh.c: Why not add a new CONFIG_VFIO_SPAPR_EEH option to handle this instead? Did you disagree? The ifdef is pretty ugly. > --- > drivers/vfio/Makefile | 4 ++-- > drivers/vfio/vfio_spapr_eeh.c | 6 ++++++ > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/vfio/Makefile b/drivers/vfio/Makefile > index 50e30bc..4891cca 100644 > --- a/drivers/vfio/Makefile > +++ b/drivers/vfio/Makefile > @@ -1,5 +1,5 @@ > obj-$(CONFIG_VFIO) += vfio.o > obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o > -obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o > -obj-$(CONFIG_EEH) += vfio_spapr_eeh.o > +obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o \ > + vfio_spapr_eeh.o > obj-$(CONFIG_VFIO_PCI) += pci/ > diff --git a/drivers/vfio/vfio_spapr_eeh.c b/drivers/vfio/vfio_spapr_eeh.c > index f834b4c..1a93e83 100644 > --- a/drivers/vfio/vfio_spapr_eeh.c > +++ b/drivers/vfio/vfio_spapr_eeh.c > @@ -14,15 +14,19 @@ > #include > > /* We might build address mapping here for "fast" path later */ > +#ifdef CONFIG_EEH > + > int vfio_spapr_pci_eeh_open(struct pci_dev *pdev) > { > return eeh_dev_open(pdev); > } > +EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_open); > > void vfio_spapr_pci_eeh_release(struct pci_dev *pdev) > { > eeh_dev_release(pdev); > } > +EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_release); > > long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, > unsigned int cmd, unsigned long arg) > @@ -85,3 +89,5 @@ long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, > > return ret; > } > +EXPORT_SYMBOL_GPL(vfio_spapr_iommu_eeh_ioctl); > +#endif /* CONFIG_EEH */