| Message ID | 20190111140857.4211-3-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | typedefs: Remove scarcely used declarations | expand |
On 2019-01-11 15:08, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > There is only one file requiring this typedef (hw/arm/pxa.h), I'd suggest to replace "file" with "header file" here. Reviewed-by: Thomas Huth <thuth@redhat.com> > let it include "hw/pcmcia.h" directly to simplify "qemu/typedefs.h". > > To clean "qemu/typedefs.h", move the declaration to "hw/pcmcia.h" > (removing the forward declaration). > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/arm/pxa.h | 1 + > include/hw/pcmcia.h | 4 ++-- > include/qemu/typedefs.h | 1 - > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h > index 0df1199caa..f6dfb5c0cf 100644 > --- a/include/hw/arm/pxa.h > +++ b/include/hw/arm/pxa.h > @@ -12,6 +12,7 @@ > > #include "exec/memory.h" > #include "target/arm/cpu-qom.h" > +#include "hw/pcmcia.h" > > /* Interrupt numbers */ > # define PXA2XX_PIC_SSP3 0 > diff --git a/include/hw/pcmcia.h b/include/hw/pcmcia.h > index 79cac9c761..1b4080764f 100644 > --- a/include/hw/pcmcia.h > +++ b/include/hw/pcmcia.h > @@ -18,13 +18,13 @@ typedef struct PCMCIASocket { > #define PCMCIA_CARD_CLASS(cls) \ > OBJECT_CLASS_CHECK(PCMCIACardClass, cls, TYPE_PCMCIA_CARD) > > -struct PCMCIACardState { > +typedef struct PCMCIACardState { > /*< private >*/ > DeviceState parent_obj; > /*< public >*/ > > PCMCIASocket *slot; > -}; > +} PCMCIACardState; > > typedef struct PCMCIACardClass { > /*< private >*/ > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h > index 28a8b9e7c2..3bd9215d55 100644 > --- a/include/qemu/typedefs.h > +++ b/include/qemu/typedefs.h > @@ -78,7 +78,6 @@ typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; > typedef struct PCIHostState PCIHostState; > typedef struct PCMachineClass PCMachineClass; > typedef struct PCMachineState PCMachineState; > -typedef struct PCMCIACardState PCMCIACardState; > typedef struct PixelFormat PixelFormat; > typedef struct PostcopyDiscardState PostcopyDiscardState; > typedef struct Property Property; >
diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h index 0df1199caa..f6dfb5c0cf 100644 --- a/include/hw/arm/pxa.h +++ b/include/hw/arm/pxa.h @@ -12,6 +12,7 @@ #include "exec/memory.h" #include "target/arm/cpu-qom.h" +#include "hw/pcmcia.h" /* Interrupt numbers */ # define PXA2XX_PIC_SSP3 0 diff --git a/include/hw/pcmcia.h b/include/hw/pcmcia.h index 79cac9c761..1b4080764f 100644 --- a/include/hw/pcmcia.h +++ b/include/hw/pcmcia.h @@ -18,13 +18,13 @@ typedef struct PCMCIASocket { #define PCMCIA_CARD_CLASS(cls) \ OBJECT_CLASS_CHECK(PCMCIACardClass, cls, TYPE_PCMCIA_CARD) -struct PCMCIACardState { +typedef struct PCMCIACardState { /*< private >*/ DeviceState parent_obj; /*< public >*/ PCMCIASocket *slot; -}; +} PCMCIACardState; typedef struct PCMCIACardClass { /*< private >*/ diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 28a8b9e7c2..3bd9215d55 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -78,7 +78,6 @@ typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; typedef struct PCIHostState PCIHostState; typedef struct PCMachineClass PCMachineClass; typedef struct PCMachineState PCMachineState; -typedef struct PCMCIACardState PCMCIACardState; typedef struct PixelFormat PixelFormat; typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property;