motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 01:03:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use OBJECT_DECLARE_SIMPLE_TYPE when possible

Browse source 
This converts existing DECLARE_INSTANCE_CHECKER usage to
OBJECT_DECLARE_SIMPLE_TYPE when possible.

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

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Paul Durrant <paul@xen.org>
Message-Id: <20200916182519.415636-6-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2020-09-16 14:25:19 -04:00
parent a489d1951c
commit 8063396bf3
505 changed files with 609 additions and 1795 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/hw/virtio/vhost-scsi-common.h
View file

@ -20,9 +20,7 @@
#include "qom/object.h"
#define TYPE_VHOST_SCSI_COMMON "vhost-scsi-common"
typedef struct VHostSCSICommon VHostSCSICommon;
DECLARE_INSTANCE_CHECKER(VHostSCSICommon, VHOST_SCSI_COMMON,
TYPE_VHOST_SCSI_COMMON)
OBJECT_DECLARE_SIMPLE_TYPE(VHostSCSICommon, VHOST_SCSI_COMMON)
struct VHostSCSICommon {
VirtIOSCSICommon parent_obj;

4
include/hw/virtio/vhost-scsi.h
View file

@ -26,9 +26,7 @@ enum vhost_scsi_vq_list {
};
#define TYPE_VHOST_SCSI "vhost-scsi"
typedef struct VHostSCSI VHostSCSI;
DECLARE_INSTANCE_CHECKER(VHostSCSI, VHOST_SCSI,
TYPE_VHOST_SCSI)
OBJECT_DECLARE_SIMPLE_TYPE(VHostSCSI, VHOST_SCSI)
struct VHostSCSI {
VHostSCSICommon parent_obj;

4
include/hw/virtio/vhost-user-blk.h
View file

@ -23,9 +23,7 @@
#include "qom/object.h"
#define TYPE_VHOST_USER_BLK "vhost-user-blk"
typedef struct VHostUserBlk VHostUserBlk;
DECLARE_INSTANCE_CHECKER(VHostUserBlk, VHOST_USER_BLK,
TYPE_VHOST_USER_BLK)
OBJECT_DECLARE_SIMPLE_TYPE(VHostUserBlk, VHOST_USER_BLK)
#define VHOST_USER_BLK_AUTO_NUM_QUEUES UINT16_MAX

4
include/hw/virtio/vhost-user-fs.h
View file

@ -21,9 +21,7 @@
#include "qom/object.h"
#define TYPE_VHOST_USER_FS "vhost-user-fs-device"
typedef struct VHostUserFS VHostUserFS;
DECLARE_INSTANCE_CHECKER(VHostUserFS, VHOST_USER_FS,
TYPE_VHOST_USER_FS)
OBJECT_DECLARE_SIMPLE_TYPE(VHostUserFS, VHOST_USER_FS)
typedef struct {
CharBackend chardev;

4
include/hw/virtio/vhost-user-scsi.h
View file

@ -24,9 +24,7 @@
#include "qom/object.h"
#define TYPE_VHOST_USER_SCSI "vhost-user-scsi"
typedef struct VHostUserSCSI VHostUserSCSI;
DECLARE_INSTANCE_CHECKER(VHostUserSCSI, VHOST_USER_SCSI,
TYPE_VHOST_USER_SCSI)
OBJECT_DECLARE_SIMPLE_TYPE(VHostUserSCSI, VHOST_USER_SCSI)
struct VHostUserSCSI {
VHostSCSICommon parent_obj;

4
include/hw/virtio/vhost-user-vsock.h
View file

@ -17,9 +17,7 @@
#include "qom/object.h"
#define TYPE_VHOST_USER_VSOCK "vhost-user-vsock-device"
typedef struct VHostUserVSock VHostUserVSock;
DECLARE_INSTANCE_CHECKER(VHostUserVSock, VHOST_USER_VSOCK,
TYPE_VHOST_USER_VSOCK)
OBJECT_DECLARE_SIMPLE_TYPE(VHostUserVSock, VHOST_USER_VSOCK)
typedef struct {
CharBackend chardev;

4
include/hw/virtio/vhost-vsock-common.h
View file

@ -16,9 +16,7 @@
#include "qom/object.h"
#define TYPE_VHOST_VSOCK_COMMON "vhost-vsock-common"
typedef struct VHostVSockCommon VHostVSockCommon;
DECLARE_INSTANCE_CHECKER(VHostVSockCommon, VHOST_VSOCK_COMMON,
TYPE_VHOST_VSOCK_COMMON)
OBJECT_DECLARE_SIMPLE_TYPE(VHostVSockCommon, VHOST_VSOCK_COMMON)
enum {
VHOST_VSOCK_SAVEVM_VERSION = 0,

4
include/hw/virtio/vhost-vsock.h
View file

@ -18,9 +18,7 @@
#include "qom/object.h"
#define TYPE_VHOST_VSOCK "vhost-vsock-device"
typedef struct VHostVSock VHostVSock;
DECLARE_INSTANCE_CHECKER(VHostVSock, VHOST_VSOCK,
TYPE_VHOST_VSOCK)
OBJECT_DECLARE_SIMPLE_TYPE(VHostVSock, VHOST_VSOCK)
typedef struct {
uint64_t guest_cid;

4
include/hw/virtio/virtio-balloon.h
View file

@ -21,9 +21,7 @@
#include "qom/object.h"
#define TYPE_VIRTIO_BALLOON "virtio-balloon-device"
typedef struct VirtIOBalloon VirtIOBalloon;
DECLARE_INSTANCE_CHECKER(VirtIOBalloon, VIRTIO_BALLOON,
TYPE_VIRTIO_BALLOON)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOBalloon, VIRTIO_BALLOON)
#define VIRTIO_BALLOON_FREE_PAGE_HINT_CMD_ID_MIN 0x80000000

4
include/hw/virtio/virtio-blk.h
View file

@ -22,9 +22,7 @@
#include "qom/object.h"
#define TYPE_VIRTIO_BLK "virtio-blk-device"
typedef struct VirtIOBlock VirtIOBlock;
DECLARE_INSTANCE_CHECKER(VirtIOBlock, VIRTIO_BLK,
TYPE_VIRTIO_BLK)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOBlock, VIRTIO_BLK)
/* This is the last element of the write scatter-gather list */
struct virtio_blk_inhdr

4
include/hw/virtio/virtio-crypto.h
View file

@ -32,9 +32,7 @@ do { \
#define TYPE_VIRTIO_CRYPTO "virtio-crypto-device"
typedef struct VirtIOCrypto VirtIOCrypto;
DECLARE_INSTANCE_CHECKER(VirtIOCrypto, VIRTIO_CRYPTO,
TYPE_VIRTIO_CRYPTO)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOCrypto, VIRTIO_CRYPTO)
#define VIRTIO_CRYPTO_GET_PARENT_CLASS(obj) \
OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_CRYPTO)

4
include/hw/virtio/virtio-gpu-pci.h
View file

@ -18,14 +18,12 @@
#include "hw/virtio/virtio-gpu.h"
#include "qom/object.h"
typedef struct VirtIOGPUPCIBase VirtIOGPUPCIBase;
/*
* virtio-gpu-pci-base: This extends VirtioPCIProxy.
*/
#define TYPE_VIRTIO_GPU_PCI_BASE "virtio-gpu-pci-base"
DECLARE_INSTANCE_CHECKER(VirtIOGPUPCIBase, VIRTIO_GPU_PCI_BASE,
TYPE_VIRTIO_GPU_PCI_BASE)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOGPUPCIBase, VIRTIO_GPU_PCI_BASE)
struct VirtIOGPUPCIBase {
VirtIOPCIProxy parent_obj;

8
include/hw/virtio/virtio-gpu.h
View file

@ -29,14 +29,10 @@ OBJECT_DECLARE_TYPE(VirtIOGPUBase, VirtIOGPUBaseClass,
VIRTIO_GPU_BASE)
#define TYPE_VIRTIO_GPU "virtio-gpu-device"
typedef struct VirtIOGPU VirtIOGPU;
DECLARE_INSTANCE_CHECKER(VirtIOGPU, VIRTIO_GPU,
TYPE_VIRTIO_GPU)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOGPU, VIRTIO_GPU)
#define TYPE_VHOST_USER_GPU "vhost-user-gpu"
typedef struct VhostUserGPU VhostUserGPU;
DECLARE_INSTANCE_CHECKER(VhostUserGPU, VHOST_USER_GPU,
TYPE_VHOST_USER_GPU)
OBJECT_DECLARE_SIMPLE_TYPE(VhostUserGPU, VHOST_USER_GPU)
#define VIRTIO_ID_GPU 16

12
include/hw/virtio/virtio-input.h
View file

@ -29,23 +29,17 @@ OBJECT_DECLARE_TYPE(VirtIOInput, VirtIOInputClass,
#define TYPE_VIRTIO_MOUSE "virtio-mouse-device"
#define TYPE_VIRTIO_TABLET "virtio-tablet-device"
typedef struct VirtIOInputHID VirtIOInputHID;
DECLARE_INSTANCE_CHECKER(VirtIOInputHID, VIRTIO_INPUT_HID,
TYPE_VIRTIO_INPUT_HID)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOInputHID, VIRTIO_INPUT_HID)
#define VIRTIO_INPUT_HID_GET_PARENT_CLASS(obj) \
OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_INPUT_HID)
#define TYPE_VIRTIO_INPUT_HOST "virtio-input-host-device"
typedef struct VirtIOInputHost VirtIOInputHost;
DECLARE_INSTANCE_CHECKER(VirtIOInputHost, VIRTIO_INPUT_HOST,
TYPE_VIRTIO_INPUT_HOST)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOInputHost, VIRTIO_INPUT_HOST)
#define VIRTIO_INPUT_HOST_GET_PARENT_CLASS(obj) \
OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_INPUT_HOST)
#define TYPE_VHOST_USER_INPUT "vhost-user-input"
typedef struct VHostUserInput VHostUserInput;
DECLARE_INSTANCE_CHECKER(VHostUserInput, VHOST_USER_INPUT,
TYPE_VHOST_USER_INPUT)
OBJECT_DECLARE_SIMPLE_TYPE(VHostUserInput, VHOST_USER_INPUT)
#define VHOST_USER_INPUT_GET_PARENT_CLASS(obj) \
OBJECT_GET_PARENT_CLASS(obj, TYPE_VHOST_USER_INPUT)

