Message ID | 6da95866-cb26-5cea-37be-7b62e5746b0b@kaod.org |
---|---|
State | New |
Headers | show |
On 09/14/2016 04:33 PM, Cédric Le Goater wrote: > On 09/14/2016 03:59 PM, Alex Bennée wrote: >> >> David Gibson <david@gibson.dropbear.id.au> writes: >> >>> From: Cédric Le Goater <clg@kaod.org> >>> >>> 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> >> >> This patch has broken 32 bit x86 builds on CentOS6 (I happened to be looking >> at something else and found it broken): >> >> 14:57 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 > > ok. CentOS6 must be 4.4 compiler, which has that kind of problem. > > Could you try that quick fix ? Nah, Paolo did it already :) Thanks ! C.
diff --git a/include/hw/ppc/fdt.h b/include/hw/ppc/fdt.h index 2c68d1616f5c..b58ef616c45c 100644 --- a/include/hw/ppc/fdt.h +++ b/include/hw/ppc/fdt.h @@ -12,8 +12,6 @@ #include "qemu/error-report.h" -typedef struct CPUPPCState CPUPPCState; - #define _FDT(exp) \ do { \ int ret = (exp); \