From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34141)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1bkB60-00024l-Uy
	for qemu-devel@nongnu.org; Wed, 14 Sep 2016 10:23:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1bkB5w-0002I9-TO
	for qemu-devel@nongnu.org; Wed, 14 Sep 2016 10:23:28 -0400
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
References: <1473244183-31510-1-git-send-email-david@gibson.dropbear.id.au>
	<CAFEAcA_Bc6NmVDsQsj11pZmurj_TyztaeHoqDid4Dgoy=1STuQ@mail.gmail.com>
	<87sht2insp.fsf@linaro.org>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <34604ac0-64c5-c437-e378-7af75873b23d@redhat.com>
Date: Wed, 14 Sep 2016 16:21:54 +0200
MIME-Version: 1.0
In-Reply-To: <87sht2insp.fsf@linaro.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PULL 00/64] ppc-for-2.8 queue 20160907
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: =?UTF-8?Q?Alex_Benn=c3=a9e?= <alex.bennee@linaro.org>, Peter Maydell <peter.maydell@linaro.org>
Cc: Laurent Vivier <lvivier@redhat.com>, Thomas Huth <thuth@redhat.com>, QEMU Developers <qemu-devel@nongnu.org>, Alexander Graf <agraf@suse.de>, "qemu-ppc@nongnu.org" <qemu-ppc@nongnu.org>, David Gibson <david@gibson.dropbear.id.au>



On 14/09/2016 16:00, Alex Bennée wrote:
> For reference this has broken 32 bit x86 builds on CentOS6. I bisected
> the problem to:
> 
>     commit 3654fa95bc29e72c2eef22f26eb621af1f86feec
>     Author: Cédric Le Goater <clg@kaod.org>
>     Date:   Tue Aug 2 19:38:01 2016 +0200
> 
>         hw/ppc: add a ppc_create_page_sizes_prop() helper routine
> 
>         The exact same routine will be used in PowerNV.
> 
>         Signed-off-by: Cédric Le Goater <clg@kaod.org>
>         Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> 
> With:
> 
>     15:00 alex@centos6-x86/i686  [qemu.git/bisect:???] >make
>       CC    ppc-softmmu/hw/ppc/fdt.o
>     In file included from /home/alex/lsrc/qemu.git/hw/ppc/fdt.c:14:
>     /home/alex/lsrc/qemu.git/include/hw/ppc/fdt.h:15: error: redefinition of typedef ‘CPUPPCState’
>     /home/alex/lsrc/qemu.git/target-ppc/cpu-qom.h:41: note: previous declaration of ‘CPUPPCState’ was here
>     make[1]: *** [hw/ppc/fdt.o] Error 1
>     make: *** [subdir-ppc-softmmu] Error 2
>     15:00 alex@centos6-x86/i686  [qemu.git/bisect:???] >

My pull request includes a fix.

Paolo