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)