Move QOM typedefs and add missing includes

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

View file

@ -29,6 +29,7 @@
#include "qemu/module.h"
#include "sysemu/runstate.h"
#include "trace.h"
#include "qom/object.h"
/*
* This is the auxio port, chip control and system control part of
@ -39,9 +40,10 @@
*/
#define TYPE_SLAVIO_MISC "slavio_misc"
typedef struct MiscState MiscState;
#define SLAVIO_MISC(obj) OBJECT_CHECK(MiscState, (obj), TYPE_SLAVIO_MISC)
typedef struct MiscState {
struct MiscState {
SysBusDevice parent_obj;
MemoryRegion cfg_iomem;
@ -59,17 +61,18 @@ typedef struct MiscState {
uint8_t diag, mctrl;
uint8_t sysctrl;
uint16_t leds;
} MiscState;
};
#define TYPE_APC "apc"
typedef struct APCState APCState;
#define APC(obj) OBJECT_CHECK(APCState, (obj), TYPE_APC)
typedef struct APCState {
struct APCState {
SysBusDevice parent_obj;
MemoryRegion iomem;
qemu_irq cpu_halt;
} APCState;
};
#define MISC_SIZE 1
#define LED_SIZE 2