4
include/hw/virtio/virtio-iommu.h
View file

@ -27,9 +27,7 @@
#define TYPE_VIRTIO_IOMMU "virtio-iommu-device"
#define TYPE_VIRTIO_IOMMU_PCI "virtio-iommu-device-base"
typedef struct VirtIOIOMMU VirtIOIOMMU;
DECLARE_INSTANCE_CHECKER(VirtIOIOMMU, VIRTIO_IOMMU,
TYPE_VIRTIO_IOMMU)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOIOMMU, VIRTIO_IOMMU)
#define TYPE_VIRTIO_IOMMU_MEMORY_REGION "virtio-iommu-memory-region"

4
include/hw/virtio/virtio-mmio.h
View file

@ -34,9 +34,7 @@ DECLARE_OBJ_CHECKERS(VirtioBusState, VirtioBusClass,
/* virtio-mmio */
#define TYPE_VIRTIO_MMIO "virtio-mmio"
typedef struct VirtIOMMIOProxy VirtIOMMIOProxy;
DECLARE_INSTANCE_CHECKER(VirtIOMMIOProxy, VIRTIO_MMIO,
TYPE_VIRTIO_MMIO)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOMMIOProxy, VIRTIO_MMIO)
#define VIRT_MAGIC 0x74726976 /* 'virt' */
#define VIRT_VERSION 2

