| Message ID | 20180508151035.16774-5-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | qemu/typedefs.h cleanup | expand |
On 05/08/2018 11:10 AM, Philippe Mathieu-Daudé wrote: > Files requiring AllwinnerAHCIState already include "hw/ide/ahci.h". > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/ide/ahci.h | 4 ++-- > include/qemu/typedefs.h | 1 - > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h > index b7bb2b02d6..b44e3000cf 100644 > --- a/include/hw/ide/ahci.h > +++ b/include/hw/ide/ahci.h > @@ -73,13 +73,13 @@ typedef struct SysbusAHCIState { > #define ALLWINNER_AHCI_MMIO_OFF 0x80 > #define ALLWINNER_AHCI_MMIO_SIZE 0x80 > > -struct AllwinnerAHCIState { > +typedef struct AllwinnerAHCIState { > /*< private >*/ > SysbusAHCIState parent_obj; > /*< public >*/ > > MemoryRegion mmio; > uint32_t regs[ALLWINNER_AHCI_MMIO_SIZE/4]; > -}; > +} AllwinnerAHCIState; > > #endif /* HW_IDE_AHCI_H */ > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h > index b4dc63a466..6baadfbd49 100644 > --- a/include/qemu/typedefs.h > +++ b/include/qemu/typedefs.h > @@ -8,7 +8,6 @@ > typedef struct AdapterInfo AdapterInfo; > typedef struct AddressSpace AddressSpace; > typedef struct AioContext AioContext; > -typedef struct AllwinnerAHCIState AllwinnerAHCIState; > typedef struct AudioState AudioState; > typedef struct BdrvDirtyBitmap BdrvDirtyBitmap; > typedef struct BdrvDirtyBitmapIter BdrvDirtyBitmapIter; > Hm, sure; I suppose we don't need QEMU-wide definitions of these sorts of things. Acked-by: John Snow <jsnow@redhat.com>
diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h index b7bb2b02d6..b44e3000cf 100644 --- a/include/hw/ide/ahci.h +++ b/include/hw/ide/ahci.h @@ -73,13 +73,13 @@ typedef struct SysbusAHCIState { #define ALLWINNER_AHCI_MMIO_OFF 0x80 #define ALLWINNER_AHCI_MMIO_SIZE 0x80 -struct AllwinnerAHCIState { +typedef struct AllwinnerAHCIState { /*< private >*/ SysbusAHCIState parent_obj; /*< public >*/ MemoryRegion mmio; uint32_t regs[ALLWINNER_AHCI_MMIO_SIZE/4]; -}; +} AllwinnerAHCIState; #endif /* HW_IDE_AHCI_H */ diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index b4dc63a466..6baadfbd49 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -8,7 +8,6 @@ typedef struct AdapterInfo AdapterInfo; typedef struct AddressSpace AddressSpace; typedef struct AioContext AioContext; -typedef struct AllwinnerAHCIState AllwinnerAHCIState; typedef struct AudioState AudioState; typedef struct BdrvDirtyBitmap BdrvDirtyBitmap; typedef struct BdrvDirtyBitmapIter BdrvDirtyBitmapIter;
Files requiring AllwinnerAHCIState already include "hw/ide/ahci.h". Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/ide/ahci.h | 4 ++-- include/qemu/typedefs.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)