From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gavin Shan Subject: Re: [PATCH v2 2/4] vfio: spapr: Fix build error Date: Wed, 6 Aug 2014 13:54:14 +1000 Message-ID: <20140806035413.GA7681@shangw> References: <1407293313-24894-1-git-send-email-aik@ozlabs.ru> <1407293313-24894-3-git-send-email-aik@ozlabs.ru> <1407294770.316.76.camel@ul30vt.home> Reply-To: Gavin Shan Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Alexey Kardashevskiy , linuxppc-dev@lists.ozlabs.org, Gavin Shan , Benjamin Herrenschmidt , kvm@vger.kernel.org To: Alex Williamson Return-path: Received: from e28smtp09.in.ibm.com ([122.248.162.9]:49278 "EHLO e28smtp09.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752854AbaHFDyV convert rfc822-to-8bit (ORCPT ); Tue, 5 Aug 2014 23:54:21 -0400 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Aug 2014 09:24:19 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 549B61258018 for ; Wed, 6 Aug 2014 09:24:20 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s763uOiA65208504 for ; Wed, 6 Aug 2014 09:26:25 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s763sFv1029925 for ; Wed, 6 Aug 2014 09:24:16 +0530 Content-Disposition: inline In-Reply-To: <1407294770.316.76.camel@ul30vt.home> Sender: kvm-owner@vger.kernel.org List-ID: On Tue, Aug 05, 2014 at 09:12:50PM -0600, Alex Williamson wrote: >On Wed, 2014-08-06 at 12:48 +1000, Alexey Kardashevskiy wrote: >> From: Gavin Shan >>=20 >> 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: >>=20 >> 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: =E2=80=98struct pci_dev=E2=80=99= 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] und= efined! >> ERROR: ".vfio_spapr_pci_eeh_release" [drivers/vfio/pci/vfio-pci.ko] = undefined! >>=20 >> 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 Appreciated for Alexey's help on it :) > >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. > I'll introduce CONFIG_VFIO_SPAPR_EEH. Thanks, Gavin >> --- >> drivers/vfio/Makefile | 4 ++-- >> drivers/vfio/vfio_spapr_eeh.c | 6 ++++++ >> 2 files changed, 8 insertions(+), 2 deletions(-) >>=20 >> 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) +=3D vfio.o >> obj-$(CONFIG_VFIO_IOMMU_TYPE1) +=3D vfio_iommu_type1.o >> -obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) +=3D vfio_iommu_spapr_tce.o >> -obj-$(CONFIG_EEH) +=3D vfio_spapr_eeh.o >> +obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) +=3D vfio_iommu_spapr_tce.o \ >> + vfio_spapr_eeh.o >> obj-$(CONFIG_VFIO_PCI) +=3D 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 >> =20 >> /* 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); >> =20 >> void vfio_spapr_pci_eeh_release(struct pci_dev *pdev) >> { >> eeh_dev_release(pdev); >> } >> +EXPORT_SYMBOL_GPL(vfio_spapr_pci_eeh_release); >> =20 >> 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, >> =20 >> return ret; >> } >> +EXPORT_SYMBOL_GPL(vfio_spapr_iommu_eeh_ioctl); >> +#endif /* CONFIG_EEH */ > > >