mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-23 19:03:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

qom: Remove module_obj_name parameter from OBJECT_DECLARE* macros

Browse Source 
One of the goals of having less boilerplate on QOM declarations
is to avoid human error.  Requiring an extra argument that is
never used is an opportunity for mistakes.

Remove the unused argument from OBJECT_DECLARE_TYPE and
OBJECT_DECLARE_SIMPLE_TYPE.

Coccinelle patch used to convert all users of the macros:

  @@
  declarer name OBJECT_DECLARE_TYPE;
  identifier InstanceType, ClassType, lowercase, UPPERCASE;
  @@
   OBJECT_DECLARE_TYPE(InstanceType, ClassType,
  -                    lowercase,
                       UPPERCASE);

  @@
  declarer name OBJECT_DECLARE_SIMPLE_TYPE;
  identifier InstanceType, lowercase, UPPERCASE;
  @@
   OBJECT_DECLARE_SIMPLE_TYPE(InstanceType,
  -                    lowercase,
                       UPPERCASE);

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Paul Durrant <paul@xen.org>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200916182519.415636-4-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2020-09-16 14:25:17 -04:00
parent c734cd40a1
commit 30b5707c26
74 changed files with 75 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/dbus-vmstate.c
View File

@ -23,7 +23,7 @@
#define TYPE_DBUS_VMSTATE "dbus-vmstate" #define TYPE_DBUS_VMSTATE "dbus-vmstate"
OBJECT_DECLARE_SIMPLE_TYPE(DBusVMState, dbus_vmstate, OBJECT_DECLARE_SIMPLE_TYPE(DBusVMState,
DBUS_VMSTATE) DBUS_VMSTATE)

2
hw/audio/intel-hda.h
View File

@ -9,7 +9,7 @@
#define TYPE_HDA_CODEC_DEVICE "hda-codec" #define TYPE_HDA_CODEC_DEVICE "hda-codec"
OBJECT_DECLARE_TYPE(HDACodecDevice, HDACodecDeviceClass, OBJECT_DECLARE_TYPE(HDACodecDevice, HDACodecDeviceClass,
hda_codec_device, HDA_CODEC_DEVICE) HDA_CODEC_DEVICE)
#define TYPE_HDA_BUS "HDA" #define TYPE_HDA_BUS "HDA"
typedef struct HDACodecBus HDACodecBus; typedef struct HDACodecBus HDACodecBus;

2
hw/display/virtio-vga.h
View File

