Use OBJECT_DECLARE_SIMPLE_TYPE when possible

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

View file

@ -297,9 +297,7 @@ struct irte_ga {
};
#define TYPE_AMD_IOMMU_DEVICE "amd-iommu"
typedef struct AMDVIState AMDVIState;
DECLARE_INSTANCE_CHECKER(AMDVIState, AMD_IOMMU_DEVICE,
TYPE_AMD_IOMMU_DEVICE)
OBJECT_DECLARE_SIMPLE_TYPE(AMDVIState, AMD_IOMMU_DEVICE)
#define TYPE_AMD_IOMMU_PCI "AMDVI-PCI"

View file

@ -32,9 +32,7 @@
#include "qom/object.h"
#define TYPE_KVM_CLOCK "kvmclock"
typedef struct KVMClockState KVMClockState;
DECLARE_INSTANCE_CHECKER(KVMClockState, KVM_CLOCK,
TYPE_KVM_CLOCK)
OBJECT_DECLARE_SIMPLE_TYPE(KVMClockState, KVM_CLOCK)
struct KVMClockState {
/*< private >*/

View file

@ -71,11 +71,9 @@ struct VAPICROMState {
bool rom_mapped_writable;
VMChangeStateEntry *vmsentry;
};
typedef struct VAPICROMState VAPICROMState;
#define TYPE_VAPIC "kvmvapic"
DECLARE_INSTANCE_CHECKER(VAPICROMState, VAPIC,
TYPE_VAPIC)
OBJECT_DECLARE_SIMPLE_TYPE(VAPICROMState, VAPIC)
#define TPR_INSTR_ABS_MODRM 0x1
#define TPR_INSTR_MATCH_MODRM_REG 0x2

View file

@ -14,9 +14,7 @@
#include "trace.h"
#include "qom/object.h"
typedef struct Port92State Port92State;
DECLARE_INSTANCE_CHECKER(Port92State, PORT92,
TYPE_PORT92)
OBJECT_DECLARE_SIMPLE_TYPE(Port92State, PORT92)
struct Port92State {
ISADevice parent_obj;

View file

@ -51,9 +51,7 @@
#endif
#define TYPE_VMMOUSE "vmmouse"
typedef struct VMMouseState VMMouseState;
DECLARE_INSTANCE_CHECKER(VMMouseState, VMMOUSE,
TYPE_VMMOUSE)
OBJECT_DECLARE_SIMPLE_TYPE(VMMouseState, VMMOUSE)
struct VMMouseState {
ISADevice parent_obj;

View file

@ -63,9 +63,7 @@
#define VCPU_INFO_LEGACY_X2APIC_BIT 3
#define VCPU_INFO_RESERVED_BIT 31
typedef struct VMPortState VMPortState;
DECLARE_INSTANCE_CHECKER(VMPortState, VMPORT,
TYPE_VMPORT)
OBJECT_DECLARE_SIMPLE_TYPE(VMPortState, VMPORT)
struct VMPortState {
ISADevice parent_obj;

View file

@ -69,11 +69,9 @@ struct PCIXenPlatformState {
char log_buffer[4096];
int log_buffer_off;
};
typedef struct PCIXenPlatformState PCIXenPlatformState;
#define TYPE_XEN_PLATFORM "xen-platform"
DECLARE_INSTANCE_CHECKER(PCIXenPlatformState, XEN_PLATFORM,
TYPE_XEN_PLATFORM)
OBJECT_DECLARE_SIMPLE_TYPE(PCIXenPlatformState, XEN_PLATFORM)
#define XEN_PLATFORM_IOPORT 0x10

View file

@ -40,9 +40,7 @@
#define TYPE_XEN_PV_DEVICE "xen-pvdevice"
typedef struct XenPVDevice XenPVDevice;
DECLARE_INSTANCE_CHECKER(XenPVDevice, XEN_PV_DEVICE,
TYPE_XEN_PV_DEVICE)
OBJECT_DECLARE_SIMPLE_TYPE(XenPVDevice, XEN_PV_DEVICE)
struct XenPVDevice {
/*< private >*/