mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
Use OBJECT_DECLARE_TYPE when possible
This converts existing DECLARE_OBJ_CHECKERS usage to OBJECT_DECLARE_TYPE when possible. $ ./scripts/codeconverter/converter.py -i \ --pattern=AddObjectDeclareType $(git grep -l '' -- '*.[ch]') Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Acked-by: Paul Durrant <paul@xen.org> Message-Id: <20200916182519.415636-5-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
30b5707c26
commit
a489d1951c
69 changed files with 69 additions and 255 deletions
|
@ -82,12 +82,9 @@
|
|||
|
||||
#define IOAPIC_VER_ENTRIES_SHIFT 16
|
||||
|
||||
typedef struct IOAPICCommonState IOAPICCommonState;
|
||||
|
||||
#define TYPE_IOAPIC_COMMON "ioapic-common"
|
||||
typedef struct IOAPICCommonClass IOAPICCommonClass;
|
||||
DECLARE_OBJ_CHECKERS(IOAPICCommonState, IOAPICCommonClass,
|
||||
IOAPIC_COMMON, TYPE_IOAPIC_COMMON)
|
||||
OBJECT_DECLARE_TYPE(IOAPICCommonState, IOAPICCommonClass, IOAPIC_COMMON)
|
||||
|
||||
struct IOAPICCommonClass {
|
||||
SysBusDeviceClass parent_class;
|
||||
|
|
|
@ -50,7 +50,6 @@ struct MicrovmMachineClass {
|
|||
HotplugHandler *(*orig_hotplug_handler)(MachineState *machine,
|
||||
DeviceState *dev);
|
||||
};
|
||||
typedef struct MicrovmMachineClass MicrovmMachineClass;
|
||||
|
||||
struct MicrovmMachineState {
|
||||
X86MachineState parent;
|
||||
|
@ -69,10 +68,8 @@ struct MicrovmMachineState {
|
|||
Notifier machine_done;
|
||||
Notifier powerdown_req;
|
||||
};
|
||||
typedef struct MicrovmMachineState MicrovmMachineState;
|
||||
|
||||
#define TYPE_MICROVM_MACHINE MACHINE_TYPE_NAME("microvm")
|
||||
DECLARE_OBJ_CHECKERS(MicrovmMachineState, MicrovmMachineClass,
|
||||
MICROVM_MACHINE, TYPE_MICROVM_MACHINE)
|
||||
OBJECT_DECLARE_TYPE(MicrovmMachineState, MicrovmMachineClass, MICROVM_MACHINE)
|
||||
|
||||
#endif
|
||||
|
|
|
@ -119,11 +119,9 @@ struct PCMachineClass {
|
|||
/* use PVH to load kernels that support this feature */
|
||||
bool pvh_enabled;
|
||||
};
|
||||
typedef struct PCMachineClass PCMachineClass;
|
||||
|
||||
#define TYPE_PC_MACHINE "generic-pc-machine"
|
||||
DECLARE_OBJ_CHECKERS(PCMachineState, PCMachineClass,
|
||||
PC_MACHINE, TYPE_PC_MACHINE)
|
||||
OBJECT_DECLARE_TYPE(PCMachineState, PCMachineClass, PC_MACHINE)
|
||||
|
||||
/* ioapic.c */
|
||||
|
||||
|
|
|
@ -26,10 +26,7 @@
|
|||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_X86_IOMMU_DEVICE ("x86-iommu")
|
||||
typedef struct X86IOMMUClass X86IOMMUClass;
|
||||
typedef struct X86IOMMUState X86IOMMUState;
|
||||
DECLARE_OBJ_CHECKERS(X86IOMMUState, X86IOMMUClass,
|
||||
X86_IOMMU_DEVICE, TYPE_X86_IOMMU_DEVICE)
|
||||
OBJECT_DECLARE_TYPE(X86IOMMUState, X86IOMMUClass, X86_IOMMU_DEVICE)
|
||||
|
||||
#define X86_IOMMU_SID_INVALID (0xffff)
|
||||
|
||||
|
|
|
@ -39,7 +39,6 @@ struct X86MachineClass {
|
|||
/* Enables contiguous-apic-ID mode */
|
||||
bool compat_apic_id_mode;
|
||||
};
|
||||
typedef struct X86MachineClass X86MachineClass;
|
||||
|
||||
struct X86MachineState {
|
||||
/*< private >*/
|
||||
|
@ -72,14 +71,12 @@ struct X86MachineState {
|
|||
*/
|
||||
AddressSpace *ioapic_as;
|
||||
};
|
||||
typedef struct X86MachineState X86MachineState;
|
||||
|
||||
#define X86_MACHINE_SMM "smm"
|
||||
#define X86_MACHINE_ACPI "acpi"
|
||||
|
||||
#define TYPE_X86_MACHINE MACHINE_TYPE_NAME("x86")
|
||||
DECLARE_OBJ_CHECKERS(X86MachineState, X86MachineClass,
|
||||
X86_MACHINE, TYPE_X86_MACHINE)
|
||||
OBJECT_DECLARE_TYPE(X86MachineState, X86MachineClass, X86_MACHINE)
|
||||
|
||||
void init_topo_info(X86CPUTopoInfo *topo_info, const X86MachineState *x86ms);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue