| Message ID | 20210806211127.646908-5-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qom: Get rid of all manual usage of OBJECT_CHECK & friends | expand |
On 8/6/21 11:11 PM, Eduardo Habkost wrote: > Anonymous structs on QOM typedefs make the code harder to convert > to OBJECT_DEFINE* macros, as the macros expect the struct name to > exist. > > Use a codeconverter rule to automatically add names to the > structs used in QOM typedefs. > > Generated using: > > $ ./scripts/codeconverter/converter.py -i \ > --pattern=AddNamesToTypedefs $(git grep -l '' -- '*.[ch]') > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Thomas Huth <huth@tuxfamily.org> > Cc: Havard Skinnemoen <hskinnemoen@google.com> > Cc: Tyrone Ting <kfting@nuvoton.com> > Cc: Vijai Kumar K <vijai@behindbytes.com> > Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> > Cc: qemu-devel@nongnu.org > Cc: qemu-arm@nongnu.org > Cc: qemu-riscv@nongnu.org > --- > include/hw/adc/npcm7xx_adc.h | 2 +- > include/hw/char/shakti_uart.h | 2 +- > include/hw/tricore/tricore_testdevice.h | 2 +- > chardev/char-parallel.c | 4 ++-- > hw/m68k/mcf5206.c | 2 +- > hw/misc/sbsa_ec.c | 2 +- > 6 files changed, 7 insertions(+), 7 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h index 7d8442107ae..8e5a1897b4b 100644 --- a/include/hw/adc/npcm7xx_adc.h +++ b/include/hw/adc/npcm7xx_adc.h @@ -42,7 +42,7 @@ * @iref: The internal reference voltage, initialized at launch time. * @rv: The calibrated output values of 0.5V and 1.5V for the ADC. */ -typedef struct { +typedef struct NPCM7xxADCState { SysBusDevice parent; MemoryRegion iomem; diff --git a/include/hw/char/shakti_uart.h b/include/hw/char/shakti_uart.h index 526c408233f..25f7cbcaa55 100644 --- a/include/hw/char/shakti_uart.h +++ b/include/hw/char/shakti_uart.h @@ -51,7 +51,7 @@ #define SHAKTI_UART(obj) \ OBJECT_CHECK(ShaktiUartState, (obj), TYPE_SHAKTI_UART) -typedef struct { +typedef struct ShaktiUartState { /* <private> */ SysBusDevice parent_obj; diff --git a/include/hw/tricore/tricore_testdevice.h b/include/hw/tricore/tricore_testdevice.h index 2c56c51bcb8..e93c883872d 100644 --- a/include/hw/tricore/tricore_testdevice.h +++ b/include/hw/tricore/tricore_testdevice.h @@ -26,7 +26,7 @@ #define TRICORE_TESTDEVICE(obj) \ OBJECT_CHECK(TriCoreTestDeviceState, (obj), TYPE_TRICORE_TESTDEVICE) -typedef struct { +typedef struct TriCoreTestDeviceState { /* <private> */ SysBusDevice parent_obj; diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c index 05e7efbd6ca..acf9fb8afa0 100644 --- a/chardev/char-parallel.c +++ b/chardev/char-parallel.c @@ -49,7 +49,7 @@ #if defined(__linux__) -typedef struct { +typedef struct ParallelChardev { Chardev parent; int fd; int mode; @@ -177,7 +177,7 @@ static void qemu_chr_open_pp_fd(Chardev *chr, #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -typedef struct { +typedef struct ParallelChardev { Chardev parent; int fd; } ParallelChardev; diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 6d93d761a5e..72a815dbbd0 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -160,7 +160,7 @@ static m5206_timer_state *m5206_timer_init(qemu_irq irq) /* System Integration Module. */ -typedef struct { +typedef struct m5206_mbar_state { SysBusDevice parent_obj; M68kCPU *cpu; diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c index 83020fe9ac9..9e3c40a23dc 100644 --- a/hw/misc/sbsa_ec.c +++ b/hw/misc/sbsa_ec.c @@ -16,7 +16,7 @@ #include "hw/sysbus.h" #include "sysemu/runstate.h" -typedef struct { +typedef struct SECUREECState { SysBusDevice parent_obj; MemoryRegion iomem; } SECUREECState;
Anonymous structs on QOM typedefs make the code harder to convert to OBJECT_DEFINE* macros, as the macros expect the struct name to exist. Use a codeconverter rule to automatically add names to the structs used in QOM typedefs. Generated using: $ ./scripts/codeconverter/converter.py -i \ --pattern=AddNamesToTypedefs $(git grep -l '' -- '*.[ch]') Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Thomas Huth <huth@tuxfamily.org> Cc: Havard Skinnemoen <hskinnemoen@google.com> Cc: Tyrone Ting <kfting@nuvoton.com> Cc: Vijai Kumar K <vijai@behindbytes.com> Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Cc: qemu-riscv@nongnu.org --- include/hw/adc/npcm7xx_adc.h | 2 +- include/hw/char/shakti_uart.h | 2 +- include/hw/tricore/tricore_testdevice.h | 2 +- chardev/char-parallel.c | 4 ++-- hw/m68k/mcf5206.c | 2 +- hw/misc/sbsa_ec.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)