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 <c...@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 <c...@kaod.org> > Signed-off-by: David Gibson <da...@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
