From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c3uoc-0000B5-6W for qemu-devel@nongnu.org; Mon, 07 Nov 2016 20:03:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c3uoZ-0005xb-34 for qemu-devel@nongnu.org; Mon, 07 Nov 2016 20:03:06 -0500 Date: Tue, 8 Nov 2016 10:36:27 +1100 From: David Gibson Message-ID: <20161107233627.GA28688@umbus.fritz.box> References: <1478541782-7891-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="fdj2RfSjLxBAspz7" Content-Disposition: inline In-Reply-To: <1478541782-7891-1-git-send-email-clg@kaod.org> Subject: Re: [Qemu-devel] [PATCH] ppc/pnv: fix compile breakage on old gcc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?C=E9dric?= Le Goater Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Olaf Hering --fdj2RfSjLxBAspz7 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 07, 2016 at 07:03:02PM +0100, C=C3=A9dric Le Goater wrote: > PnvChip is defined twice and this can confuse old compilers : >=20 > CC ppc64-softmmu/hw/ppc/pnv_xscom.o > In file included from qemu.git/hw/ppc/pnv.c:29: > qemu.git/include/hw/ppc/pnv.h:60: error: redefinition of typedef =E2=80= =98PnvChip=E2=80=99 > qemu.git/include/hw/ppc/pnv_xscom.h:24: note: previous declaration of =E2= =80=98PnvChip=E2=80=99 was here > make[1]: *** [hw/ppc/pnv.o] Error 1 > make[1]: *** Waiting for unfinished jobs.... >=20 > Signed-off-by: C=C3=A9dric Le Goater Applied to ppc-for-2.8, thanks. > --- >=20 > Tested with gcc version 4.4.7 20120313 >=20 > hw/ppc/pnv_core.c | 1 + > hw/ppc/pnv_lpc.c | 3 ++- > hw/ppc/pnv_xscom.c | 2 +- > include/hw/ppc/pnv.h | 1 - > include/hw/ppc/pnv_xscom.h | 2 -- > 5 files changed, 4 insertions(+), 5 deletions(-) >=20 > diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c > index 2acda9637db5..76ce854b0c40 100644 > --- a/hw/ppc/pnv_core.c > +++ b/hw/ppc/pnv_core.c > @@ -24,6 +24,7 @@ > #include "hw/ppc/ppc.h" > #include "hw/ppc/pnv.h" > #include "hw/ppc/pnv_core.h" > +#include "hw/ppc/pnv_xscom.h" > =20 > static void powernv_cpu_reset(void *opaque) > { > diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c > index 00dbd8b07b38..0e2117f0f5bc 100644 > --- a/hw/ppc/pnv_lpc.c > +++ b/hw/ppc/pnv_lpc.c > @@ -23,8 +23,9 @@ > #include "qapi/error.h" > #include "qemu/log.h" > =20 > -#include "hw/ppc/pnv_lpc.h" > #include "hw/ppc/pnv.h" > +#include "hw/ppc/pnv_lpc.h" > +#include "hw/ppc/pnv_xscom.h" > #include "hw/ppc/fdt.h" > =20 > #include > diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c > index 5aaa264bd75c..f46646141a96 100644 > --- a/hw/ppc/pnv_xscom.c > +++ b/hw/ppc/pnv_xscom.c > @@ -25,8 +25,8 @@ > #include "hw/sysbus.h" > =20 > #include "hw/ppc/fdt.h" > -#include "hw/ppc/pnv_xscom.h" > #include "hw/ppc/pnv.h" > +#include "hw/ppc/pnv_xscom.h" > =20 > #include > =20 > diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h > index 02ac1c5f428e..7bee658733db 100644 > --- a/include/hw/ppc/pnv.h > +++ b/include/hw/ppc/pnv.h > @@ -21,7 +21,6 @@ > =20 > #include "hw/boards.h" > #include "hw/sysbus.h" > -#include "hw/ppc/pnv_xscom.h" > #include "hw/ppc/pnv_lpc.h" > =20 > #define TYPE_PNV_CHIP "powernv-chip" > diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h > index c0a2fbb9f6f8..41a5127a1907 100644 > --- a/include/hw/ppc/pnv_xscom.h > +++ b/include/hw/ppc/pnv_xscom.h > @@ -21,8 +21,6 @@ > =20 > #include "qom/object.h" > =20 > -typedef struct PnvChip PnvChip; > - > typedef struct PnvXScomInterface { > Object parent; > } PnvXScomInterface; --=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 --fdj2RfSjLxBAspz7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYIQ/3AAoJEGw4ysog2bOSrEoP/ic1Os0Im2k5nYBUR5Srt0Le HKSVCpB/MbIERxNt4H5XDzKdwNEzla8i6KLmkijclgjbRqBx+umwIDXzYtzbPiwt +Q0k9Uu3S7ozHG4EjO1dCjsAd1TyD8ghT6VxJ4YRBu5hvOnrz6mzr7KcZPKrn1UV ktjqL5uboIpTsB6LRbI/P+Tpjml4GvVRAoIB2OSfj9uLZOtaZW77eh7MPvUHCgAF PDnvcyWOEdCniKtNguKZpQ7G2mVlB2LZQnKFO5Kq1zJNu9z9V9EAT2QEde7cW+05 5+faRXibrzxvqW5HI0BHBQR8NPk0HEescIjebb1pbVzMdAYaAWTvH9qYxefaLwkT Yb7iO1UEeNBc44hb1nOV0dXJ/LFWi0Tw2hgy101NolMDXPjwbTZ0B0VLXKGaFs2Q UrOYfEqYClrklnwbPx3mcmzdElS/XVre+M+VH2I2YDyqQNFnrMUTzzQ/rUMdUTx9 KWWWGlH9mg49GZ0zGtDdvXGulbLUH5YeTTTxxNzzJwYfOakdbuqCC+X5QrK6aKZa aal65qyzew5X7mbGS0Du0JD/w1unGHOW0QI3wpdnuUkUEA5xNx21ihDWC8O7xJXc tl1yZDK3qMWGsokBLkqIb9pWmah1CfMKZYME3o6ROLoUuxShK3UX/uN+HzwqkmTa xsYO+sk6IWrmgkkt0GVU =GlQb -----END PGP SIGNATURE----- --fdj2RfSjLxBAspz7--