From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaHD7-0006ZK-Sm for qemu-devel@nongnu.org; Mon, 29 Feb 2016 01:21:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaHD6-0004OG-N6 for qemu-devel@nongnu.org; Mon, 29 Feb 2016 01:21:37 -0500 Date: Mon, 29 Feb 2016 17:20:36 +1100 From: David Gibson Message-ID: <20160229062036.GG5427@voom.redhat.com> References: <1456486323-8047-1-git-send-email-david@gibson.dropbear.id.au> <1456486323-8047-5-git-send-email-david@gibson.dropbear.id.au> <56D3A243.8010805@ozlabs.ru> <56D3BEE9.1030007@ozlabs.ru> <56D3C834.2020505@ozlabs.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Cp3Cp8fzgozWLBWL" Content-Disposition: inline In-Reply-To: <56D3C834.2020505@ozlabs.ru> Subject: Re: [Qemu-devel] [PATCH 04/12] spapr_pci: Fold spapr_phb_vfio_eeh_configure() into spapr_pci code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, gwshan@au1.ibm.com, agraf@suse.de, alex.williamson@redhat.com, qemu-ppc@nongnu.org --Cp3Cp8fzgozWLBWL Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 29, 2016 at 03:25:24PM +1100, Alexey Kardashevskiy wrote: > On 02/29/2016 02:45 PM, Alexey Kardashevskiy wrote: > >On 02/29/2016 12:43 PM, Alexey Kardashevskiy wrote: > >>On 02/26/2016 10:31 PM, David Gibson wrote: > >>>Simplify the sPAPR PCI code by folding spapr_phb_vfio_eeh_configure() > >>>into rtas_ibm_configure_pe(). > >>> > >>>Signed-off-by: David Gibson > >> > >>Reviewed-by: Alexey Kardashevskiy > > > >Aaaand this breaks mingw32: > > > > CC ppc64-softmmu/hw/ppc/spapr_pci.o > >/home/aik/p/qemu-dwg-eeh/hw/ppc/spapr_pci.c:46:24: fatal error: > >linux/vfio.h: No such file or directory > >compilation terminated. > >/home/aik/p/qemu-dwg-eeh/rules.mak:57: recipe for target > >'hw/ppc/spapr_pci.o' failed > >make[1]: *** [hw/ppc/spapr_pci.o] Error 1 > >make[1]: *** Waiting for unfinished jobs.... > >Makefile:186: recipe for target 'subdir-ppc64-softmmu' failed > >make: *** [subdir-ppc64-softmmu] Error 2 > >make: Leaving directory '/scratch/aik/p/qemu-dwg-eeh--ppc64_mingw32-buil= d' > > > > > > > >> > >>>--- > >>> hw/ppc/spapr_pci.c | 11 +++++++++-- > >>> hw/ppc/spapr_pci_vfio.c | 12 ------------ > >>> include/hw/pci-host/spapr.h | 1 - > >>> 3 files changed, 9 insertions(+), 15 deletions(-) > >>> > >>>diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > >>>index d1e5222..fa633a9 100644 > >>>--- a/hw/ppc/spapr_pci.c > >>>+++ b/hw/ppc/spapr_pci.c > >>>@@ -42,6 +42,9 @@ > >>> #include "hw/ppc/spapr_drc.h" > >>> #include "sysemu/device_tree.h" > >>> > >>>+#include "hw/vfio/vfio.h" > >>>+#include > >>>+ >=20 > This is missing: >=20 > #ifdef CONFIG_LINUX > #include > #endif >=20 > and below where you use symbols from linux/vfio.h. >=20 >=20 > My version of this rework did convert class callbacks to exported helpers > and keep these helpers (plus stubs) in spapr_pci_vfio.c, with one #ifdef > CONFIG_LINUX. Looked quite clean to me... Yeah, good idea. I'd forgotten the case of non-Linux builds. I'll do something similar in v2. --=20 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 --Cp3Cp8fzgozWLBWL Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJW0+M0AAoJEGw4ysog2bOSsDUP/3UQBNLuOUc00MCtZT5uBncE pfre5f/9GZgKgeJG6Ei2D7mQ8+GfBP5HiykH0ISIGyldmxaHTsp+DKHh+RC6byDO 1LtJ3PO+N8v4jFlYx4D0gF13WyS2oYsLjPRj4H+AHkRXfpuxGSOxUSXWkg96i3Jv 02TVY4Dtb6iF/oiRBzFicgvCyWFKe+HLD3BskJXlCXOhmVTNAG5UQkf1wIjT6yuK CEJ5i2o0BknyiFR+TiaO/kPbDQgcQ7FXn7SiGkg8rwWeIr7BHhpPU1s1eISNpJFb QRbWwfdlnUmk3OYdabyEWZgCovitAcAAkqBM4dQtHFBajlRiK7N8HyozcphYkK9q h6hTwzR2SHoUz2vp/xBdJG+/jP4M849i7bgO3L6Pz1V5RzOBGeo/+vDCo3Ptp2lL sw4DW/bKhUyE+BZbSOJAREZW/9axSIx90icThPViRUWQHytSRRAaFZ3VWU+ta0E9 JKIWGFFrhidD1DfzfPKQa5wmQhg+JFsyn2lAru4i+5qyZGAOxuBG/ZbmGfidWFL9 E32z+n5eaUYiva7vF9Al2AQ63QRFFtAi8nzSvY8tnUbZiJ8Ib1hZXksc43ps042P GuQ8O5Gru/CYjr8QrqnefUjAMfScPVss4BB/hXK09+HgLjJEa75xVozcvZu/Cnpi tu+mxuc5UoofmUzEWc9c =244Z -----END PGP SIGNATURE----- --Cp3Cp8fzgozWLBWL--