diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2019-01-11 15:08:44 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2019-01-22 05:14:32 +0100 |
| commit | 2274e7ddd16219439bf8eef5a606b1be0c6a47a3 (patch) | |
| tree | 5eea810c4f872b3ca310a7b640bbdce85c72ad23 /include | |
| parent | fa9414e9694ebec033dd775bbb3b6ddf468f66c3 (diff) | |
| download | focaccia-qemu-2274e7ddd16219439bf8eef5a606b1be0c6a47a3.tar.gz focaccia-qemu-2274e7ddd16219439bf8eef5a606b1be0c6a47a3.zip | |
hw/pcmcia: Remove PCMCIACardState from "qemu/typedefs.h"
There is only one header file requiring this typedef (hw/arm/pxa.h), 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> [thuth: slightly tweaked commit message] Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/arm/pxa.h | 1 | ||||
| -rw-r--r-- | include/hw/pcmcia.h | 4 | ||||
| -rw-r--r-- | 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; |