Use OBJECT_DECLARE_TYPE where possible

Replace DECLARE_OBJ_CHECKERS with OBJECT_DECLARE_TYPE where the
typedefs can be safely removed.

Generated running:

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

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200831210740.126168-16-ehabkost@redhat.com>
Message-Id: <20200831210740.126168-17-ehabkost@redhat.com>
Message-Id: <20200831210740.126168-18-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

backends/dbus-vmstate.c

@@ -21,12 +21,10 @@
 #include "trace.h"
 #include "qom/object.h"
 
-typedef struct DBusVMState DBusVMState;
-typedef struct DBusVMStateClass DBusVMStateClass;
 
 #define TYPE_DBUS_VMSTATE "dbus-vmstate"
-DECLARE_OBJ_CHECKERS(DBusVMState, DBusVMStateClass,
+OBJECT_DECLARE_TYPE(DBusVMState, DBusVMStateClass,
-                     DBUS_VMSTATE, TYPE_DBUS_VMSTATE)
+                    dbus_vmstate, DBUS_VMSTATE)
 
 struct DBusVMStateClass {
     ObjectClass parent_class;

hw/audio/intel-hda.h

@@ -8,10 +8,8 @@
 /* hda bus                                                               */
 
 #define TYPE_HDA_CODEC_DEVICE "hda-codec"
-typedef struct HDACodecDevice HDACodecDevice;
+OBJECT_DECLARE_TYPE(HDACodecDevice, HDACodecDeviceClass,
-typedef struct HDACodecDeviceClass HDACodecDeviceClass;
+                    hda_codec_device, HDA_CODEC_DEVICE)
-DECLARE_OBJ_CHECKERS(HDACodecDevice, HDACodecDeviceClass,
-                     HDA_CODEC_DEVICE, TYPE_HDA_CODEC_DEVICE)
 
 #define TYPE_HDA_BUS "HDA"
 typedef struct HDACodecBus HDACodecBus;

hw/display/virtio-vga.h

@@ -9,10 +9,8 @@
  * virtio-vga-base: This extends VirtioPCIProxy.
  */
 #define TYPE_VIRTIO_VGA_BASE "virtio-vga-base"
-typedef struct VirtIOVGABase VirtIOVGABase;
+OBJECT_DECLARE_TYPE(VirtIOVGABase, VirtIOVGABaseClass,
-typedef struct VirtIOVGABaseClass VirtIOVGABaseClass;
+                    virtio_vga_base, VIRTIO_VGA_BASE)
-DECLARE_OBJ_CHECKERS(VirtIOVGABase, VirtIOVGABaseClass,
-                     VIRTIO_VGA_BASE, TYPE_VIRTIO_VGA_BASE)
 
 struct VirtIOVGABase {
     VirtIOPCIProxy parent_obj;

include/authz/base.h

@@ -27,10 +27,8 @@
 
 #define TYPE_QAUTHZ "authz"
 
-typedef struct QAuthZ QAuthZ;
+OBJECT_DECLARE_TYPE(QAuthZ, QAuthZClass,
-typedef struct QAuthZClass QAuthZClass;
+                    qauthz, QAUTHZ)
-DECLARE_OBJ_CHECKERS(QAuthZ, QAuthZClass,
-                     QAUTHZ, TYPE_QAUTHZ)
 
 
 /**

include/authz/list.h

@@ -27,10 +27,8 @@
 
 #define TYPE_QAUTHZ_LIST "authz-list"
 
-typedef struct QAuthZList QAuthZList;
+OBJECT_DECLARE_TYPE(QAuthZList, QAuthZListClass,
-typedef struct QAuthZListClass QAuthZListClass;
+                    qauthz_list, QAUTHZ_LIST)
-DECLARE_OBJ_CHECKERS(QAuthZList, QAuthZListClass,
-                     QAUTHZ_LIST, TYPE_QAUTHZ_LIST)
 
 
 

include/authz/listfile.h

@@ -27,10 +27,8 @@
 
 #define TYPE_QAUTHZ_LIST_FILE "authz-list-file"
 
-typedef struct QAuthZListFile QAuthZListFile;
+OBJECT_DECLARE_TYPE(QAuthZListFile, QAuthZListFileClass,
-typedef struct QAuthZListFileClass QAuthZListFileClass;
+                    qauthz_list_file, QAUTHZ_LIST_FILE)
-DECLARE_OBJ_CHECKERS(QAuthZListFile, QAuthZListFileClass,
-                     QAUTHZ_LIST_FILE, TYPE_QAUTHZ_LIST_FILE)
 
 
 

include/authz/pamacct.h

@@ -27,10 +27,8 @@
 
 #define TYPE_QAUTHZ_PAM "authz-pam"
 
-typedef struct QAuthZPAM QAuthZPAM;
+OBJECT_DECLARE_TYPE(QAuthZPAM, QAuthZPAMClass,
-typedef struct QAuthZPAMClass QAuthZPAMClass;
+                    qauthz_pam, QAUTHZ_PAM)
-DECLARE_OBJ_CHECKERS(QAuthZPAM, QAuthZPAMClass,
-                     QAUTHZ_PAM, TYPE_QAUTHZ_PAM)
 
 
 

include/authz/simple.h

@@ -26,10 +26,8 @@
 
 #define TYPE_QAUTHZ_SIMPLE "authz-simple"
 
-typedef struct QAuthZSimple QAuthZSimple;
+OBJECT_DECLARE_TYPE(QAuthZSimple, QAuthZSimpleClass,
-typedef struct QAuthZSimpleClass QAuthZSimpleClass;
+                    qauthz_simple, QAUTHZ_SIMPLE)
-DECLARE_OBJ_CHECKERS(QAuthZSimple, QAuthZSimpleClass,
-                     QAUTHZ_SIMPLE, TYPE_QAUTHZ_SIMPLE)
 
 
 

include/crypto/secret_common.h

@@ -25,10 +25,8 @@
 #include "qom/object.h"
 
 #define TYPE_QCRYPTO_SECRET_COMMON "secret_common"
-typedef struct QCryptoSecretCommon QCryptoSecretCommon;
+OBJECT_DECLARE_TYPE(QCryptoSecretCommon, QCryptoSecretCommonClass,
-typedef struct QCryptoSecretCommonClass QCryptoSecretCommonClass;
+                    qcrypto_secret_common, QCRYPTO_SECRET_COMMON)
-DECLARE_OBJ_CHECKERS(QCryptoSecretCommon, QCryptoSecretCommonClass,
-                     QCRYPTO_SECRET_COMMON, TYPE_QCRYPTO_SECRET_COMMON)
 
 
 struct QCryptoSecretCommon {

include/crypto/secret_keyring.h

@@ -26,10 +26,8 @@
 #include "crypto/secret_common.h"
 
 #define TYPE_QCRYPTO_SECRET_KEYRING "secret_keyring"
-typedef struct QCryptoSecretKeyring QCryptoSecretKeyring;
+OBJECT_DECLARE_TYPE(QCryptoSecretKeyring, QCryptoSecretKeyringClass,
-typedef struct QCryptoSecretKeyringClass QCryptoSecretKeyringClass;
+                    qcrypto_secret_keyring, QCRYPTO_SECRET_KEYRING)
-DECLARE_OBJ_CHECKERS(QCryptoSecretKeyring, QCryptoSecretKeyringClass,
-                     QCRYPTO_SECRET_KEYRING, TYPE_QCRYPTO_SECRET_KEYRING)
 
 
 struct QCryptoSecretKeyring {

include/hw/arm/armsse.h

@@ -108,10 +108,8 @@
 #include "qom/object.h"
 
 #define TYPE_ARM_SSE "arm-sse"
-typedef struct ARMSSE ARMSSE;
+OBJECT_DECLARE_TYPE(ARMSSE, ARMSSEClass,
-typedef struct ARMSSEClass ARMSSEClass;
+                    arm_sse, ARM_SSE)
-DECLARE_OBJ_CHECKERS(ARMSSE, ARMSSEClass,
-                     ARM_SSE, TYPE_ARM_SSE)
 
 /*
  * These type names are for specific IoTKit subsystems; other than

include/hw/hyperv/vmbus.h

@@ -20,10 +20,8 @@
 
 #define TYPE_VMBUS_DEVICE "vmbus-dev"
 
-typedef struct VMBusDevice VMBusDevice;
+OBJECT_DECLARE_TYPE(VMBusDevice, VMBusDeviceClass,
-typedef struct VMBusDeviceClass VMBusDeviceClass;
+                    vmbus_device, VMBUS_DEVICE)
-DECLARE_OBJ_CHECKERS(VMBusDevice, VMBusDeviceClass,
-                     VMBUS_DEVICE, TYPE_VMBUS_DEVICE)
 
 #define TYPE_VMBUS "vmbus"
 typedef struct VMBus VMBus;

include/hw/i2c/i2c.h

@@ -16,12 +16,10 @@ enum i2c_event {
     I2C_NACK /* Masker NACKed a receive byte.  */
 };
 
-typedef struct I2CSlave I2CSlave;
 
 #define TYPE_I2C_SLAVE "i2c-slave"
-typedef struct I2CSlaveClass I2CSlaveClass;
+OBJECT_DECLARE_TYPE(I2CSlave, I2CSlaveClass,
-DECLARE_OBJ_CHECKERS(I2CSlave, I2CSlaveClass,
+                    i2c_slave, I2C_SLAVE)
-                     I2C_SLAVE, TYPE_I2C_SLAVE)
 
 struct I2CSlaveClass {
     DeviceClass parent_class;

include/hw/i2c/smbus_slave.h

@@ -29,10 +29,8 @@
 #include "qom/object.h"
 
 #define TYPE_SMBUS_DEVICE "smbus-device"
-typedef struct SMBusDevice SMBusDevice;
+OBJECT_DECLARE_TYPE(SMBusDevice, SMBusDeviceClass,
-typedef struct SMBusDeviceClass SMBusDeviceClass;
+                    smbus_device, SMBUS_DEVICE)
-DECLARE_OBJ_CHECKERS(SMBusDevice, SMBusDeviceClass,
-                     SMBUS_DEVICE, TYPE_SMBUS_DEVICE)
 
 
 struct SMBusDeviceClass {

include/hw/ipack/ipack.h

@@ -30,12 +30,10 @@ struct IPackBus {
     qemu_irq_handler set_irq;
 };
 
-typedef struct IPackDevice IPackDevice;
-typedef struct IPackDeviceClass IPackDeviceClass;
 
 #define TYPE_IPACK_DEVICE "ipack-device"
-DECLARE_OBJ_CHECKERS(IPackDevice, IPackDeviceClass,
+OBJECT_DECLARE_TYPE(IPackDevice, IPackDeviceClass,
-                     IPACK_DEVICE, TYPE_IPACK_DEVICE)
+                    ipack_device, IPACK_DEVICE)
 
 struct IPackDeviceClass {
     /*< private >*/

include/hw/ipmi/ipmi.h

@@ -176,10 +176,8 @@ struct IPMIInterfaceClass {
  * Define a BMC simulator (or perhaps a connection to a real BMC)
  */
 #define TYPE_IPMI_BMC "ipmi-bmc"
-typedef struct IPMIBmc IPMIBmc;
+OBJECT_DECLARE_TYPE(IPMIBmc, IPMIBmcClass,
-typedef struct IPMIBmcClass IPMIBmcClass;
+                    ipmi_bmc, IPMI_BMC)
-DECLARE_OBJ_CHECKERS(IPMIBmc, IPMIBmcClass,
-                     IPMI_BMC, TYPE_IPMI_BMC)
 
 struct IPMIBmc {
     DeviceState parent;

include/hw/mem/pc-dimm.h

@@ -21,10 +21,8 @@
 #include "qom/object.h"
 
 #define TYPE_PC_DIMM "pc-dimm"
-typedef struct PCDIMMDevice PCDIMMDevice;
+OBJECT_DECLARE_TYPE(PCDIMMDevice, PCDIMMDeviceClass,
-typedef struct PCDIMMDeviceClass PCDIMMDeviceClass;
+                    pc_dimm, PC_DIMM)
-DECLARE_OBJ_CHECKERS(PCDIMMDevice, PCDIMMDeviceClass,
-                     PC_DIMM, TYPE_PC_DIMM)
 
 #define PC_DIMM_ADDR_PROP "addr"
 #define PC_DIMM_SLOT_PROP "slot"

include/hw/ppc/pnv.h

@@ -35,10 +35,8 @@
 #include "qom/object.h"
 
 #define TYPE_PNV_CHIP "pnv-chip"
-typedef struct PnvChip PnvChip;
+OBJECT_DECLARE_TYPE(PnvChip, PnvChipClass,
-typedef struct PnvChipClass PnvChipClass;
+                    pnv_chip, PNV_CHIP)
-DECLARE_OBJ_CHECKERS(PnvChip, PnvChipClass,
-                     PNV_CHIP, TYPE_PNV_CHIP)
 
 struct PnvChip {
     /*< private >*/

include/hw/ppc/pnv_core.h

@@ -25,10 +25,8 @@
 #include "qom/object.h"
 
 #define TYPE_PNV_CORE "powernv-cpu-core"
-typedef struct PnvCore PnvCore;
+OBJECT_DECLARE_TYPE(PnvCore, PnvCoreClass,
-typedef struct PnvCoreClass PnvCoreClass;
+                    pnv_core, PNV_CORE)
-DECLARE_OBJ_CHECKERS(PnvCore, PnvCoreClass,
-                     PNV_CORE, TYPE_PNV_CORE)
 
 typedef struct PnvChip PnvChip;
 

include/hw/ppc/pnv_homer.h

@@ -24,10 +24,8 @@
 #include "qom/object.h"
 
 #define TYPE_PNV_HOMER "pnv-homer"
-typedef struct PnvHomer PnvHomer;
+OBJECT_DECLARE_TYPE(PnvHomer, PnvHomerClass,
-typedef struct PnvHomerClass PnvHomerClass;
+                    pnv_homer, PNV_HOMER)
-DECLARE_OBJ_CHECKERS(PnvHomer, PnvHomerClass,
-                     PNV_HOMER, TYPE_PNV_HOMER)
 #define TYPE_PNV8_HOMER TYPE_PNV_HOMER "-POWER8"
 DECLARE_INSTANCE_CHECKER(PnvHomer, PNV8_HOMER,
                          TYPE_PNV8_HOMER)

include/hw/ppc/pnv_occ.h

@@ -24,10 +24,8 @@
 #include "qom/object.h"
 
 #define TYPE_PNV_OCC "pnv-occ"
-typedef struct PnvOCC PnvOCC;
+OBJECT_DECLARE_TYPE(PnvOCC, PnvOCCClass,
-typedef struct PnvOCCClass PnvOCCClass;
+                    pnv_occ, PNV_OCC)
-DECLARE_OBJ_CHECKERS(PnvOCC, PnvOCCClass,
-                     PNV_OCC, TYPE_PNV_OCC)
 #define TYPE_PNV8_OCC TYPE_PNV_OCC "-POWER8"
 DECLARE_INSTANCE_CHECKER(PnvOCC, PNV8_OCC,
                          TYPE_PNV8_OCC)

include/hw/ppc/pnv_psi.h

@@ -26,10 +26,8 @@
 #include "qom/object.h"
 
 #define TYPE_PNV_PSI "pnv-psi"
-typedef struct PnvPsi PnvPsi;
+OBJECT_DECLARE_TYPE(PnvPsi, PnvPsiClass,
-typedef struct PnvPsiClass PnvPsiClass;
+                    pnv_psi, PNV_PSI)
-DECLARE_OBJ_CHECKERS(PnvPsi, PnvPsiClass,
-                     PNV_PSI, TYPE_PNV_PSI)
 
 #define PSIHB_XSCOM_MAX         0x20
 

include/hw/ppc/pnv_xive.h

@@ -16,10 +16,8 @@
 struct PnvChip;
 
 #define TYPE_PNV_XIVE "pnv-xive"
-typedef struct PnvXive PnvXive;
+OBJECT_DECLARE_TYPE(PnvXive, PnvXiveClass,
-typedef struct PnvXiveClass PnvXiveClass;
+                    pnv_xive, PNV_XIVE)
-DECLARE_OBJ_CHECKERS(PnvXive, PnvXiveClass,
-                     PNV_XIVE, TYPE_PNV_XIVE)
 
 #define XIVE_BLOCK_MAX      16
 

include/hw/ppc/spapr_cpu_core.h

@@ -16,10 +16,8 @@
 #include "qom/object.h"
 
 #define TYPE_SPAPR_CPU_CORE "spapr-cpu-core"
-typedef struct SpaprCpuCore SpaprCpuCore;
+OBJECT_DECLARE_TYPE(SpaprCpuCore, SpaprCpuCoreClass,
-typedef struct SpaprCpuCoreClass SpaprCpuCoreClass;
+                    spapr_cpu_core, SPAPR_CPU_CORE)
-DECLARE_OBJ_CHECKERS(SpaprCpuCore, SpaprCpuCoreClass,
-                     SPAPR_CPU_CORE, TYPE_SPAPR_CPU_CORE)
 
 #define SPAPR_CPU_CORE_TYPE_NAME(model) model "-" TYPE_SPAPR_CPU_CORE
 

include/hw/ppc/spapr_vio.h

@@ -28,10 +28,8 @@
 #include "qom/object.h"
 
 #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device"
-typedef struct SpaprVioDevice SpaprVioDevice;
+OBJECT_DECLARE_TYPE(SpaprVioDevice, SpaprVioDeviceClass,
-typedef struct SpaprVioDeviceClass SpaprVioDeviceClass;
+                    vio_spapr_device, VIO_SPAPR_DEVICE)
-DECLARE_OBJ_CHECKERS(SpaprVioDevice, SpaprVioDeviceClass,
-                     VIO_SPAPR_DEVICE, TYPE_VIO_SPAPR_DEVICE)
 
 #define TYPE_SPAPR_VIO_BUS "spapr-vio-bus"
 typedef struct SpaprVioBus SpaprVioBus;

include/hw/ppc/xics.h

@@ -41,8 +41,6 @@
  * (the kernel implementation supports more but we don't exploit
  *  that yet)
  */
-typedef struct ICPStateClass ICPStateClass;
-typedef struct ICPState ICPState;
 typedef struct PnvICPState PnvICPState;
 typedef struct ICSStateClass ICSStateClass;
 typedef struct ICSState ICSState;
@@ -50,8 +48,8 @@ typedef struct ICSIRQState ICSIRQState;
 typedef struct XICSFabric XICSFabric;
 
 #define TYPE_ICP "icp"
-DECLARE_OBJ_CHECKERS(ICPState, ICPStateClass,
+OBJECT_DECLARE_TYPE(ICPState, ICPStateClass,
-                     ICP, TYPE_ICP)
+                    icp, ICP)
 
 #define TYPE_PNV_ICP "pnv-icp"
 DECLARE_INSTANCE_CHECKER(PnvICPState, PNV_ICP,

include/hw/ppc/xive.h

@@ -345,12 +345,10 @@ struct XiveRouter {
 
     XiveFabric *xfb;
 };
-typedef struct XiveRouter XiveRouter;
 
 #define TYPE_XIVE_ROUTER "xive-router"
-typedef struct XiveRouterClass XiveRouterClass;
+OBJECT_DECLARE_TYPE(XiveRouter, XiveRouterClass,
-DECLARE_OBJ_CHECKERS(XiveRouter, XiveRouterClass,
+                    xive_router, XIVE_ROUTER)
-                     XIVE_ROUTER, TYPE_XIVE_ROUTER)
 
 struct XiveRouterClass {
     SysBusDeviceClass parent;

include/hw/s390x/event-facility.h

@@ -42,10 +42,8 @@
 #define SCLP_SELECTIVE_READ                     0x01
 
 #define TYPE_SCLP_EVENT "s390-sclp-event-type"
-typedef struct SCLPEvent SCLPEvent;
+OBJECT_DECLARE_TYPE(SCLPEvent, SCLPEventClass,
-typedef struct SCLPEventClass SCLPEventClass;
+                    sclp_event, SCLP_EVENT)
-DECLARE_OBJ_CHECKERS(SCLPEvent, SCLPEventClass,
-                     SCLP_EVENT, TYPE_SCLP_EVENT)
 
 #define TYPE_SCLP_CPU_HOTPLUG "sclp-cpu-hotplug"
 #define TYPE_SCLP_QUIESCE "sclpquiesce"

include/hw/s390x/s390_flic.h

@@ -39,10 +39,8 @@ extern const VMStateDescription vmstate_adapter_routes;
     VMSTATE_STRUCT(_f, _s, 1, vmstate_adapter_routes, AdapterRoutes)
 
 #define TYPE_S390_FLIC_COMMON "s390-flic"
-typedef struct S390FLICState S390FLICState;
+OBJECT_DECLARE_TYPE(S390FLICState, S390FLICStateClass,
-typedef struct S390FLICStateClass S390FLICStateClass;
+                    s390_flic_common, S390_FLIC_COMMON)
-DECLARE_OBJ_CHECKERS(S390FLICState, S390FLICStateClass,
-                     S390_FLIC_COMMON, TYPE_S390_FLIC_COMMON)
 
 struct S390FLICState {
     SysBusDevice parent_obj;

include/hw/s390x/sclp.h

@@ -182,10 +182,8 @@ typedef struct SCCB {
  } QEMU_PACKED SCCB;
 
 #define TYPE_SCLP "sclp"
-typedef struct SCLPDevice SCLPDevice;
+OBJECT_DECLARE_TYPE(SCLPDevice, SCLPDeviceClass,
-typedef struct SCLPDeviceClass SCLPDeviceClass;
+                    sclp, SCLP)
-DECLARE_OBJ_CHECKERS(SCLPDevice, SCLPDeviceClass,
-                     SCLP, TYPE_SCLP)
 
 struct SCLPEventFacility;
 

include/hw/sd/sd.h

@@ -90,7 +90,6 @@ typedef struct {
 } SDRequest;
 
 typedef struct SDState SDState;
-typedef struct SDBus SDBus;
 
 #define TYPE_SD_CARD "sd-card"
 typedef struct SDCardClass SDCardClass;
@@ -130,9 +129,8 @@ struct SDCardClass {
 };
 
 #define TYPE_SD_BUS "sd-bus"
-typedef struct SDBusClass SDBusClass;
+OBJECT_DECLARE_TYPE(SDBus, SDBusClass,
-DECLARE_OBJ_CHECKERS(SDBus, SDBusClass,
+                    sd_bus, SD_BUS)
-                     SD_BUS, TYPE_SD_BUS)
 
 struct SDBus {
     BusState qbus;

include/hw/ssi/ssi.h

@@ -14,13 +14,11 @@
 #include "hw/qdev-core.h"
 #include "qom/object.h"
 
-typedef struct SSISlave SSISlave;
-typedef struct SSISlaveClass SSISlaveClass;
 typedef enum SSICSMode SSICSMode;
 
 #define TYPE_SSI_SLAVE "ssi-slave"
-DECLARE_OBJ_CHECKERS(SSISlave, SSISlaveClass,
+OBJECT_DECLARE_TYPE(SSISlave, SSISlaveClass,
-                     SSI_SLAVE, TYPE_SSI_SLAVE)
+                    ssi_slave, SSI_SLAVE)
 
 #define SSI_GPIO_CS "ssi-gpio-cs"
 

include/hw/sysbus.h

@@ -14,12 +14,10 @@
 DECLARE_INSTANCE_CHECKER(BusState, SYSTEM_BUS,
                          TYPE_SYSTEM_BUS)
 
-typedef struct SysBusDevice SysBusDevice;
 
 #define TYPE_SYS_BUS_DEVICE "sys-bus-device"
-typedef struct SysBusDeviceClass SysBusDeviceClass;
+OBJECT_DECLARE_TYPE(SysBusDevice, SysBusDeviceClass,
-DECLARE_OBJ_CHECKERS(SysBusDevice, SysBusDeviceClass,
+                    sys_bus_device, SYS_BUS_DEVICE)
-                     SYS_BUS_DEVICE, TYPE_SYS_BUS_DEVICE)
 
 /**
  * SysBusDeviceClass:

include/hw/virtio/virtio-gpu.h

@@ -25,10 +25,8 @@
 #include "qom/object.h"
 
 #define TYPE_VIRTIO_GPU_BASE "virtio-gpu-base"
-typedef struct VirtIOGPUBase VirtIOGPUBase;
+OBJECT_DECLARE_TYPE(VirtIOGPUBase, VirtIOGPUBaseClass,
-typedef struct VirtIOGPUBaseClass VirtIOGPUBaseClass;
+                    virtio_gpu_base, VIRTIO_GPU_BASE)
-DECLARE_OBJ_CHECKERS(VirtIOGPUBase, VirtIOGPUBaseClass,
-                     VIRTIO_GPU_BASE, TYPE_VIRTIO_GPU_BASE)
 
 #define TYPE_VIRTIO_GPU "virtio-gpu-device"
 typedef struct VirtIOGPU VirtIOGPU;

include/hw/virtio/virtio-input.h

@@ -19,10 +19,8 @@ typedef struct virtio_input_event virtio_input_event;
 /* qemu internals                                                    */
 
 #define TYPE_VIRTIO_INPUT "virtio-input-device"
-typedef struct VirtIOInput VirtIOInput;
+OBJECT_DECLARE_TYPE(VirtIOInput, VirtIOInputClass,
-typedef struct VirtIOInputClass VirtIOInputClass;
+                    virtio_input, VIRTIO_INPUT)
-DECLARE_OBJ_CHECKERS(VirtIOInput, VirtIOInputClass,
-                     VIRTIO_INPUT, TYPE_VIRTIO_INPUT)
 #define VIRTIO_INPUT_GET_PARENT_CLASS(obj) \
         OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_INPUT)
 

include/hw/virtio/virtio-mem.h

@@ -21,10 +21,8 @@
 
 #define TYPE_VIRTIO_MEM "virtio-mem"
 
-typedef struct VirtIOMEM VirtIOMEM;
+OBJECT_DECLARE_TYPE(VirtIOMEM, VirtIOMEMClass,
-typedef struct VirtIOMEMClass VirtIOMEMClass;
+                    virtio_mem, VIRTIO_MEM)
-DECLARE_OBJ_CHECKERS(VirtIOMEM, VirtIOMEMClass,
-                     VIRTIO_MEM, TYPE_VIRTIO_MEM)
 
 #define VIRTIO_MEM_MEMDEV_PROP "memdev"
 #define VIRTIO_MEM_NODE_PROP "node"

include/hw/virtio/virtio-pmem.h

@@ -20,10 +20,8 @@
 
 #define TYPE_VIRTIO_PMEM "virtio-pmem"
 
-typedef struct VirtIOPMEM VirtIOPMEM;
+OBJECT_DECLARE_TYPE(VirtIOPMEM, VirtIOPMEMClass,
-typedef struct VirtIOPMEMClass VirtIOPMEMClass;
+                    virtio_pmem, VIRTIO_PMEM)
-DECLARE_OBJ_CHECKERS(VirtIOPMEM, VirtIOPMEMClass,
-                     VIRTIO_PMEM, TYPE_VIRTIO_PMEM)
 
 #define VIRTIO_PMEM_ADDR_PROP "memaddr"
 #define VIRTIO_PMEM_MEMDEV_PROP "memdev"

include/hw/virtio/virtio-serial.h

@@ -26,10 +26,8 @@ struct virtio_serial_conf {
 };
 
 #define TYPE_VIRTIO_SERIAL_PORT "virtio-serial-port"
-typedef struct VirtIOSerialPort VirtIOSerialPort;
+OBJECT_DECLARE_TYPE(VirtIOSerialPort, VirtIOSerialPortClass,
-typedef struct VirtIOSerialPortClass VirtIOSerialPortClass;
+                    virtio_serial_port, VIRTIO_SERIAL_PORT)
-DECLARE_OBJ_CHECKERS(VirtIOSerialPort, VirtIOSerialPortClass,
-                     VIRTIO_SERIAL_PORT, TYPE_VIRTIO_SERIAL_PORT)
 
 typedef struct VirtIOSerial VirtIOSerial;
 

include/hw/xen/xen-bus.h

@@ -71,17 +71,15 @@ struct XenBus {
     XenWatch *backend_watch;
     QLIST_HEAD(, XenDevice) inactive_devices;
 };
-typedef struct XenBus XenBus;
 
 struct XenBusClass {
     /*< private >*/
     BusClass parent_class;
 };
-typedef struct XenBusClass XenBusClass;
 
 #define TYPE_XEN_BUS "xen-bus"
-DECLARE_OBJ_CHECKERS(XenBus, XenBusClass,
+OBJECT_DECLARE_TYPE(XenBus, XenBusClass,
-                     XEN_BUS, TYPE_XEN_BUS)
+                    xen_bus, XEN_BUS)
 
 void xen_bus_init(void);
 

include/io/channel.h

@@ -26,10 +26,8 @@
 #include "block/aio.h"
 
 #define TYPE_QIO_CHANNEL "qio-channel"
-typedef struct QIOChannel QIOChannel;
+OBJECT_DECLARE_TYPE(QIOChannel, QIOChannelClass,
-typedef struct QIOChannelClass QIOChannelClass;
+                    qio_channel, QIO_CHANNEL)
-DECLARE_OBJ_CHECKERS(QIOChannel, QIOChannelClass,
-                     QIO_CHANNEL, TYPE_QIO_CHANNEL)
 
 
 #define QIO_CHANNEL_ERR_BLOCK -2

include/io/dns-resolver.h

@@ -26,10 +26,8 @@
 #include "io/task.h"
 
 #define TYPE_QIO_DNS_RESOLVER "qio-dns-resolver"
-typedef struct QIODNSResolver QIODNSResolver;
+OBJECT_DECLARE_TYPE(QIODNSResolver, QIODNSResolverClass,
-typedef struct QIODNSResolverClass QIODNSResolverClass;
+                    qio_dns_resolver, QIO_DNS_RESOLVER)
-DECLARE_OBJ_CHECKERS(QIODNSResolver, QIODNSResolverClass,
-                     QIO_DNS_RESOLVER, TYPE_QIO_DNS_RESOLVER)
 
 
 /**

include/io/net-listener.h

@@ -25,10 +25,8 @@
 #include "qom/object.h"
 
 #define TYPE_QIO_NET_LISTENER "qio-net-listener"
-typedef struct QIONetListener QIONetListener;
+OBJECT_DECLARE_TYPE(QIONetListener, QIONetListenerClass,
-typedef struct QIONetListenerClass QIONetListenerClass;
+                    qio_net_listener, QIO_NET_LISTENER)
-DECLARE_OBJ_CHECKERS(QIONetListener, QIONetListenerClass,
-                     QIO_NET_LISTENER, TYPE_QIO_NET_LISTENER)
 
 
 typedef void (*QIONetListenerClientFunc)(QIONetListener *listener,

include/scsi/pr-manager.h

@@ -9,10 +9,8 @@
 
 #define TYPE_PR_MANAGER "pr-manager"
 
-typedef struct PRManager PRManager;
+OBJECT_DECLARE_TYPE(PRManager, PRManagerClass,
-typedef struct PRManagerClass PRManagerClass;
+                    pr_manager, PR_MANAGER)
-DECLARE_OBJ_CHECKERS(PRManager, PRManagerClass,
-                     PR_MANAGER, TYPE_PR_MANAGER)
 
 struct sg_io_hdr;
 

include/sysemu/cryptodev.h

@@ -37,10 +37,8 @@
 
 #define TYPE_CRYPTODEV_BACKEND "cryptodev-backend"
 
-typedef struct CryptoDevBackend CryptoDevBackend;
+OBJECT_DECLARE_TYPE(CryptoDevBackend, CryptoDevBackendClass,
-typedef struct CryptoDevBackendClass CryptoDevBackendClass;
+                    cryptodev_backend, CRYPTODEV_BACKEND)
-DECLARE_OBJ_CHECKERS(CryptoDevBackend, CryptoDevBackendClass,
-                     CRYPTODEV_BACKEND, TYPE_CRYPTODEV_BACKEND)
 
 
 #define MAX_CRYPTO_QUEUE_NUM  64

include/sysemu/hostmem.h

@@ -20,10 +20,8 @@
 #include "qemu/bitmap.h"
 
 #define TYPE_MEMORY_BACKEND "memory-backend"
-typedef struct HostMemoryBackend HostMemoryBackend;
+OBJECT_DECLARE_TYPE(HostMemoryBackend, HostMemoryBackendClass,
-typedef struct HostMemoryBackendClass HostMemoryBackendClass;
+                    memory_backend, MEMORY_BACKEND)
-DECLARE_OBJ_CHECKERS(HostMemoryBackend, HostMemoryBackendClass,
-                     MEMORY_BACKEND, TYPE_MEMORY_BACKEND)
 
 /* hostmem-ram.c */
 /**

include/sysemu/rng.h

@@ -17,10 +17,8 @@
 #include "qom/object.h"
 
 #define TYPE_RNG_BACKEND "rng-backend"
-typedef struct RngBackend RngBackend;
+OBJECT_DECLARE_TYPE(RngBackend, RngBackendClass,
-typedef struct RngBackendClass RngBackendClass;
+                    rng_backend, RNG_BACKEND)
-DECLARE_OBJ_CHECKERS(RngBackend, RngBackendClass,
-                     RNG_BACKEND, TYPE_RNG_BACKEND)
 
 #define TYPE_RNG_BUILTIN "rng-builtin"
 

include/sysemu/tpm_backend.h

@@ -19,10 +19,8 @@
 #include "qapi/error.h"
 
 #define TYPE_TPM_BACKEND "tpm-backend"
-typedef struct TPMBackend TPMBackend;
+OBJECT_DECLARE_TYPE(TPMBackend, TPMBackendClass,
-typedef struct TPMBackendClass TPMBackendClass;
+                    tpm_backend, TPM_BACKEND)
-DECLARE_OBJ_CHECKERS(TPMBackend, TPMBackendClass,
-                     TPM_BACKEND, TYPE_TPM_BACKEND)
 
 
 typedef struct TPMBackendCmd {

include/sysemu/vhost-user-backend.h

@@ -22,10 +22,8 @@
 #include "io/channel.h"
 
 #define TYPE_VHOST_USER_BACKEND "vhost-user-backend"
-typedef struct VhostUserBackend VhostUserBackend;
+OBJECT_DECLARE_TYPE(VhostUserBackend, VhostUserBackendClass,
-typedef struct VhostUserBackendClass VhostUserBackendClass;
+                    vhost_user_backend, VHOST_USER_BACKEND)
-DECLARE_OBJ_CHECKERS(VhostUserBackend, VhostUserBackendClass,
-                     VHOST_USER_BACKEND, TYPE_VHOST_USER_BACKEND)
 
 
 struct VhostUserBackendClass {

target/alpha/cpu-qom.h

@@ -25,10 +25,8 @@
 
 #define TYPE_ALPHA_CPU "alpha-cpu"
 
-typedef struct AlphaCPU AlphaCPU;
+OBJECT_DECLARE_TYPE(AlphaCPU, AlphaCPUClass,
-typedef struct AlphaCPUClass AlphaCPUClass;
+                    alpha_cpu, ALPHA_CPU)
-DECLARE_OBJ_CHECKERS(AlphaCPU, AlphaCPUClass,
-                     ALPHA_CPU, TYPE_ALPHA_CPU)
 
 /**
  * AlphaCPUClass:

target/arm/cpu-qom.h

@@ -27,10 +27,8 @@ struct arm_boot_info;
 
 #define TYPE_ARM_CPU "arm-cpu"
 
-typedef struct ARMCPU ARMCPU;
+OBJECT_DECLARE_TYPE(ARMCPU, ARMCPUClass,
-typedef struct ARMCPUClass ARMCPUClass;
+                    arm_cpu, ARM_CPU)
-DECLARE_OBJ_CHECKERS(ARMCPU, ARMCPUClass,
-                     ARM_CPU, TYPE_ARM_CPU)
 
 #define TYPE_ARM_MAX_CPU "max-" TYPE_ARM_CPU
 

target/avr/cpu-qom.h

@@ -26,10 +26,8 @@
 
 #define TYPE_AVR_CPU "avr-cpu"
 
-typedef struct AVRCPU AVRCPU;
+OBJECT_DECLARE_TYPE(AVRCPU, AVRCPUClass,
-typedef struct AVRCPUClass AVRCPUClass;
+                    avr_cpu, AVR_CPU)
-DECLARE_OBJ_CHECKERS(AVRCPU, AVRCPUClass,
-                     AVR_CPU, TYPE_AVR_CPU)
 
 /**
  *  AVRCPUClass:

target/cris/cpu-qom.h

@@ -25,10 +25,8 @@
 
 #define TYPE_CRIS_CPU "cris-cpu"
 
-typedef struct CRISCPU CRISCPU;
+OBJECT_DECLARE_TYPE(CRISCPU, CRISCPUClass,
-typedef struct CRISCPUClass CRISCPUClass;
+                    cris_cpu, CRIS_CPU)
-DECLARE_OBJ_CHECKERS(CRISCPU, CRISCPUClass,
-                     CRIS_CPU, TYPE_CRIS_CPU)
 
 /**
  * CRISCPUClass:

target/hppa/cpu-qom.h

@@ -25,10 +25,8 @@
 
 #define TYPE_HPPA_CPU "hppa-cpu"
 
-typedef struct HPPACPU HPPACPU;
+OBJECT_DECLARE_TYPE(HPPACPU, HPPACPUClass,
-typedef struct HPPACPUClass HPPACPUClass;
+                    hppa_cpu, HPPA_CPU)
-DECLARE_OBJ_CHECKERS(HPPACPU, HPPACPUClass,
-                     HPPA_CPU, TYPE_HPPA_CPU)
 
 /**
  * HPPACPUClass:

target/i386/cpu-qom.h

@@ -30,10 +30,8 @@
 #define TYPE_X86_CPU "i386-cpu"
 #endif
 
-typedef struct X86CPU X86CPU;
+OBJECT_DECLARE_TYPE(X86CPU, X86CPUClass,
-typedef struct X86CPUClass X86CPUClass;
+                    x86_cpu, X86_CPU)
-DECLARE_OBJ_CHECKERS(X86CPU, X86CPUClass,
-                     X86_CPU, TYPE_X86_CPU)
 
 typedef struct X86CPUModel X86CPUModel;
 

target/lm32/cpu-qom.h

@@ -25,10 +25,8 @@
 
 #define TYPE_LM32_CPU "lm32-cpu"
 
-typedef struct LM32CPU LM32CPU;
+OBJECT_DECLARE_TYPE(LM32CPU, LM32CPUClass,
-typedef struct LM32CPUClass LM32CPUClass;
+                    lm32_cpu, LM32_CPU)
-DECLARE_OBJ_CHECKERS(LM32CPU, LM32CPUClass,
-                     LM32_CPU, TYPE_LM32_CPU)
 
 /**
  * LM32CPUClass:

target/m68k/cpu-qom.h

@@ -25,10 +25,8 @@
 
 #define TYPE_M68K_CPU "m68k-cpu"
 
-typedef struct M68kCPU M68kCPU;
+OBJECT_DECLARE_TYPE(M68kCPU, M68kCPUClass,
-typedef struct M68kCPUClass M68kCPUClass;
+                    m68k_cpu, M68K_CPU)
-DECLARE_OBJ_CHECKERS(M68kCPU, M68kCPUClass,
-                     M68K_CPU, TYPE_M68K_CPU)
 
 /*
  * M68kCPUClass:

target/microblaze/cpu-qom.h

@@ -25,10 +25,8 @@
 
 #define TYPE_MICROBLAZE_CPU "microblaze-cpu"
 
-typedef struct MicroBlazeCPU MicroBlazeCPU;
+OBJECT_DECLARE_TYPE(MicroBlazeCPU, MicroBlazeCPUClass,
-typedef struct MicroBlazeCPUClass MicroBlazeCPUClass;
+                    microblaze_cpu, MICROBLAZE_CPU)
-DECLARE_OBJ_CHECKERS(MicroBlazeCPU, MicroBlazeCPUClass,
-                     MICROBLAZE_CPU, TYPE_MICROBLAZE_CPU)
 
 /**
  * MicroBlazeCPUClass:

target/mips/cpu-qom.h

@@ -29,10 +29,8 @@
 #define TYPE_MIPS_CPU "mips-cpu"
 #endif
 
-typedef struct MIPSCPU MIPSCPU;
+OBJECT_DECLARE_TYPE(MIPSCPU, MIPSCPUClass,
-typedef struct MIPSCPUClass MIPSCPUClass;
+                    mips_cpu, MIPS_CPU)
-DECLARE_OBJ_CHECKERS(MIPSCPU, MIPSCPUClass,
-                     MIPS_CPU, TYPE_MIPS_CPU)
 
 /**
  * MIPSCPUClass:

target/moxie/cpu.h

@@ -51,10 +51,8 @@ typedef struct CPUMoxieState {
 
 #define TYPE_MOXIE_CPU "moxie-cpu"
 
-typedef struct MoxieCPU MoxieCPU;
+OBJECT_DECLARE_TYPE(MoxieCPU, MoxieCPUClass,
-typedef struct MoxieCPUClass MoxieCPUClass;
+                    moxie_cpu, MOXIE_CPU)
-DECLARE_OBJ_CHECKERS(MoxieCPU, MoxieCPUClass,
-                     MOXIE_CPU, TYPE_MOXIE_CPU)
 
 /**
  * MoxieCPUClass:

target/nios2/cpu.h

@@ -32,10 +32,8 @@ typedef struct CPUNios2State CPUNios2State;
 
 #define TYPE_NIOS2_CPU "nios2-cpu"
 
-typedef struct Nios2CPU Nios2CPU;
+OBJECT_DECLARE_TYPE(Nios2CPU, Nios2CPUClass,
-typedef struct Nios2CPUClass Nios2CPUClass;
+                    nios2_cpu, NIOS2_CPU)
-DECLARE_OBJ_CHECKERS(Nios2CPU, Nios2CPUClass,
-                     NIOS2_CPU, TYPE_NIOS2_CPU)
 
 /**
  * Nios2CPUClass:

target/openrisc/cpu.h

@@ -29,10 +29,8 @@ struct OpenRISCCPU;
 
 #define TYPE_OPENRISC_CPU "or1k-cpu"
 
-typedef struct OpenRISCCPU OpenRISCCPU;
+OBJECT_DECLARE_TYPE(OpenRISCCPU, OpenRISCCPUClass,
-typedef struct OpenRISCCPUClass OpenRISCCPUClass;
+                    openrisc_cpu, OPENRISC_CPU)
-DECLARE_OBJ_CHECKERS(OpenRISCCPU, OpenRISCCPUClass,
-                     OPENRISC_CPU, TYPE_OPENRISC_CPU)
 
 /**
  * OpenRISCCPUClass:

target/ppc/cpu-qom.h

@@ -29,10 +29,8 @@
 #define TYPE_POWERPC_CPU "powerpc-cpu"
 #endif
 
-typedef struct PowerPCCPU PowerPCCPU;
+OBJECT_DECLARE_TYPE(PowerPCCPU, PowerPCCPUClass,
-typedef struct PowerPCCPUClass PowerPCCPUClass;
+                    powerpc_cpu, POWERPC_CPU)
-DECLARE_OBJ_CHECKERS(PowerPCCPU, PowerPCCPUClass,
-                     POWERPC_CPU, TYPE_POWERPC_CPU)
 
 typedef struct CPUPPCState CPUPPCState;
 typedef struct ppc_tb_t ppc_tb_t;

target/riscv/cpu.h

@@ -232,10 +232,8 @@ struct CPURISCVState {
     QEMUTimer *timer; /* Internal timer */
 };
 
-typedef struct RISCVCPU RISCVCPU;
+OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass,
-typedef struct RISCVCPUClass RISCVCPUClass;
+                    riscv_cpu, RISCV_CPU)
-DECLARE_OBJ_CHECKERS(RISCVCPU, RISCVCPUClass,
-                     RISCV_CPU, TYPE_RISCV_CPU)
 
 /**
  * RISCVCPUClass:

target/rx/cpu-qom.h

@@ -26,10 +26,8 @@
 
 #define TYPE_RX62N_CPU RX_CPU_TYPE_NAME("rx62n")
 
-typedef struct RXCPU RXCPU;
+OBJECT_DECLARE_TYPE(RXCPU, RXCPUClass,
-typedef struct RXCPUClass RXCPUClass;
+                    rx_cpu, RX_CPU)
-DECLARE_OBJ_CHECKERS(RXCPU, RXCPUClass,
-                     RX_CPU, TYPE_RX_CPU)
 
 /*
  * RXCPUClass:

target/s390x/cpu-qom.h

@@ -25,10 +25,8 @@
 
 #define TYPE_S390_CPU "s390x-cpu"
 
-typedef struct S390CPU S390CPU;
+OBJECT_DECLARE_TYPE(S390CPU, S390CPUClass,
-typedef struct S390CPUClass S390CPUClass;
+                    s390_cpu, S390_CPU)
-DECLARE_OBJ_CHECKERS(S390CPU, S390CPUClass,
-                     S390_CPU, TYPE_S390_CPU)
 
 typedef struct S390CPUModel S390CPUModel;
 typedef struct S390CPUDef S390CPUDef;

target/sh4/cpu-qom.h

@@ -29,10 +29,8 @@
 #define TYPE_SH7751R_CPU SUPERH_CPU_TYPE_NAME("sh7751r")
 #define TYPE_SH7785_CPU  SUPERH_CPU_TYPE_NAME("sh7785")
 
-typedef struct SuperHCPU SuperHCPU;
+OBJECT_DECLARE_TYPE(SuperHCPU, SuperHCPUClass,
-typedef struct SuperHCPUClass SuperHCPUClass;
+                    superh_cpu, SUPERH_CPU)
-DECLARE_OBJ_CHECKERS(SuperHCPU, SuperHCPUClass,
-                     SUPERH_CPU, TYPE_SUPERH_CPU)
 
 /**
  * SuperHCPUClass:

target/sparc/cpu-qom.h

@@ -29,10 +29,8 @@
 #define TYPE_SPARC_CPU "sparc-cpu"
 #endif
 
-typedef struct SPARCCPU SPARCCPU;
+OBJECT_DECLARE_TYPE(SPARCCPU, SPARCCPUClass,
-typedef struct SPARCCPUClass SPARCCPUClass;
+                    sparc_cpu, SPARC_CPU)
-DECLARE_OBJ_CHECKERS(SPARCCPU, SPARCCPUClass,
-                     SPARC_CPU, TYPE_SPARC_CPU)
 
 typedef struct sparc_def_t sparc_def_t;
 /**

target/tilegx/cpu.h

@@ -99,10 +99,8 @@ typedef struct CPUTLGState {
 
 #define TYPE_TILEGX_CPU "tilegx-cpu"
 
-typedef struct TileGXCPU TileGXCPU;
+OBJECT_DECLARE_TYPE(TileGXCPU, TileGXCPUClass,
-typedef struct TileGXCPUClass TileGXCPUClass;
+                    tilegx_cpu, TILEGX_CPU)
-DECLARE_OBJ_CHECKERS(TileGXCPU, TileGXCPUClass,
-                     TILEGX_CPU, TYPE_TILEGX_CPU)
 
 /**
  * TileGXCPUClass:

target/tricore/cpu-qom.h

@@ -24,10 +24,8 @@
 
 #define TYPE_TRICORE_CPU "tricore-cpu"
 
-typedef struct TriCoreCPU TriCoreCPU;
+OBJECT_DECLARE_TYPE(TriCoreCPU, TriCoreCPUClass,
-typedef struct TriCoreCPUClass TriCoreCPUClass;
+                    tricore_cpu, TRICORE_CPU)
-DECLARE_OBJ_CHECKERS(TriCoreCPU, TriCoreCPUClass,
-                     TRICORE_CPU, TYPE_TRICORE_CPU)
 
 struct TriCoreCPUClass {
     /*< private >*/

target/unicore32/cpu-qom.h

@@ -16,10 +16,8 @@
 
 #define TYPE_UNICORE32_CPU "unicore32-cpu"
 
-typedef struct UniCore32CPU UniCore32CPU;
+OBJECT_DECLARE_TYPE(UniCore32CPU, UniCore32CPUClass,
-typedef struct UniCore32CPUClass UniCore32CPUClass;
+                    unicore32_cpu, UNICORE32_CPU)
-DECLARE_OBJ_CHECKERS(UniCore32CPU, UniCore32CPUClass,
-                     UNICORE32_CPU, TYPE_UNICORE32_CPU)
 
 /**
  * UniCore32CPUClass:

target/xtensa/cpu-qom.h

@@ -34,10 +34,8 @@
 
 #define TYPE_XTENSA_CPU "xtensa-cpu"
 
-typedef struct XtensaCPU XtensaCPU;
+OBJECT_DECLARE_TYPE(XtensaCPU, XtensaCPUClass,
-typedef struct XtensaCPUClass XtensaCPUClass;
+                    xtensa_cpu, XTENSA_CPU)
-DECLARE_OBJ_CHECKERS(XtensaCPU, XtensaCPUClass,
-                     XTENSA_CPU, TYPE_XTENSA_CPU)
 
 typedef struct XtensaConfig XtensaConfig;
 

ui/input-barrier.c

@@ -20,10 +20,8 @@
 #include "input-barrier.h"
 
 #define TYPE_INPUT_BARRIER "input-barrier"
-typedef struct InputBarrier InputBarrier;
+OBJECT_DECLARE_TYPE(InputBarrier, InputBarrierClass,
-typedef struct InputBarrierClass InputBarrierClass;
+                    input_barrier, INPUT_BARRIER)
-DECLARE_OBJ_CHECKERS(InputBarrier, InputBarrierClass,
-                     INPUT_BARRIER, TYPE_INPUT_BARRIER)
 
 
 #define MAX_HELLO_LENGTH 1024

ui/input-linux.c

@@ -31,10 +31,8 @@ static bool linux_is_button(unsigned int lnx)
 }
 
 #define TYPE_INPUT_LINUX "input-linux"
-typedef struct InputLinux InputLinux;
+OBJECT_DECLARE_TYPE(InputLinux, InputLinuxClass,
-typedef struct InputLinuxClass InputLinuxClass;
+                    input_linux, INPUT_LINUX)
-DECLARE_OBJ_CHECKERS(InputLinux, InputLinuxClass,
-                     INPUT_LINUX, TYPE_INPUT_LINUX)
 
 
 struct InputLinux {