On 2019-01-11 15:08, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé <f4...@amsat.org> > > There are only three files requiring this typedef, let them
s/files/header files/ Reviewed-by: Thomas Huth <th...@redhat.com> > include "hw/ssi/ssi.h" directly to simplify "qemu/typedefs.h". > > To clean "qemu/typedefs.h", move the forward declaration > to "hw/ssi/ssi.h". > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > hw/arm/strongarm.h | 1 + > include/hw/arm/pxa.h | 1 + > include/hw/ssi/pl022.h | 1 + > include/hw/ssi/ssi.h | 1 + > include/qemu/typedefs.h | 1 - > 5 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h > index e98840b461..ae51a1ae34 100644 > --- a/hw/arm/strongarm.h > +++ b/hw/arm/strongarm.h > @@ -3,6 +3,7 @@ > > #include "exec/memory.h" > #include "target/arm/cpu-qom.h" > +#include "hw/ssi/ssi.h" > > #define SA_CS0 0x00000000 > #define SA_CS1 0x08000000 > diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h > index f6dfb5c0cf..f184349f02 100644 > --- a/include/hw/arm/pxa.h > +++ b/include/hw/arm/pxa.h > @@ -13,6 +13,7 @@ > #include "exec/memory.h" > #include "target/arm/cpu-qom.h" > #include "hw/pcmcia.h" > +#include "hw/ssi/ssi.h" > > /* Interrupt numbers */ > # define PXA2XX_PIC_SSP3 0 > diff --git a/include/hw/ssi/pl022.h b/include/hw/ssi/pl022.h > index a080519366..1cf16f1539 100644 > --- a/include/hw/ssi/pl022.h > +++ b/include/hw/ssi/pl022.h > @@ -22,6 +22,7 @@ > #define HW_SSI_PL022_H > > #include "hw/sysbus.h" > +#include "hw/ssi/ssi.h" > > #define TYPE_PL022 "pl022" > #define PL022(obj) OBJECT_CHECK(PL022State, (obj), TYPE_PL022) > diff --git a/include/hw/ssi/ssi.h b/include/hw/ssi/ssi.h > index 6a0c3c3cdb..bdbf3c51f5 100644 > --- a/include/hw/ssi/ssi.h > +++ b/include/hw/ssi/ssi.h > @@ -13,6 +13,7 @@ > > #include "hw/qdev.h" > > +typedef struct SSIBus SSIBus; > typedef struct SSISlave SSISlave; > typedef struct SSISlaveClass SSISlaveClass; > typedef enum SSICSMode SSICSMode; > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h > index 3bd9215d55..c026229573 100644 > --- a/include/qemu/typedefs.h > +++ b/include/qemu/typedefs.h > @@ -108,7 +108,6 @@ typedef struct Range Range; > typedef struct SerialState SerialState; > typedef struct SHPCDevice SHPCDevice; > typedef struct SMBusDevice SMBusDevice; > -typedef struct SSIBus SSIBus; > typedef struct uWireSlave uWireSlave; > typedef struct VirtIODevice VirtIODevice; > typedef struct Visitor Visitor; >
