On 1/10/19 10:15 AM, Thomas Huth wrote: > When compiling with Clang in -std=gnu99 mode, there is a warning/error: > > CC ppc64-softmmu/hw/intc/xics_spapr.o > In file included from /home/thuth/devel/qemu/hw/intc/xics_spapr.c:34: > /home/thuth/devel/qemu/include/hw/ppc/xics.h:203:34: error: redefinition of > typedef 'sPAPRMachineState' is a C11 feature > [-Werror,-Wtypedef-redefinition] > typedef struct sPAPRMachineState sPAPRMachineState; > ^ > /home/thuth/devel/qemu/include/hw/ppc/spapr_irq.h:25:34: note: previous > definition is here > typedef struct sPAPRMachineState sPAPRMachineState; > ^ > > We have to remove the duplicated typedef here and include "spapr.h" instead. > But "spapr.h" should not be included for the pnv machine files. So move > the spapr-related prototypes into a new file called "xics_spapr.h" instead. > > Signed-off-by: Thomas Huth <th...@redhat.com>
Reviewed-by: Cédric Le Goater <c...@kaod.org> Thanks, C. > --- > hw/intc/xics_kvm.c | 1 + > hw/intc/xics_spapr.c | 1 + > hw/ppc/spapr_irq.c | 1 + > include/hw/ppc/xics.h | 7 ------- > include/hw/ppc/xics_spapr.h | 37 +++++++++++++++++++++++++++++++++++++ > 5 files changed, 40 insertions(+), 7 deletions(-) > create mode 100644 include/hw/ppc/xics_spapr.h > > diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c > index ac94594..dff1330 100644 > --- a/hw/intc/xics_kvm.c > +++ b/hw/intc/xics_kvm.c > @@ -34,6 +34,7 @@ > #include "sysemu/kvm.h" > #include "hw/ppc/spapr.h" > #include "hw/ppc/xics.h" > +#include "hw/ppc/xics_spapr.h" > #include "kvm_ppc.h" > #include "qemu/config-file.h" > #include "qemu/error-report.h" > diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c > index 9c1a90d..de6cc15 100644 > --- a/hw/intc/xics_spapr.c > +++ b/hw/intc/xics_spapr.c > @@ -32,6 +32,7 @@ > #include "qemu/timer.h" > #include "hw/ppc/spapr.h" > #include "hw/ppc/xics.h" > +#include "hw/ppc/xics_spapr.h" > #include "hw/ppc/fdt.h" > #include "qapi/visitor.h" > > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index 5fce72f..1da7a32 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -14,6 +14,7 @@ > #include "hw/ppc/spapr.h" > #include "hw/ppc/spapr_xive.h" > #include "hw/ppc/xics.h" > +#include "hw/ppc/xics_spapr.h" > #include "sysemu/kvm.h" > > #include "trace.h" > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > index 07508cb..fad786e 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -200,13 +200,6 @@ void ics_pic_print_info(ICSState *ics, Monitor *mon); > void ics_resend(ICSState *ics); > void icp_resend(ICPState *ss); > > -typedef struct sPAPRMachineState sPAPRMachineState; > - > -void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt, > - uint32_t phandle); > -int xics_kvm_init(sPAPRMachineState *spapr, Error **errp); > -void xics_spapr_init(sPAPRMachineState *spapr); > - > Object *icp_create(Object *cpu, const char *type, XICSFabric *xi, > Error **errp); > > diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h > new file mode 100644 > index 0000000..b1ab27d > --- /dev/null > +++ b/include/hw/ppc/xics_spapr.h > @@ -0,0 +1,37 @@ > +/* > + * QEMU PowerPC pSeries Logical Partition (aka sPAPR) hardware System > Emulator > + * > + * PAPR Virtualized Interrupt System, aka ICS/ICP aka xics > + * > + * Copyright (c) 2010, 2011 David Gibson, IBM Corporation. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > copy > + * of this software and associated documentation files (the "Software"), to > deal > + * in the Software without restriction, including without limitation the > rights > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > + * copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > FROM, > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > + * THE SOFTWARE. > + */ > + > +#ifndef XICS_SPAPR_H > +#define XICS_SPAPR_H > + > +#include "hw/ppc/spapr.h" > + > +void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt, > + uint32_t phandle); > +int xics_kvm_init(sPAPRMachineState *spapr, Error **errp); > +void xics_spapr_init(sPAPRMachineState *spapr); > + > +#endif /* XICS_SPAPR_H */ >
