motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 18:44:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move QOM typedefs and add missing includes

Browse source 
Some typedefs and macros are defined after the type check macros.
This makes it difficult to automatically replace their
definitions with OBJECT_DECLARE_TYPE.

Patch generated using:

 $ ./scripts/codeconverter/converter.py -i \
   --pattern=QOMStructTypedefSplit $(git grep -l '' -- '*.[ch]')

which will split "typdef struct { ... } TypedefName"
declarations.

Followed by:

 $ ./scripts/codeconverter/converter.py -i --pattern=MoveSymbols \
    $(git grep -l '' -- '*.[ch]')

which will:
- move the typedefs and #defines above the type check macros
- add missing #include "qom/object.h" lines if necessary

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200831210740.126168-9-ehabkost@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20200831210740.126168-10-ehabkost@redhat.com>
Message-Id: <20200831210740.126168-11-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2020-09-03 16:43:22 -04:00
parent 1c8eef0227
commit db1015e92e
796 changed files with 3378 additions and 1823 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/ide/isa.c
View file

@ -32,14 +32,16 @@
#include "sysemu/dma.h"
#include "hw/ide/internal.h"
#include "qom/object.h"
/***********************************************************/
/* ISA IDE definitions */
#define TYPE_ISA_IDE "isa-ide"
typedef struct ISAIDEState ISAIDEState;
#define ISA_IDE(obj) OBJECT_CHECK(ISAIDEState, (obj), TYPE_ISA_IDE)
typedef struct ISAIDEState {
struct ISAIDEState {
ISADevice parent_obj;
IDEBus bus;
@ -47,7 +49,7 @@ typedef struct ISAIDEState {
uint32_t iobase2;
uint32_t isairq;
qemu_irq irq;
} ISAIDEState;
};
static void isa_ide_reset(DeviceState *d)
{

6
hw/ide/microdrive.c
View file

@ -31,8 +31,10 @@
#include "sysemu/dma.h"
#include "hw/ide/internal.h"
#include "qom/object.h"
#define TYPE_MICRODRIVE "microdrive"
typedef struct MicroDriveState MicroDriveState;
#define MICRODRIVE(obj) OBJECT_CHECK(MicroDriveState, (obj), TYPE_MICRODRIVE)
/***********************************************************/
@ -42,7 +44,7 @@
/* DSCM-1XXXX Microdrive hard disk with CF+ II / PCMCIA interface. */
typedef struct MicroDriveState {
struct MicroDriveState {
/*< private >*/
PCMCIACardState parent_obj;
/*< public >*/
@ -59,7 +61,7 @@ typedef struct MicroDriveState {
uint8_t ctrl;
uint16_t io;
uint8_t cycle;
} MicroDriveState;
};
/* Register bitfields */
enum md_opt {

6
hw/ide/mmio.c
View file

@ -31,6 +31,7 @@
#include "hw/ide/internal.h"
#include "hw/qdev-properties.h"
#include "qom/object.h"
/***********************************************************/
/* MMIO based ide port
@ -39,9 +40,10 @@
*/
#define TYPE_MMIO_IDE "mmio-ide"
typedef struct MMIOIDEState MMIOState;
#define MMIO_IDE(obj) OBJECT_CHECK(MMIOState, (obj), TYPE_MMIO_IDE)
typedef struct MMIOIDEState {
struct MMIOIDEState {
/*< private >*/
SysBusDevice parent_obj;
/*< public >*/
@ -51,7 +53,7 @@ typedef struct MMIOIDEState {
uint32_t shift;
qemu_irq irq;
MemoryRegion iomem1, iomem2;
} MMIOState;
};
static void mmio_ide_reset(DeviceState *dev)
{

6
hw/ide/sii3112.c
View file

@ -16,8 +16,10 @@
#include "hw/ide/pci.h"
#include "qemu/module.h"
#include "trace.h"
#include "qom/object.h"
#define TYPE_SII3112_PCI "sii3112"
typedef struct SiI3112PCIState SiI3112PCIState;
#define SII3112_PCI(obj) OBJECT_CHECK(SiI3112PCIState, (obj), \
TYPE_SII3112_PCI)
@ -28,11 +30,11 @@ typedef struct SiI3112Regs {
uint8_t swdata;
} SiI3112Regs;
typedef struct SiI3112PCIState {
struct SiI3112PCIState {
PCIIDEState i;
MemoryRegion mmio;
SiI3112Regs regs[2];
} SiI3112PCIState;
};
/* The sii3112_reg_read and sii3112_reg_write functions implement the
* Internal Register Space - BAR5 (section 6.7 of the data sheet).