@ -10,7 +10,7 @@
*/ */
#define TYPE_VIRTIO_VGA_BASE "virtio-vga-base" #define TYPE_VIRTIO_VGA_BASE "virtio-vga-base"
OBJECT_DECLARE_TYPE(VirtIOVGABase, VirtIOVGABaseClass, OBJECT_DECLARE_TYPE(VirtIOVGABase, VirtIOVGABaseClass,
virtio_vga_base, VIRTIO_VGA_BASE) VIRTIO_VGA_BASE)
struct VirtIOVGABase { struct VirtIOVGABase {
VirtIOPCIProxy parent_obj; VirtIOPCIProxy parent_obj;

2
include/authz/base.h
View File

@ -28,7 +28,7 @@
#define TYPE_QAUTHZ "authz" #define TYPE_QAUTHZ "authz"
OBJECT_DECLARE_TYPE(QAuthZ, QAuthZClass, OBJECT_DECLARE_TYPE(QAuthZ, QAuthZClass,
qauthz, QAUTHZ) QAUTHZ)
/** /**

2
include/authz/list.h
View File

@ -27,7 +27,7 @@
#define TYPE_QAUTHZ_LIST "authz-list" #define TYPE_QAUTHZ_LIST "authz-list"
OBJECT_DECLARE_SIMPLE_TYPE(QAuthZList, qauthz_list, OBJECT_DECLARE_SIMPLE_TYPE(QAuthZList,
QAUTHZ_LIST) QAUTHZ_LIST)

2
include/authz/listfile.h
View File

@ -27,7 +27,7 @@
#define TYPE_QAUTHZ_LIST_FILE "authz-list-file" #define TYPE_QAUTHZ_LIST_FILE "authz-list-file"
OBJECT_DECLARE_SIMPLE_TYPE(QAuthZListFile, qauthz_list_file, OBJECT_DECLARE_SIMPLE_TYPE(QAuthZListFile,
QAUTHZ_LIST_FILE) QAUTHZ_LIST_FILE)

2
include/authz/pamacct.h
View File

@ -27,7 +27,7 @@
#define TYPE_QAUTHZ_PAM "authz-pam" #define TYPE_QAUTHZ_PAM "authz-pam"
OBJECT_DECLARE_SIMPLE_TYPE(QAuthZPAM, qauthz_pam, OBJECT_DECLARE_SIMPLE_TYPE(QAuthZPAM,
QAUTHZ_PAM) QAUTHZ_PAM)

2
include/authz/simple.h
View File

@ -26,7 +26,7 @@
#define TYPE_QAUTHZ_SIMPLE "authz-simple" #define TYPE_QAUTHZ_SIMPLE "authz-simple"
OBJECT_DECLARE_SIMPLE_TYPE(QAuthZSimple, qauthz_simple, OBJECT_DECLARE_SIMPLE_TYPE(QAuthZSimple,
QAUTHZ_SIMPLE) QAUTHZ_SIMPLE)

2
include/crypto/secret_common.h
View File

@ -26,7 +26,7 @@
#define TYPE_QCRYPTO_SECRET_COMMON "secret_common" #define TYPE_QCRYPTO_SECRET_COMMON "secret_common"
OBJECT_DECLARE_TYPE(QCryptoSecretCommon, QCryptoSecretCommonClass, OBJECT_DECLARE_TYPE(QCryptoSecretCommon, QCryptoSecretCommonClass,
qcrypto_secret_common, QCRYPTO_SECRET_COMMON) QCRYPTO_SECRET_COMMON)
struct QCryptoSecretCommon { struct QCryptoSecretCommon {

2
include/crypto/secret_keyring.h
View File

@ -26,7 +26,7 @@
#include "crypto/secret_common.h" #include "crypto/secret_common.h"
#define TYPE_QCRYPTO_SECRET_KEYRING "secret_keyring" #define TYPE_QCRYPTO_SECRET_KEYRING "secret_keyring"
OBJECT_DECLARE_SIMPLE_TYPE(QCryptoSecretKeyring, qcrypto_secret_keyring, OBJECT_DECLARE_SIMPLE_TYPE(QCryptoSecretKeyring,
QCRYPTO_SECRET_KEYRING) QCRYPTO_SECRET_KEYRING)

2
include/hw/arm/armsse.h
View File

@ -109,7 +109,7 @@
#define TYPE_ARM_SSE "arm-sse" #define TYPE_ARM_SSE "arm-sse"
OBJECT_DECLARE_TYPE(ARMSSE, ARMSSEClass, OBJECT_DECLARE_TYPE(ARMSSE, ARMSSEClass,
arm_sse, ARM_SSE) ARM_SSE)
/* /*
* These type names are for specific IoTKit subsystems; other than * These type names are for specific IoTKit subsystems; other than

2
include/hw/hyperv/vmbus.h
View File

@ -21,7 +21,7 @@
#define TYPE_VMBUS_DEVICE "vmbus-dev" #define TYPE_VMBUS_DEVICE "vmbus-dev"
OBJECT_DECLARE_TYPE(VMBusDevice, VMBusDeviceClass, OBJECT_DECLARE_TYPE(VMBusDevice, VMBusDeviceClass,
vmbus_device, VMBUS_DEVICE) VMBUS_DEVICE)
#define TYPE_VMBUS "vmbus" #define TYPE_VMBUS "vmbus"
typedef struct VMBus VMBus; typedef struct VMBus VMBus;

2
include/hw/i2c/i2c.h
View File

@ -19,7 +19,7 @@ enum i2c_event {
#define TYPE_I2C_SLAVE "i2c-slave" #define TYPE_I2C_SLAVE "i2c-slave"
OBJECT_DECLARE_TYPE(I2CSlave, I2CSlaveClass, OBJECT_DECLARE_TYPE(I2CSlave, I2CSlaveClass,
i2c_slave, I2C_SLAVE) I2C_SLAVE)
struct I2CSlaveClass { struct I2CSlaveClass {
DeviceClass parent_class; DeviceClass parent_class;

2
include/hw/i2c/smbus_slave.h
View File

@ -30,7 +30,7 @@
#define TYPE_SMBUS_DEVICE "smbus-device" #define TYPE_SMBUS_DEVICE "smbus-device"
OBJECT_DECLARE_TYPE(SMBusDevice, SMBusDeviceClass, OBJECT_DECLARE_TYPE(SMBusDevice, SMBusDeviceClass,
smbus_device, SMBUS_DEVICE) SMBUS_DEVICE)
struct SMBusDeviceClass { struct SMBusDeviceClass {

2
include/hw/ipack/ipack.h
View File

@ -33,7 +33,7 @@ struct IPackBus {
#define TYPE_IPACK_DEVICE "ipack-device" #define TYPE_IPACK_DEVICE "ipack-device"
OBJECT_DECLARE_TYPE(IPackDevice, IPackDeviceClass, OBJECT_DECLARE_TYPE(IPackDevice, IPackDeviceClass,
ipack_device, IPACK_DEVICE) IPACK_DEVICE)
struct IPackDeviceClass { struct IPackDeviceClass {
/*< private >*/ /*< private >*/

2
include/hw/ipmi/ipmi.h
View File

@ -177,7 +177,7 @@ struct IPMIInterfaceClass {
*/ */
#define TYPE_IPMI_BMC "ipmi-bmc" #define TYPE_IPMI_BMC "ipmi-bmc"
OBJECT_DECLARE_TYPE(IPMIBmc, IPMIBmcClass, OBJECT_DECLARE_TYPE(IPMIBmc, IPMIBmcClass,
ipmi_bmc, IPMI_BMC) IPMI_BMC)
struct IPMIBmc { struct IPMIBmc {
DeviceState parent; DeviceState parent;

2
include/hw/mem/pc-dimm.h
View File

@ -22,7 +22,7 @@
#define TYPE_PC_DIMM "pc-dimm" #define TYPE_PC_DIMM "pc-dimm"
OBJECT_DECLARE_TYPE(PCDIMMDevice, PCDIMMDeviceClass, OBJECT_DECLARE_TYPE(PCDIMMDevice, PCDIMMDeviceClass,
pc_dimm, PC_DIMM) PC_DIMM)
#define PC_DIMM_ADDR_PROP "addr" #define PC_DIMM_ADDR_PROP "addr"
#define PC_DIMM_SLOT_PROP "slot" #define PC_DIMM_SLOT_PROP "slot"

2
include/hw/ppc/pnv.h
View File

@ -36,7 +36,7 @@
#define TYPE_PNV_CHIP "pnv-chip" #define TYPE_PNV_CHIP "pnv-chip"
OBJECT_DECLARE_TYPE(PnvChip, PnvChipClass, OBJECT_DECLARE_TYPE(PnvChip, PnvChipClass,
pnv_chip, PNV_CHIP) PNV_CHIP)
struct PnvChip { struct PnvChip {
/*< private >*/ /*< private >*/

2
include/hw/ppc/pnv_core.h
View File

@ -26,7 +26,7 @@
#define TYPE_PNV_CORE "powernv-cpu-core" #define TYPE_PNV_CORE "powernv-cpu-core"
OBJECT_DECLARE_TYPE(PnvCore, PnvCoreClass, OBJECT_DECLARE_TYPE(PnvCore, PnvCoreClass,
pnv_core, PNV_CORE) PNV_CORE)
typedef struct PnvChip PnvChip; typedef struct PnvChip PnvChip;

2
include/hw/ppc/pnv_homer.h
View File

@ -25,7 +25,7 @@
#define TYPE_PNV_HOMER "pnv-homer" #define TYPE_PNV_HOMER "pnv-homer"
OBJECT_DECLARE_TYPE(PnvHomer, PnvHomerClass, OBJECT_DECLARE_TYPE(PnvHomer, PnvHomerClass,
pnv_homer, PNV_HOMER) PNV_HOMER)
#define TYPE_PNV8_HOMER TYPE_PNV_HOMER "-POWER8" #define TYPE_PNV8_HOMER TYPE_PNV_HOMER "-POWER8"
DECLARE_INSTANCE_CHECKER(PnvHomer, PNV8_HOMER, DECLARE_INSTANCE_CHECKER(PnvHomer, PNV8_HOMER,
TYPE_PNV8_HOMER) TYPE_PNV8_HOMER)

2
include/hw/ppc/pnv_occ.h
View File

@ -25,7 +25,7 @@
#define TYPE_PNV_OCC "pnv-occ" #define TYPE_PNV_OCC "pnv-occ"
OBJECT_DECLARE_TYPE(PnvOCC, PnvOCCClass, OBJECT_DECLARE_TYPE(PnvOCC, PnvOCCClass,
pnv_occ, PNV_OCC) PNV_OCC)
#define TYPE_PNV8_OCC TYPE_PNV_OCC "-POWER8" #define TYPE_PNV8_OCC TYPE_PNV_OCC "-POWER8"
DECLARE_INSTANCE_CHECKER(PnvOCC, PNV8_OCC, DECLARE_INSTANCE_CHECKER(PnvOCC, PNV8_OCC,
TYPE_PNV8_OCC) TYPE_PNV8_OCC)

2
include/hw/ppc/pnv_psi.h
View File

@ -27,7 +27,7 @@
#define TYPE_PNV_PSI "pnv-psi" #define TYPE_PNV_PSI "pnv-psi"
OBJECT_DECLARE_TYPE(PnvPsi, PnvPsiClass, OBJECT_DECLARE_TYPE(PnvPsi, PnvPsiClass,
pnv_psi, PNV_PSI) PNV_PSI)
#define PSIHB_XSCOM_MAX 0x20 #define PSIHB_XSCOM_MAX 0x20

2
include/hw/ppc/pnv_xive.h
View File

@ -17,7 +17,7 @@ struct PnvChip;
#define TYPE_PNV_XIVE "pnv-xive" #define TYPE_PNV_XIVE "pnv-xive"
OBJECT_DECLARE_TYPE(PnvXive, PnvXiveClass, OBJECT_DECLARE_TYPE(PnvXive, PnvXiveClass,
pnv_xive, PNV_XIVE) PNV_XIVE)
#define XIVE_BLOCK_MAX 16 #define XIVE_BLOCK_MAX 16

2
include/hw/ppc/spapr_cpu_core.h
View File

@ -17,7 +17,7 @@
#define TYPE_SPAPR_CPU_CORE "spapr-cpu-core" #define TYPE_SPAPR_CPU_CORE "spapr-cpu-core"
OBJECT_DECLARE_TYPE(SpaprCpuCore, SpaprCpuCoreClass, OBJECT_DECLARE_TYPE(SpaprCpuCore, SpaprCpuCoreClass,
spapr_cpu_core, SPAPR_CPU_CORE) SPAPR_CPU_CORE)
#define SPAPR_CPU_CORE_TYPE_NAME(model) model "-" TYPE_SPAPR_CPU_CORE #define SPAPR_CPU_CORE_TYPE_NAME(model) model "-" TYPE_SPAPR_CPU_CORE

2
include/hw/ppc/spapr_vio.h
View File

@ -29,7 +29,7 @@
#define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device" #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device"
OBJECT_DECLARE_TYPE(SpaprVioDevice, SpaprVioDeviceClass, OBJECT_DECLARE_TYPE(SpaprVioDevice, SpaprVioDeviceClass,
vio_spapr_device, VIO_SPAPR_DEVICE) VIO_SPAPR_DEVICE)
#define TYPE_SPAPR_VIO_BUS "spapr-vio-bus" #define TYPE_SPAPR_VIO_BUS "spapr-vio-bus"
typedef struct SpaprVioBus SpaprVioBus; typedef struct SpaprVioBus SpaprVioBus;

2
include/hw/ppc/xics.h
View File

@ -49,7 +49,7 @@ typedef struct XICSFabric XICSFabric;
#define TYPE_ICP "icp" #define TYPE_ICP "icp"
OBJECT_DECLARE_TYPE(ICPState, ICPStateClass, OBJECT_DECLARE_TYPE(ICPState, ICPStateClass,
icp, ICP) ICP)
#define TYPE_PNV_ICP "pnv-icp" #define TYPE_PNV_ICP "pnv-icp"
DECLARE_INSTANCE_CHECKER(PnvICPState, PNV_ICP, DECLARE_INSTANCE_CHECKER(PnvICPState, PNV_ICP,

2
include/hw/ppc/xive.h
View File

@ -348,7 +348,7 @@ struct XiveRouter {
#define TYPE_XIVE_ROUTER "xive-router" #define TYPE_XIVE_ROUTER "xive-router"
OBJECT_DECLARE_TYPE(XiveRouter, XiveRouterClass, OBJECT_DECLARE_TYPE(XiveRouter, XiveRouterClass,
xive_router, XIVE_ROUTER) XIVE_ROUTER)
struct XiveRouterClass { struct XiveRouterClass {
SysBusDeviceClass parent; SysBusDeviceClass parent;

2
include/hw/s390x/event-facility.h
View File

@ -43,7 +43,7 @@
#define TYPE_SCLP_EVENT "s390-sclp-event-type" #define TYPE_SCLP_EVENT "s390-sclp-event-type"
OBJECT_DECLARE_TYPE(SCLPEvent, SCLPEventClass, OBJECT_DECLARE_TYPE(SCLPEvent, SCLPEventClass,
sclp_event, SCLP_EVENT) SCLP_EVENT)
#define TYPE_SCLP_CPU_HOTPLUG "sclp-cpu-hotplug" #define TYPE_SCLP_CPU_HOTPLUG "sclp-cpu-hotplug"
#define TYPE_SCLP_QUIESCE "sclpquiesce" #define TYPE_SCLP_QUIESCE "sclpquiesce"

2
include/hw/s390x/s390_flic.h
View File

@ -40,7 +40,7 @@ extern const VMStateDescription vmstate_adapter_routes;
#define TYPE_S390_FLIC_COMMON "s390-flic" #define TYPE_S390_FLIC_COMMON "s390-flic"
OBJECT_DECLARE_TYPE(S390FLICState, S390FLICStateClass, OBJECT_DECLARE_TYPE(S390FLICState, S390FLICStateClass,
s390_flic_common, S390_FLIC_COMMON) S390_FLIC_COMMON)
struct S390FLICState { struct S390FLICState {
SysBusDevice parent_obj; SysBusDevice parent_obj;

2
include/hw/s390x/sclp.h
View File

@ -183,7 +183,7 @@ typedef struct SCCB {
#define TYPE_SCLP "sclp" #define TYPE_SCLP "sclp"
OBJECT_DECLARE_TYPE(SCLPDevice, SCLPDeviceClass, OBJECT_DECLARE_TYPE(SCLPDevice, SCLPDeviceClass,
sclp, SCLP) SCLP)
struct SCLPEventFacility; struct SCLPEventFacility;

2
include/hw/sd/sd.h
View File

@ -130,7 +130,7 @@ struct SDCardClass {
#define TYPE_SD_BUS "sd-bus" #define TYPE_SD_BUS "sd-bus"
OBJECT_DECLARE_TYPE(SDBus, SDBusClass, OBJECT_DECLARE_TYPE(SDBus, SDBusClass,
sd_bus, SD_BUS) SD_BUS)
struct SDBus { struct SDBus {
BusState qbus; BusState qbus;

2
include/hw/ssi/ssi.h
View File

@ -18,7 +18,7 @@ typedef enum SSICSMode SSICSMode;
#define TYPE_SSI_SLAVE "ssi-slave" #define TYPE_SSI_SLAVE "ssi-slave"
OBJECT_DECLARE_TYPE(SSISlave, SSISlaveClass, OBJECT_DECLARE_TYPE(SSISlave, SSISlaveClass,
ssi_slave, SSI_SLAVE) SSI_SLAVE)
#define SSI_GPIO_CS "ssi-gpio-cs" #define SSI_GPIO_CS "ssi-gpio-cs"

2
include/hw/sysbus.h
View File

@ -17,7 +17,7 @@ DECLARE_INSTANCE_CHECKER(BusState, SYSTEM_BUS,
#define TYPE_SYS_BUS_DEVICE "sys-bus-device" #define TYPE_SYS_BUS_DEVICE "sys-bus-device"
OBJECT_DECLARE_TYPE(SysBusDevice, SysBusDeviceClass, OBJECT_DECLARE_TYPE(SysBusDevice, SysBusDeviceClass,
sys_bus_device, SYS_BUS_DEVICE) SYS_BUS_DEVICE)
/** /**
* SysBusDeviceClass: * SysBusDeviceClass:

2
include/hw/virtio/virtio-gpu.h
View File

@ -26,7 +26,7 @@
#define TYPE_VIRTIO_GPU_BASE "virtio-gpu-base" #define TYPE_VIRTIO_GPU_BASE "virtio-gpu-base"
OBJECT_DECLARE_TYPE(VirtIOGPUBase, VirtIOGPUBaseClass, OBJECT_DECLARE_TYPE(VirtIOGPUBase, VirtIOGPUBaseClass,
virtio_gpu_base, VIRTIO_GPU_BASE) VIRTIO_GPU_BASE)
#define TYPE_VIRTIO_GPU "virtio-gpu-device" #define TYPE_VIRTIO_GPU "virtio-gpu-device"
typedef struct VirtIOGPU VirtIOGPU; typedef struct VirtIOGPU VirtIOGPU;

2
include/hw/virtio/virtio-input.h
View File

@ -20,7 +20,7 @@ typedef struct virtio_input_event virtio_input_event;
#define TYPE_VIRTIO_INPUT "virtio-input-device" #define TYPE_VIRTIO_INPUT "virtio-input-device"
OBJECT_DECLARE_TYPE(VirtIOInput, VirtIOInputClass, OBJECT_DECLARE_TYPE(VirtIOInput, VirtIOInputClass,
virtio_input, VIRTIO_INPUT) VIRTIO_INPUT)
#define VIRTIO_INPUT_GET_PARENT_CLASS(obj) \ #define VIRTIO_INPUT_GET_PARENT_CLASS(obj) \
OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_INPUT) OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_INPUT)

2
include/hw/virtio/virtio-mem.h
View File

@ -22,7 +22,7 @@
#define TYPE_VIRTIO_MEM "virtio-mem" #define TYPE_VIRTIO_MEM "virtio-mem"
OBJECT_DECLARE_TYPE(VirtIOMEM, VirtIOMEMClass, OBJECT_DECLARE_TYPE(VirtIOMEM, VirtIOMEMClass,
virtio_mem, VIRTIO_MEM) VIRTIO_MEM)
#define VIRTIO_MEM_MEMDEV_PROP "memdev" #define VIRTIO_MEM_MEMDEV_PROP "memdev"
#define VIRTIO_MEM_NODE_PROP "node" #define VIRTIO_MEM_NODE_PROP "node"

2
include/hw/virtio/virtio-pmem.h
View File

@ -21,7 +21,7 @@
#define TYPE_VIRTIO_PMEM "virtio-pmem" #define TYPE_VIRTIO_PMEM "virtio-pmem"
OBJECT_DECLARE_TYPE(VirtIOPMEM, VirtIOPMEMClass, OBJECT_DECLARE_TYPE(VirtIOPMEM, VirtIOPMEMClass,
virtio_pmem, VIRTIO_PMEM) VIRTIO_PMEM)
#define VIRTIO_PMEM_ADDR_PROP "memaddr" #define VIRTIO_PMEM_ADDR_PROP "memaddr"
#define VIRTIO_PMEM_MEMDEV_PROP "memdev" #define VIRTIO_PMEM_MEMDEV_PROP "memdev"

2
include/hw/virtio/virtio-serial.h
View File

@ -27,7 +27,7 @@ struct virtio_serial_conf {
#define TYPE_VIRTIO_SERIAL_PORT "virtio-serial-port" #define TYPE_VIRTIO_SERIAL_PORT "virtio-serial-port"
OBJECT_DECLARE_TYPE(VirtIOSerialPort, VirtIOSerialPortClass, OBJECT_DECLARE_TYPE(VirtIOSerialPort, VirtIOSerialPortClass,
virtio_serial_port, VIRTIO_SERIAL_PORT) VIRTIO_SERIAL_PORT)
typedef struct VirtIOSerial VirtIOSerial; typedef struct VirtIOSerial VirtIOSerial;

2
include/hw/xen/xen-bus.h
View File

@ -79,7 +79,7 @@ struct XenBusClass {
#define TYPE_XEN_BUS "xen-bus" #define TYPE_XEN_BUS "xen-bus"
OBJECT_DECLARE_TYPE(XenBus, XenBusClass, OBJECT_DECLARE_TYPE(XenBus, XenBusClass,
xen_bus, XEN_BUS) XEN_BUS)
void xen_bus_init(void); void xen_bus_init(void);

2
include/io/channel.h
View File

@ -27,7 +27,7 @@
#define TYPE_QIO_CHANNEL "qio-channel" #define TYPE_QIO_CHANNEL "qio-channel"
OBJECT_DECLARE_TYPE(QIOChannel, QIOChannelClass, OBJECT_DECLARE_TYPE(QIOChannel, QIOChannelClass,
qio_channel, QIO_CHANNEL) QIO_CHANNEL)
#define QIO_CHANNEL_ERR_BLOCK -2 #define QIO_CHANNEL_ERR_BLOCK -2

2
include/io/dns-resolver.h
View File

@ -26,7 +26,7 @@
#include "io/task.h" #include "io/task.h"
#define TYPE_QIO_DNS_RESOLVER "qio-dns-resolver" #define TYPE_QIO_DNS_RESOLVER "qio-dns-resolver"
OBJECT_DECLARE_SIMPLE_TYPE(QIODNSResolver, qio_dns_resolver, OBJECT_DECLARE_SIMPLE_TYPE(QIODNSResolver,
QIO_DNS_RESOLVER) QIO_DNS_RESOLVER)

2
include/io/net-listener.h
View File

@ -25,7 +25,7 @@
#include "qom/object.h" #include "qom/object.h"
#define TYPE_QIO_NET_LISTENER "qio-net-listener" #define TYPE_QIO_NET_LISTENER "qio-net-listener"
OBJECT_DECLARE_SIMPLE_TYPE(QIONetListener, qio_net_listener, OBJECT_DECLARE_SIMPLE_TYPE(QIONetListener,
QIO_NET_LISTENER) QIO_NET_LISTENER)

6
include/qom/object.h
View File

@ -614,7 +614,6 @@ struct Object
* OBJECT_DECLARE_TYPE: * OBJECT_DECLARE_TYPE:
* @InstanceType: instance struct name * @InstanceType: instance struct name
* @ClassType: class struct name * @ClassType: class struct name
* @module_obj_name: the object name in lowercase with underscore separators
* @MODULE_OBJ_NAME: the object name in uppercase with underscore separators * @MODULE_OBJ_NAME: the object name in uppercase with underscore separators
* *
* This macro is typically used in a header file, and will: * This macro is typically used in a header file, and will:
@ -625,7 +624,7 @@ struct Object
* *
* The object struct and class struct need to be declared manually. * The object struct and class struct need to be declared manually.
*/ */
#define OBJECT_DECLARE_TYPE(InstanceType, ClassType, module_obj_name, MODULE_OBJ_NAME) \ #define OBJECT_DECLARE_TYPE(InstanceType, ClassType, MODULE_OBJ_NAME) \
typedef struct InstanceType InstanceType; \ typedef struct InstanceType InstanceType; \
typedef struct ClassType ClassType; \ typedef struct ClassType ClassType; \
\ \
@ -637,7 +636,6 @@ struct Object
/** /**
* OBJECT_DECLARE_SIMPLE_TYPE: * OBJECT_DECLARE_SIMPLE_TYPE:
* @InstanceType: instance struct name * @InstanceType: instance struct name
* @module_obj_name: the object name in lowercase with underscore separators
* @MODULE_OBJ_NAME: the object name in uppercase with underscore separators * @MODULE_OBJ_NAME: the object name in uppercase with underscore separators
* *
* This does the same as OBJECT_DECLARE_TYPE(), but with no class struct * This does the same as OBJECT_DECLARE_TYPE(), but with no class struct
@ -646,7 +644,7 @@ struct Object
* This macro should be used unless the class struct needs to have * This macro should be used unless the class struct needs to have
* virtual methods declared. * virtual methods declared.
*/ */
#define OBJECT_DECLARE_SIMPLE_TYPE(InstanceType, module_obj_name, MODULE_OBJ_NAME) \ #define OBJECT_DECLARE_SIMPLE_TYPE(InstanceType, MODULE_OBJ_NAME) \
typedef struct InstanceType InstanceType; \ typedef struct InstanceType InstanceType; \
\ \
G_DEFINE_AUTOPTR_CLEANUP_FUNC(InstanceType, object_unref) \ G_DEFINE_AUTOPTR_CLEANUP_FUNC(InstanceType, object_unref) \

2
include/scsi/pr-manager.h
View File

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

2
include/sysemu/cryptodev.h
View File

@ -38,7 +38,7 @@
#define TYPE_CRYPTODEV_BACKEND "cryptodev-backend" #define TYPE_CRYPTODEV_BACKEND "cryptodev-backend"
OBJECT_DECLARE_TYPE(CryptoDevBackend, CryptoDevBackendClass, OBJECT_DECLARE_TYPE(CryptoDevBackend, CryptoDevBackendClass,
cryptodev_backend, CRYPTODEV_BACKEND) CRYPTODEV_BACKEND)
#define MAX_CRYPTO_QUEUE_NUM 64 #define MAX_CRYPTO_QUEUE_NUM 64

2
include/sysemu/hostmem.h
View File

@ -21,7 +21,7 @@
#define TYPE_MEMORY_BACKEND "memory-backend" #define TYPE_MEMORY_BACKEND "memory-backend"
OBJECT_DECLARE_TYPE(HostMemoryBackend, HostMemoryBackendClass, OBJECT_DECLARE_TYPE(HostMemoryBackend, HostMemoryBackendClass,
memory_backend, MEMORY_BACKEND) MEMORY_BACKEND)
/* hostmem-ram.c */ /* hostmem-ram.c */
/** /**

2
include/sysemu/rng.h
View File

@ -18,7 +18,7 @@
#define TYPE_RNG_BACKEND "rng-backend" #define TYPE_RNG_BACKEND "rng-backend"
OBJECT_DECLARE_TYPE(RngBackend, RngBackendClass, OBJECT_DECLARE_TYPE(RngBackend, RngBackendClass,
rng_backend, RNG_BACKEND) RNG_BACKEND)
#define TYPE_RNG_BUILTIN "rng-builtin" #define TYPE_RNG_BUILTIN "rng-builtin"

2
include/sysemu/tpm_backend.h
View File

@ -20,7 +20,7 @@
#define TYPE_TPM_BACKEND "tpm-backend" #define TYPE_TPM_BACKEND "tpm-backend"
OBJECT_DECLARE_TYPE(TPMBackend, TPMBackendClass, OBJECT_DECLARE_TYPE(TPMBackend, TPMBackendClass,
tpm_backend, TPM_BACKEND) TPM_BACKEND)
typedef struct TPMBackendCmd { typedef struct TPMBackendCmd {

2
include/sysemu/vhost-user-backend.h
View File

@ -22,7 +22,7 @@
#include "io/channel.h" #include "io/channel.h"
#define TYPE_VHOST_USER_BACKEND "vhost-user-backend" #define TYPE_VHOST_USER_BACKEND "vhost-user-backend"
OBJECT_DECLARE_SIMPLE_TYPE(VhostUserBackend, vhost_user_backend, OBJECT_DECLARE_SIMPLE_TYPE(VhostUserBackend,
VHOST_USER_BACKEND) VHOST_USER_BACKEND)

2
target/alpha/cpu-qom.h
View File

@ -26,7 +26,7 @@
#define TYPE_ALPHA_CPU "alpha-cpu" #define TYPE_ALPHA_CPU "alpha-cpu"
OBJECT_DECLARE_TYPE(AlphaCPU, AlphaCPUClass, OBJECT_DECLARE_TYPE(AlphaCPU, AlphaCPUClass,
alpha_cpu, ALPHA_CPU) ALPHA_CPU)
/** /**
* AlphaCPUClass: * AlphaCPUClass:

2
target/arm/cpu-qom.h
View File

@ -28,7 +28,7 @@ struct arm_boot_info;
#define TYPE_ARM_CPU "arm-cpu" #define TYPE_ARM_CPU "arm-cpu"
OBJECT_DECLARE_TYPE(ARMCPU, ARMCPUClass, OBJECT_DECLARE_TYPE(ARMCPU, ARMCPUClass,
arm_cpu, ARM_CPU) ARM_CPU)
#define TYPE_ARM_MAX_CPU "max-" TYPE_ARM_CPU #define TYPE_ARM_MAX_CPU "max-" TYPE_ARM_CPU

2
target/avr/cpu-qom.h
View File

@ -27,7 +27,7 @@
#define TYPE_AVR_CPU "avr-cpu" #define TYPE_AVR_CPU "avr-cpu"
OBJECT_DECLARE_TYPE(AVRCPU, AVRCPUClass, OBJECT_DECLARE_TYPE(AVRCPU, AVRCPUClass,
avr_cpu, AVR_CPU) AVR_CPU)
/** /**
* AVRCPUClass: * AVRCPUClass:

2
target/cris/cpu-qom.h
View File

@ -26,7 +26,7 @@
#define TYPE_CRIS_CPU "cris-cpu" #define TYPE_CRIS_CPU "cris-cpu"
OBJECT_DECLARE_TYPE(CRISCPU, CRISCPUClass, OBJECT_DECLARE_TYPE(CRISCPU, CRISCPUClass,
cris_cpu, CRIS_CPU) CRIS_CPU)
/** /**
* CRISCPUClass: * CRISCPUClass:

2
target/hppa/cpu-qom.h
View File

@ -26,7 +26,7 @@
#define TYPE_HPPA_CPU "hppa-cpu" #define TYPE_HPPA_CPU "hppa-cpu"
OBJECT_DECLARE_TYPE(HPPACPU, HPPACPUClass, OBJECT_DECLARE_TYPE(HPPACPU, HPPACPUClass,
hppa_cpu, HPPA_CPU) HPPA_CPU)
/** /**
* HPPACPUClass: * HPPACPUClass:

2
target/i386/cpu-qom.h
View File

@ -31,7 +31,7 @@
#endif #endif
OBJECT_DECLARE_TYPE(X86CPU, X86CPUClass, OBJECT_DECLARE_TYPE(X86CPU, X86CPUClass,
x86_cpu, X86_CPU) X86_CPU)
typedef struct X86CPUModel X86CPUModel; typedef struct X86CPUModel X86CPUModel;

2
target/lm32/cpu-qom.h
View File

@ -26,7 +26,7 @@
#define TYPE_LM32_CPU "lm32-cpu" #define TYPE_LM32_CPU "lm32-cpu"
OBJECT_DECLARE_TYPE(LM32CPU, LM32CPUClass, OBJECT_DECLARE_TYPE(LM32CPU, LM32CPUClass,
lm32_cpu, LM32_CPU) LM32_CPU)
/** /**
* LM32CPUClass: * LM32CPUClass:

2
target/m68k/cpu-qom.h
View File

@ -26,7 +26,7 @@
#define TYPE_M68K_CPU "m68k-cpu" #define TYPE_M68K_CPU "m68k-cpu"
OBJECT_DECLARE_TYPE(M68kCPU, M68kCPUClass, OBJECT_DECLARE_TYPE(M68kCPU, M68kCPUClass,
m68k_cpu, M68K_CPU) M68K_CPU)
/* /*
* M68kCPUClass: * M68kCPUClass:

2
target/microblaze/cpu-qom.h
View File

@ -26,7 +26,7 @@
#define TYPE_MICROBLAZE_CPU "microblaze-cpu" #define TYPE_MICROBLAZE_CPU "microblaze-cpu"
OBJECT_DECLARE_TYPE(MicroBlazeCPU, MicroBlazeCPUClass, OBJECT_DECLARE_TYPE(MicroBlazeCPU, MicroBlazeCPUClass,
microblaze_cpu, MICROBLAZE_CPU) MICROBLAZE_CPU)
/** /**
* MicroBlazeCPUClass: * MicroBlazeCPUClass:

2
target/mips/cpu-qom.h
View File

@ -30,7 +30,7 @@
#endif #endif
OBJECT_DECLARE_TYPE(MIPSCPU, MIPSCPUClass, OBJECT_DECLARE_TYPE(MIPSCPU, MIPSCPUClass,
mips_cpu, MIPS_CPU) MIPS_CPU)
/** /**
* MIPSCPUClass: * MIPSCPUClass:

2
target/moxie/cpu.h
View File

@ -52,7 +52,7 @@ typedef struct CPUMoxieState {
#define TYPE_MOXIE_CPU "moxie-cpu" #define TYPE_MOXIE_CPU "moxie-cpu"
OBJECT_DECLARE_TYPE(MoxieCPU, MoxieCPUClass, OBJECT_DECLARE_TYPE(MoxieCPU, MoxieCPUClass,
moxie_cpu, MOXIE_CPU) MOXIE_CPU)
/** /**
* MoxieCPUClass: * MoxieCPUClass:

2
target/nios2/cpu.h
View File

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

2
target/openrisc/cpu.h
View File

@ -30,7 +30,7 @@ struct OpenRISCCPU;
#define TYPE_OPENRISC_CPU "or1k-cpu" #define TYPE_OPENRISC_CPU "or1k-cpu"
OBJECT_DECLARE_TYPE(OpenRISCCPU, OpenRISCCPUClass, OBJECT_DECLARE_TYPE(OpenRISCCPU, OpenRISCCPUClass,
openrisc_cpu, OPENRISC_CPU) OPENRISC_CPU)
/** /**
* OpenRISCCPUClass: * OpenRISCCPUClass:

2
target/ppc/cpu-qom.h
View File

@ -30,7 +30,7 @@
#endif #endif
OBJECT_DECLARE_TYPE(PowerPCCPU, PowerPCCPUClass, OBJECT_DECLARE_TYPE(PowerPCCPU, PowerPCCPUClass,
powerpc_cpu, POWERPC_CPU) POWERPC_CPU)
typedef struct CPUPPCState CPUPPCState; typedef struct CPUPPCState CPUPPCState;
typedef struct ppc_tb_t ppc_tb_t; typedef struct ppc_tb_t ppc_tb_t;

2
target/riscv/cpu.h
View File

@ -234,7 +234,7 @@ struct CPURISCVState {
}; };
OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass, OBJECT_DECLARE_TYPE(RISCVCPU, RISCVCPUClass,
riscv_cpu, RISCV_CPU) RISCV_CPU)
/** /**
* RISCVCPUClass: * RISCVCPUClass:

2
target/rx/cpu-qom.h
View File

@ -27,7 +27,7 @@
#define TYPE_RX62N_CPU RX_CPU_TYPE_NAME("rx62n") #define TYPE_RX62N_CPU RX_CPU_TYPE_NAME("rx62n")
OBJECT_DECLARE_TYPE(RXCPU, RXCPUClass, OBJECT_DECLARE_TYPE(RXCPU, RXCPUClass,
rx_cpu, RX_CPU) RX_CPU)
/* /*
* RXCPUClass: * RXCPUClass:

2
target/s390x/cpu-qom.h
View File

@ -26,7 +26,7 @@
#define TYPE_S390_CPU "s390x-cpu" #define TYPE_S390_CPU "s390x-cpu"
OBJECT_DECLARE_TYPE(S390CPU, S390CPUClass, OBJECT_DECLARE_TYPE(S390CPU, S390CPUClass,
s390_cpu, S390_CPU) S390_CPU)
typedef struct S390CPUModel S390CPUModel; typedef struct S390CPUModel S390CPUModel;
typedef struct S390CPUDef S390CPUDef; typedef struct S390CPUDef S390CPUDef;

2
target/sh4/cpu-qom.h
View File

@ -30,7 +30,7 @@
#define TYPE_SH7785_CPU SUPERH_CPU_TYPE_NAME("sh7785") #define TYPE_SH7785_CPU SUPERH_CPU_TYPE_NAME("sh7785")
OBJECT_DECLARE_TYPE(SuperHCPU, SuperHCPUClass, OBJECT_DECLARE_TYPE(SuperHCPU, SuperHCPUClass,
superh_cpu, SUPERH_CPU) SUPERH_CPU)
/** /**
* SuperHCPUClass: * SuperHCPUClass:

2
target/sparc/cpu-qom.h
View File

@ -30,7 +30,7 @@
#endif #endif
OBJECT_DECLARE_TYPE(SPARCCPU, SPARCCPUClass, OBJECT_DECLARE_TYPE(SPARCCPU, SPARCCPUClass,
sparc_cpu, SPARC_CPU) SPARC_CPU)
typedef struct sparc_def_t sparc_def_t; typedef struct sparc_def_t sparc_def_t;
/** /**

2
target/tilegx/cpu.h
View File

@ -100,7 +100,7 @@ typedef struct CPUTLGState {
#define TYPE_TILEGX_CPU "tilegx-cpu" #define TYPE_TILEGX_CPU "tilegx-cpu"
OBJECT_DECLARE_TYPE(TileGXCPU, TileGXCPUClass, OBJECT_DECLARE_TYPE(TileGXCPU, TileGXCPUClass,
tilegx_cpu, TILEGX_CPU) TILEGX_CPU)
/** /**
* TileGXCPUClass: * TileGXCPUClass:

2
target/tricore/cpu-qom.h
View File

@ -25,7 +25,7 @@
#define TYPE_TRICORE_CPU "tricore-cpu" #define TYPE_TRICORE_CPU "tricore-cpu"
OBJECT_DECLARE_TYPE(TriCoreCPU, TriCoreCPUClass, OBJECT_DECLARE_TYPE(TriCoreCPU, TriCoreCPUClass,
tricore_cpu, TRICORE_CPU) TRICORE_CPU)
struct TriCoreCPUClass { struct TriCoreCPUClass {
/*< private >*/ /*< private >*/

2
target/unicore32/cpu-qom.h
View File

@ -17,7 +17,7 @@
#define TYPE_UNICORE32_CPU "unicore32-cpu" #define TYPE_UNICORE32_CPU "unicore32-cpu"
OBJECT_DECLARE_TYPE(UniCore32CPU, UniCore32CPUClass, OBJECT_DECLARE_TYPE(UniCore32CPU, UniCore32CPUClass,
unicore32_cpu, UNICORE32_CPU) UNICORE32_CPU)
/** /**
* UniCore32CPUClass: * UniCore32CPUClass:

2
target/xtensa/cpu-qom.h
View File

@ -35,7 +35,7 @@
#define TYPE_XTENSA_CPU "xtensa-cpu" #define TYPE_XTENSA_CPU "xtensa-cpu"
OBJECT_DECLARE_TYPE(XtensaCPU, XtensaCPUClass, OBJECT_DECLARE_TYPE(XtensaCPU, XtensaCPUClass,
xtensa_cpu, XTENSA_CPU) XTENSA_CPU)
typedef struct XtensaConfig XtensaConfig; typedef struct XtensaConfig XtensaConfig;

2
ui/input-barrier.c
View File

@ -20,7 +20,7 @@
#include "input-barrier.h" #include "input-barrier.h"
#define TYPE_INPUT_BARRIER "input-barrier" #define TYPE_INPUT_BARRIER "input-barrier"
OBJECT_DECLARE_SIMPLE_TYPE(InputBarrier, input_barrier, OBJECT_DECLARE_SIMPLE_TYPE(InputBarrier,
INPUT_BARRIER) INPUT_BARRIER)

2
ui/input-linux.c
View File

@ -31,7 +31,7 @@ static bool linux_is_button(unsigned int lnx)
} }
#define TYPE_INPUT_LINUX "input-linux" #define TYPE_INPUT_LINUX "input-linux"
OBJECT_DECLARE_SIMPLE_TYPE(InputLinux, input_linux, OBJECT_DECLARE_SIMPLE_TYPE(InputLinux,
INPUT_LINUX) INPUT_LINUX)