4
include/hw/virtio/virtio-net.h
View file

@ -22,9 +22,7 @@
#include "qom/object.h"
#define TYPE_VIRTIO_NET "virtio-net-device"
typedef struct VirtIONet VirtIONet;
DECLARE_INSTANCE_CHECKER(VirtIONet, VIRTIO_NET,
TYPE_VIRTIO_NET)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIONet, VIRTIO_NET)
#define TX_TIMER_INTERVAL 150000 /* 150 us */

4
include/hw/virtio/virtio-rng.h
View file

@ -18,9 +18,7 @@
#include "qom/object.h"
#define TYPE_VIRTIO_RNG "virtio-rng-device"
typedef struct VirtIORNG VirtIORNG;
DECLARE_INSTANCE_CHECKER(VirtIORNG, VIRTIO_RNG,
TYPE_VIRTIO_RNG)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIORNG, VIRTIO_RNG)
#define VIRTIO_RNG_GET_PARENT_CLASS(obj) \
OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_RNG)

8
include/hw/virtio/virtio-scsi.h
View file

@ -26,14 +26,10 @@
#include "sysemu/iothread.h"
#define TYPE_VIRTIO_SCSI_COMMON "virtio-scsi-common"
typedef struct VirtIOSCSICommon VirtIOSCSICommon;
DECLARE_INSTANCE_CHECKER(VirtIOSCSICommon, VIRTIO_SCSI_COMMON,
TYPE_VIRTIO_SCSI_COMMON)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOSCSICommon, VIRTIO_SCSI_COMMON)
#define TYPE_VIRTIO_SCSI "virtio-scsi-device"
typedef struct VirtIOSCSI VirtIOSCSI;
DECLARE_INSTANCE_CHECKER(VirtIOSCSI, VIRTIO_SCSI,
TYPE_VIRTIO_SCSI)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOSCSI, VIRTIO_SCSI)
#define VIRTIO_SCSI_MAX_CHANNEL 0
#define VIRTIO_SCSI_MAX_TARGET 255

7
include/hw/virtio/virtio-serial.h
View file

@ -32,9 +32,7 @@ OBJECT_DECLARE_TYPE(VirtIOSerialPort, VirtIOSerialPortClass,
typedef struct VirtIOSerial VirtIOSerial;
#define TYPE_VIRTIO_SERIAL_BUS "virtio-serial-bus"
typedef struct VirtIOSerialBus VirtIOSerialBus;
DECLARE_INSTANCE_CHECKER(VirtIOSerialBus, VIRTIO_SERIAL_BUS,
TYPE_VIRTIO_SERIAL_BUS)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOSerialBus, VIRTIO_SERIAL_BUS)
struct VirtIOSerialPortClass {
@ -224,7 +222,6 @@ size_t virtio_serial_guest_ready(VirtIOSerialPort *port);
void virtio_serial_throttle_port(VirtIOSerialPort *port, bool throttle);
#define TYPE_VIRTIO_SERIAL "virtio-serial-device"
DECLARE_INSTANCE_CHECKER(VirtIOSerial, VIRTIO_SERIAL,
TYPE_VIRTIO_SERIAL)
OBJECT_DECLARE_SIMPLE_TYPE(VirtIOSerial, VIRTIO_SERIAL)
#endif