On 1/11/19 9:17 AM, Thomas Huth wrote: > When compiling the ppc code with clang and -std=gnu99, there are a > couple of warnings/errors like this one: > > CC ppc64-softmmu/hw/intc/xics.o > In file included from hw/intc/xics.c:35: > include/hw/ppc/xics.h:43:25: error: redefinition of typedef 'ICPState' is a > C11 feature > [-Werror,-Wtypedef-redefinition] > typedef struct ICPState ICPState; > ^ > target/ppc/cpu.h:1181:25: note: previous definition is here > typedef struct ICPState ICPState; > ^ > Work around the problems by including the proper headers instead. > > Signed-off-by: Thomas Huth <th...@redhat.com>
Reviewed-by: Cédric Le Goater <c...@kaod.org> Thanks for sorting this out, C. > --- > include/hw/ppc/spapr.h | 5 +++-- > include/hw/ppc/spapr_xive.h | 2 -- > target/ppc/cpu.h | 13 +++++++++---- > 3 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 9e01a5a..a947a0a 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -8,15 +8,16 @@ > #include "hw/mem/pc-dimm.h" > #include "hw/ppc/spapr_ovec.h" > #include "hw/ppc/spapr_irq.h" > +#include "hw/ppc/spapr_xive.h" /* For sPAPRXive */ > +#include "hw/ppc/xics.h" /* For ICSState */ > > struct VIOsPAPRBus; > struct sPAPRPHBState; > struct sPAPRNVRAM; > + > typedef struct sPAPREventLogEntry sPAPREventLogEntry; > typedef struct sPAPREventSource sPAPREventSource; > typedef struct sPAPRPendingHPT sPAPRPendingHPT; > -typedef struct ICSState ICSState; > -typedef struct sPAPRXive sPAPRXive; > > #define HPTE64_V_HPTE_DIRTY 0x0000000000000040ULL > #define SPAPR_ENTRY_POINT 0x100 > diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h > index 7fdc250..9bec919 100644 > --- a/include/hw/ppc/spapr_xive.h > +++ b/include/hw/ppc/spapr_xive.h > @@ -41,8 +41,6 @@ bool spapr_xive_irq_claim(sPAPRXive *xive, uint32_t lisn, > bool lsi); > bool spapr_xive_irq_free(sPAPRXive *xive, uint32_t lisn); > void spapr_xive_pic_print_info(sPAPRXive *xive, Monitor *mon); > > -typedef struct sPAPRMachineState sPAPRMachineState; > - > void spapr_xive_hcall_init(sPAPRMachineState *spapr); > void spapr_dt_xive(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt, > uint32_t phandle); > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 486abaf..bde4dff 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -23,6 +23,11 @@ > #include "qemu-common.h" > #include "qemu/int128.h" > > +#ifndef CONFIG_USER_ONLY > +#include "hw/ppc/xive.h" /* for XiveTCTX */ > +#include "hw/ppc/xics.h" /* for ICPState */ > +#endif > + > //#define PPC_EMULATE_32BITS_HYPV > > #if defined (TARGET_PPC64) > @@ -1177,8 +1182,6 @@ do { \ > > typedef struct PPCVirtualHypervisor PPCVirtualHypervisor; > typedef struct PPCVirtualHypervisorClass PPCVirtualHypervisorClass; > -typedef struct XiveTCTX XiveTCTX; > -typedef struct ICPState ICPState; > > /** > * PowerPCCPU: > @@ -1197,11 +1200,13 @@ struct PowerPCCPU { > int vcpu_id; > uint32_t compat_pvr; > PPCVirtualHypervisor *vhyp; > - ICPState *icp; > - XiveTCTX *tctx; > void *machine_data; > int32_t node_id; /* NUMA node this CPU belongs to */ > PPCHash64Options *hash64_opts; > +#ifndef CONFIG_USER_ONLY > + ICPState *icp; > + XiveTCTX *tctx; > +#endif > > /* Fields related to migration compatibility hacks */ > bool pre_2_8_migration; >