qom: Replace INTERFACE_CHECK with OBJECT_CHECK
PATCH 2/3 qom: Replace INTERFACE_CHECK with OBJECT_CHECK
In reply to Eduardo HabkostINTERFACE_CHECK and OBJECT_CHECK do exactly the same. There's no need to have two different methods for declaring the type checker macro for interface types.
---
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Igor Mammedov <[email protected]>
Cc: Corey Minyard <[email protected]>
Cc: "Cédric Le Goater" <[email protected]>
Cc: David Gibson <[email protected]>
Cc: "Hervé Poussineau" <[email protected]>
Cc: "Edgar E. Iglesias" <[email protected]>
Cc: Juan Quintela <[email protected]>
Cc: "Dr. David Alan Gilbert" <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: "Daniel P. Berrangé" <[email protected]>
Cc: Eduardo Habkost <[email protected]>
Cc: Stefan Berger <[email protected]>
Cc: Peter Maydell <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- include/hw/acpi/acpi_dev_interface.h | 2 +- include/hw/arm/linux-boot-if.h | 2 +- include/hw/fw-path-provider.h | 2 +- include/hw/hotplug.h | 2 +- include/hw/intc/intc.h | 2 +- include/hw/ipmi/ipmi.h | 2 +- include/hw/isa/isa.h | 2 +- include/hw/mem/memory-device.h | 2 +- include/hw/nmi.h | 2 +- include/hw/ppc/pnv_xscom.h | 2 +- include/hw/ppc/spapr_irq.h | 2 +- include/hw/ppc/xics.h | 2 +- include/hw/ppc/xive.h | 6 +++--- include/hw/rdma/rdma.h | 2 +- include/hw/rtc/m48t59.h | 2 +- include/hw/stream.h | 2 +- include/hw/vmstate-if.h | 2 +- include/qom/object.h | 12 ------------ include/qom/object_interfaces.h | 2 +- include/sysemu/tpm.h | 2 +- target/arm/idau.h | 2 +- tests/check-qom-interface.c | 2 +- 22 files changed, 23 insertions(+), 35 deletions(-)
include/hw/acpi/acpi_dev_interface.h +1 -1
@@ -22,7 +22,7 @@ typedef struct AcpiDeviceIfClass AcpiDeviceIfClass;DECLARE_CLASS_CHECKERS (AcpiDeviceIfClass,ACPI_DEVICE_IF , TYPE_ACPI_DEVICE_IF)#define ACPI_DEVICE_IF (obj) \ - INTERFACE_CHECK(AcpiDeviceIf, (obj), \ + OBJECT_CHECK(AcpiDeviceIf, (obj), \ TYPE_ACPI_DEVICE_IF)typedef struct AcpiDeviceIf AcpiDeviceIf ;
include/hw/arm/linux-boot-if.h +1 -1
@@ -13,7 +13,7 @@ typedef struct ARMLinuxBootIfClass ARMLinuxBootIfClass;DECLARE_CLASS_CHECKERS (ARMLinuxBootIfClass,ARM_LINUX_BOOT_IF , TYPE_ARM_LINUX_BOOT_IF)#define ARM_LINUX_BOOT_IF (obj) \ - INTERFACE_CHECK(ARMLinuxBootIf, (obj), TYPE_ARM_LINUX_BOOT_IF) + OBJECT_CHECK(ARMLinuxBootIf, (obj), TYPE_ARM_LINUX_BOOT_IF)typedef struct ARMLinuxBootIf ARMLinuxBootIf ;
include/hw/fw-path-provider.h +1 -1
@@ -26,7 +26,7 @@ typedef struct FWPathProviderClass FWPathProviderClass;DECLARE_CLASS_CHECKERS (FWPathProviderClass,FW_PATH_PROVIDER , TYPE_FW_PATH_PROVIDER)#define FW_PATH_PROVIDER (obj) \ - INTERFACE_CHECK(FWPathProvider, (obj), TYPE_FW_PATH_PROVIDER) + OBJECT_CHECK(FWPathProvider, (obj), TYPE_FW_PATH_PROVIDER)typedef struct FWPathProvider FWPathProvider ;
include/hw/hotplug.h +1 -1
@@ -20,7 +20,7 @@ typedef struct HotplugHandlerClass HotplugHandlerClass;DECLARE_CLASS_CHECKERS (HotplugHandlerClass,HOTPLUG_HANDLER , TYPE_HOTPLUG_HANDLER)#define HOTPLUG_HANDLER (obj) \ - INTERFACE_CHECK(HotplugHandler, (obj), TYPE_HOTPLUG_HANDLER) + OBJECT_CHECK(HotplugHandler, (obj), TYPE_HOTPLUG_HANDLER)typedef struct HotplugHandler HotplugHandler ;
include/hw/intc/intc.h +1 -1
@@ -9,7 +9,7 @@ typedef struct InterruptStatsProviderClass InterruptStatsProviderClass;DECLARE_CLASS_CHECKERS (InterruptStatsProviderClass,INTERRUPT_STATS_PROVIDER , TYPE_INTERRUPT_STATS_PROVIDER)#define INTERRUPT_STATS_PROVIDER (obj) \ - INTERFACE_CHECK(InterruptStatsProvider, (obj), \ + OBJECT_CHECK(InterruptStatsProvider, (obj), \ TYPE_INTERRUPT_STATS_PROVIDER)typedef struct InterruptStatsProvider InterruptStatsProvider ;
include/hw/ipmi/ipmi.h +1 -1
@@ -110,7 +110,7 @@ uint32_t ipmi_next_uuid(void);*/ #define TYPE_IPMI_INTERFACE "ipmi-interface"#define IPMI_INTERFACE (obj) \ - INTERFACE_CHECK(IPMIInterface, (obj), TYPE_IPMI_INTERFACE) + OBJECT_CHECK(IPMIInterface, (obj), TYPE_IPMI_INTERFACE)typedef struct IPMIInterfaceClass IPMIInterfaceClass ;DECLARE_CLASS_CHECKERS (IPMIInterfaceClass,IPMI_INTERFACE ,TYPE_IPMI_INTERFACE )
include/hw/isa/isa.h +1 -1
@@ -39,7 +39,7 @@ typedef struct IsaDmaClass IsaDmaClass;DECLARE_CLASS_CHECKERS (IsaDmaClass,ISADMA , TYPE_ISADMA)#define ISADMA (obj) \ - INTERFACE_CHECK(IsaDma, (obj), TYPE_ISADMA) + OBJECT_CHECK(IsaDma, (obj), TYPE_ISADMA) typedef enum { ISADMA_TRANSFER_VERIFY,
include/hw/mem/memory-device.h +1 -1
@@ -23,7 +23,7 @@ typedef struct MemoryDeviceClass MemoryDeviceClass;DECLARE_CLASS_CHECKERS (MemoryDeviceClass,MEMORY_DEVICE , TYPE_MEMORY_DEVICE)#define MEMORY_DEVICE (obj) \ - INTERFACE_CHECK(MemoryDeviceState, (obj), TYPE_MEMORY_DEVICE) + OBJECT_CHECK(MemoryDeviceState, (obj), TYPE_MEMORY_DEVICE)typedef struct MemoryDeviceState MemoryDeviceState ;
include/hw/nmi.h +1 -1
@@ -30,7 +30,7 @@ typedef struct NMIClass NMIClass;DECLARE_CLASS_CHECKERS (NMIClass,NMI , TYPE_NMI)#define NMI (obj) \ - INTERFACE_CHECK(NMIState, (obj), TYPE_NMI) + OBJECT_CHECK(NMIState, (obj), TYPE_NMI)typedef struct NMIState NMIState ;
include/hw/ppc/pnv_xscom.h +1 -1
@@ -26,7 +26,7 @@ typedef struct PnvXScomInterface PnvXScomInterface;#define TYPE_PNV_XSCOM_INTERFACE "pnv-xscom-interface"#define PNV_XSCOM_INTERFACE (obj) \ - INTERFACE_CHECK(PnvXScomInterface, (obj), TYPE_PNV_XSCOM_INTERFACE) + OBJECT_CHECK(PnvXScomInterface, (obj), TYPE_PNV_XSCOM_INTERFACE)typedef struct PnvXScomInterfaceClass PnvXScomInterfaceClass ;DECLARE_CLASS_CHECKERS (PnvXScomInterfaceClass,PNV_XSCOM_INTERFACE ,TYPE_PNV_XSCOM_INTERFACE )
include/hw/ppc/spapr_irq.h +1 -1
@@ -35,7 +35,7 @@ typedef struct SpaprInterruptController SpaprInterruptController;#define TYPE_SPAPR_INTC "spapr-interrupt-controller"#define SPAPR_INTC (obj) \ - INTERFACE_CHECK(SpaprInterruptController, (obj), TYPE_SPAPR_INTC) + OBJECT_CHECK(SpaprInterruptController, (obj), TYPE_SPAPR_INTC)typedef struct SpaprInterruptControllerClass SpaprInterruptControllerClass ;DECLARE_CLASS_CHECKERS (SpaprInterruptControllerClass,SPAPR_INTC ,TYPE_SPAPR_INTC )
include/hw/ppc/xics.h +1 -1
@@ -138,7 +138,7 @@ struct ICSIRQState {#define TYPE_XICS_FABRIC "xics-fabric"#define XICS_FABRIC (obj) \ - INTERFACE_CHECK(XICSFabric, (obj), TYPE_XICS_FABRIC) + OBJECT_CHECK(XICSFabric, (obj), TYPE_XICS_FABRIC)typedef struct XICSFabricClass XICSFabricClass ;DECLARE_CLASS_CHECKERS (XICSFabricClass,XICS_FABRIC ,TYPE_XICS_FABRIC )
include/hw/ppc/xive.h +3 -3
@@ -153,7 +153,7 @@ typedef struct XiveNotifier XiveNotifier;#define TYPE_XIVE_NOTIFIER "xive-notifier"#define XIVE_NOTIFIER (obj) \ - INTERFACE_CHECK(XiveNotifier, (obj), TYPE_XIVE_NOTIFIER) + OBJECT_CHECK(XiveNotifier, (obj), TYPE_XIVE_NOTIFIER)typedef struct XiveNotifierClass XiveNotifierClass ;DECLARE_CLASS_CHECKERS (XiveNotifierClass,XIVE_NOTIFIER ,TYPE_XIVE_NOTIFIER )
@@ -390,7 +390,7 @@ typedef struct XiveTCTXMatch {#define TYPE_XIVE_PRESENTER "xive-presenter"#define XIVE_PRESENTER (obj) \ - INTERFACE_CHECK(XivePresenter, (obj), TYPE_XIVE_PRESENTER) + OBJECT_CHECK(XivePresenter, (obj), TYPE_XIVE_PRESENTER)typedef struct XivePresenterClass XivePresenterClass ;DECLARE_CLASS_CHECKERS (XivePresenterClass,XIVE_PRESENTER ,TYPE_XIVE_PRESENTER )
@@ -415,7 +415,7 @@ int xive_presenter_tctx_match(XivePresenter *xptr, XiveTCTX *tctx,#define TYPE_XIVE_FABRIC "xive-fabric"#define XIVE_FABRIC (obj) \ - INTERFACE_CHECK(XiveFabric, (obj), TYPE_XIVE_FABRIC) + OBJECT_CHECK(XiveFabric, (obj), TYPE_XIVE_FABRIC)typedef struct XiveFabricClass XiveFabricClass ;DECLARE_CLASS_CHECKERS (XiveFabricClass,XIVE_FABRIC ,TYPE_XIVE_FABRIC )
include/hw/rdma/rdma.h +1 -1
@@ -23,7 +23,7 @@ typedef struct RdmaProviderClass RdmaProviderClass;DECLARE_CLASS_CHECKERS (RdmaProviderClass,RDMA_PROVIDER , INTERFACE_RDMA_PROVIDER)#define RDMA_PROVIDER (obj) \ - INTERFACE_CHECK(RdmaProvider, (obj), \ + OBJECT_CHECK(RdmaProvider, (obj), \ INTERFACE_RDMA_PROVIDER)typedef struct RdmaProvider RdmaProvider ;
include/hw/rtc/m48t59.h +1 -1
@@ -35,7 +35,7 @@ typedef struct NvramClass NvramClass;DECLARE_CLASS_CHECKERS (NvramClass,NVRAM , TYPE_NVRAM)#define NVRAM (obj) \ - INTERFACE_CHECK(Nvram, (obj), TYPE_NVRAM) + OBJECT_CHECK(Nvram, (obj), TYPE_NVRAM)typedef struct Nvram Nvram ;
include/hw/stream.h +1 -1
@@ -10,7 +10,7 @@ typedef struct StreamSlaveClass StreamSlaveClass;DECLARE_CLASS_CHECKERS (StreamSlaveClass,STREAM_SLAVE , TYPE_STREAM_SLAVE)#define STREAM_SLAVE (obj) \ - INTERFACE_CHECK(StreamSlave, (obj), TYPE_STREAM_SLAVE) + OBJECT_CHECK(StreamSlave, (obj), TYPE_STREAM_SLAVE)typedef struct StreamSlave StreamSlave ;
include/hw/vmstate-if.h +1 -1
@@ -17,7 +17,7 @@ typedef struct VMStateIfClass VMStateIfClass;DECLARE_CLASS_CHECKERS (VMStateIfClass,VMSTATE_IF , TYPE_VMSTATE_IF)#define VMSTATE_IF (obj) \ - INTERFACE_CHECK(VMStateIf, (obj), TYPE_VMSTATE_IF) + OBJECT_CHECK(VMStateIf, (obj), TYPE_VMSTATE_IF)typedef struct VMStateIf VMStateIf ;
include/qom/object.h +0 -12
@@ -920,18 +920,6 @@ struct InterfaceClass#define INTERFACE_CLASS (klass) \ OBJECT_CLASS_CHECK(InterfaceClass, klass, TYPE_INTERFACE) -/** -* INTERFACE_CHECK: -* @interface: the type to return -* @obj: the object to convert to an interface -* @name: the interface type name -* -* Returns: @obj casted to @interface if cast is valid, otherwise raise error. -*/ -#define INTERFACE_CHECK (interface, obj, name) \ - ((interface *)object_dynamic_cast_assert(OBJECT((obj)), (name), \ - __FILE__, __LINE__, __func__)) -/** * object_new_with_class: * @klass: The class to instantiate.
include/qom/object_interfaces.h +1 -1
@@ -10,7 +10,7 @@ typedef struct UserCreatableClass UserCreatableClass;DECLARE_CLASS_CHECKERS (UserCreatableClass,USER_CREATABLE , TYPE_USER_CREATABLE)#define USER_CREATABLE (obj) \ - INTERFACE_CHECK(UserCreatable, (obj), \ + OBJECT_CHECK(UserCreatable, (obj), \ TYPE_USER_CREATABLE)typedef struct UserCreatable UserCreatable ;
include/sysemu/tpm.h +1 -1
@@ -30,7 +30,7 @@ typedef struct TPMIfClass TPMIfClass;DECLARE_CLASS_CHECKERS (TPMIfClass,TPM_IF , TYPE_TPM_IF)#define TPM_IF (obj) \ - INTERFACE_CHECK(TPMIf, (obj), TYPE_TPM_IF) + OBJECT_CHECK(TPMIf, (obj), TYPE_TPM_IF)typedef struct TPMIf TPMIf ;
target/arm/idau.h +1 -1
@@ -32,7 +32,7 @@#define TYPE_IDAU_INTERFACE "idau-interface"#define IDAU_INTERFACE (obj) \ - INTERFACE_CHECK(IDAUInterface, (obj), TYPE_IDAU_INTERFACE) + OBJECT_CHECK(IDAUInterface, (obj), TYPE_IDAU_INTERFACE)typedef struct IDAUInterfaceClass IDAUInterfaceClass ;DECLARE_CLASS_CHECKERS (IDAUInterfaceClass,IDAU_INTERFACE ,TYPE_IDAU_INTERFACE )
tests/check-qom-interface.c +1 -1
@@ -20,7 +20,7 @@ typedef struct TestIfClass TestIfClass;DECLARE_CLASS_CHECKERS (TestIfClass,TEST_IF , TYPE_TEST_IF)#define TEST_IF (obj) \ - INTERFACE_CHECK(TestIf, (obj), TYPE_TEST_IF) + OBJECT_CHECK(TestIf, (obj), TYPE_TEST_IF)typedef struct TestIf TestIf ;
Signature · 1 line
2.26.2
PATCH 3/3 Use DECLARE_*CHECKER* macros
In reply to Eduardo HabkostNew round of conversion of type checking macros to DECLARE_*CHECKER, in the files that were previously using INTERFACE_CHECK.
Genereated using:
$ ./scripts/codeconverter/converter.py --passes=3 -i \
--pattern=QOMStructTypedefSplit,MoveSymbols,TypeCheckMacro \
include/hw/acpi/acpi_dev_interface.h \
include/hw/arm/linux-boot-if.h \
include/hw/fw-path-provider.h \
include/hw/hotplug.h \
include/hw/intc/intc.h \
include/hw/ipmi/ipmi.h \
include/hw/isa/isa.h \
include/hw/mem/memory-device.h \
include/hw/nmi.h \
include/hw/ppc/pnv_xscom.h \
include/hw/ppc/spapr_irq.h \
include/hw/ppc/xics.h \
include/hw/ppc/xive.h \
include/hw/rdma/rdma.h \
include/hw/rtc/m48t59.h \
include/hw/stream.h \
include/hw/vmstate-if.h \
include/qom/object.h \
include/qom/object_interfaces.h \
include/sysemu/tpm.h \
scripts/codeconverter/codeconverter/qom_macros.py \
target/arm/idau.h \
tests/check-qom-interface.c---
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Igor Mammedov <[email protected]>
Cc: Corey Minyard <[email protected]>
Cc: "Cédric Le Goater" <[email protected]>
Cc: David Gibson <[email protected]>
Cc: "Hervé Poussineau" <[email protected]>
Cc: "Edgar E. Iglesias" <[email protected]>
Cc: Juan Quintela <[email protected]>
Cc: "Dr. David Alan Gilbert" <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: "Daniel P. Berrangé" <[email protected]>
Cc: Eduardo Habkost <[email protected]>
Cc: Stefan Berger <[email protected]>
Cc: Peter Maydell <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- include/hw/acpi/acpi_dev_interface.h | 7 +++---- include/hw/arm/linux-boot-if.h | 6 +++--- include/hw/fw-path-provider.h | 6 +++--- include/hw/hotplug.h | 6 +++--- include/hw/intc/intc.h | 7 +++---- include/hw/ipmi/ipmi.h | 6 +++--- include/hw/mem/memory-device.h | 6 +++--- include/hw/nmi.h | 6 +++--- include/hw/ppc/pnv_xscom.h | 4 ++-- include/hw/ppc/spapr_irq.h | 4 ++-- include/hw/ppc/xics.h | 4 ++-- include/hw/ppc/xive.h | 12 ++++++------ include/hw/rdma/rdma.h | 7 +++---- include/hw/rtc/m48t59.h | 6 +++--- include/hw/stream.h | 6 +++--- include/hw/vmstate-if.h | 6 +++--- include/qom/object_interfaces.h | 7 +++---- include/sysemu/tpm.h | 6 +++--- target/arm/idau.h | 6 +++--- tests/check-qom-interface.c | 6 +++--- 20 files changed, 60 insertions(+), 64 deletions(-)
include/hw/acpi/acpi_dev_interface.h +3 -4
@@ -21,11 +21,10 @@ typedef enum {typedef struct AcpiDeviceIfClass AcpiDeviceIfClass ;DECLARE_CLASS_CHECKERS (AcpiDeviceIfClass,ACPI_DEVICE_IF , TYPE_ACPI_DEVICE_IF) -#define ACPI_DEVICE_IF (obj) \ - OBJECT_CHECK(AcpiDeviceIf, (obj), \ - TYPE_ACPI_DEVICE_IF) -typedef struct AcpiDeviceIf AcpiDeviceIf ; +DECLARE_INSTANCE_CHECKER (AcpiDeviceIf,ACPI_DEVICE_IF , + TYPE_ACPI_DEVICE_IF) +void acpi_send_event (DeviceState *dev,AcpiEventStatusBits event);
include/hw/arm/linux-boot-if.h +3 -3
@@ -12,10 +12,10 @@typedef struct ARMLinuxBootIfClass ARMLinuxBootIfClass ;DECLARE_CLASS_CHECKERS (ARMLinuxBootIfClass,ARM_LINUX_BOOT_IF , TYPE_ARM_LINUX_BOOT_IF) -#define ARM_LINUX_BOOT_IF (obj) \ - OBJECT_CHECK(ARMLinuxBootIf, (obj), TYPE_ARM_LINUX_BOOT_IF) -typedef struct ARMLinuxBootIf ARMLinuxBootIf ; +DECLARE_INSTANCE_CHECKER (ARMLinuxBootIf,ARM_LINUX_BOOT_IF , + TYPE_ARM_LINUX_BOOT_IF) +struct ARMLinuxBootIfClass {/*< private >*/
include/hw/fw-path-provider.h +3 -3
@@ -25,10 +25,10 @@typedef struct FWPathProviderClass FWPathProviderClass ;DECLARE_CLASS_CHECKERS (FWPathProviderClass,FW_PATH_PROVIDER , TYPE_FW_PATH_PROVIDER) -#define FW_PATH_PROVIDER (obj) \ - OBJECT_CHECK(FWPathProvider, (obj), TYPE_FW_PATH_PROVIDER) -typedef struct FWPathProvider FWPathProvider ; +DECLARE_INSTANCE_CHECKER (FWPathProvider,FW_PATH_PROVIDER , + TYPE_FW_PATH_PROVIDER) +struct FWPathProviderClass {InterfaceClass parent_class;
include/hw/hotplug.h +3 -3
@@ -19,10 +19,10 @@typedef struct HotplugHandlerClass HotplugHandlerClass ;DECLARE_CLASS_CHECKERS (HotplugHandlerClass,HOTPLUG_HANDLER , TYPE_HOTPLUG_HANDLER) -#define HOTPLUG_HANDLER (obj) \ - OBJECT_CHECK(HotplugHandler, (obj), TYPE_HOTPLUG_HANDLER) -typedef struct HotplugHandler HotplugHandler ; +DECLARE_INSTANCE_CHECKER (HotplugHandler,HOTPLUG_HANDLER , +TYPE_HOTPLUG_HANDLER ) +/** * hotplug_fn:
include/hw/intc/intc.h +3 -4
@@ -8,11 +8,10 @@typedef struct InterruptStatsProviderClass InterruptStatsProviderClass ;DECLARE_CLASS_CHECKERS (InterruptStatsProviderClass,INTERRUPT_STATS_PROVIDER , TYPE_INTERRUPT_STATS_PROVIDER) -#define INTERRUPT_STATS_PROVIDER (obj) \ - OBJECT_CHECK(InterruptStatsProvider, (obj), \ - TYPE_INTERRUPT_STATS_PROVIDER) -typedef struct InterruptStatsProvider InterruptStatsProvider ; +DECLARE_INSTANCE_CHECKER (InterruptStatsProvider,INTERRUPT_STATS_PROVIDER , + TYPE_INTERRUPT_STATS_PROVIDER) +struct InterruptStatsProviderClass {InterfaceClass parent;
include/hw/ipmi/ipmi.h +3 -3
@@ -109,13 +109,13 @@ uint32_t ipmi_next_uuid(void);* and the BMC. */ #define TYPE_IPMI_INTERFACE "ipmi-interface" -#define IPMI_INTERFACE (obj) \ - OBJECT_CHECK(IPMIInterface, (obj), TYPE_IPMI_INTERFACE) +typedef struct IPMIInterface IPMIInterface ; +DECLARE_INSTANCE_CHECKER (IPMIInterface,IPMI_INTERFACE , + TYPE_IPMI_INTERFACE)typedef struct IPMIInterfaceClass IPMIInterfaceClass ;DECLARE_CLASS_CHECKERS (IPMIInterfaceClass,IPMI_INTERFACE , TYPE_IPMI_INTERFACE) -typedef struct IPMIInterface IPMIInterface ;struct IPMIInterfaceClass {InterfaceClass parent;
include/hw/mem/memory-device.h +3 -3
@@ -22,10 +22,10 @@typedef struct MemoryDeviceClass MemoryDeviceClass ;DECLARE_CLASS_CHECKERS (MemoryDeviceClass,MEMORY_DEVICE , TYPE_MEMORY_DEVICE) -#define MEMORY_DEVICE (obj) \ - OBJECT_CHECK(MemoryDeviceState, (obj), TYPE_MEMORY_DEVICE) -typedef struct MemoryDeviceState MemoryDeviceState ; +DECLARE_INSTANCE_CHECKER (MemoryDeviceState,MEMORY_DEVICE , +TYPE_MEMORY_DEVICE ) +/** * MemoryDeviceClass:
include/hw/nmi.h +3 -3
@@ -29,10 +29,10 @@typedef struct NMIClass NMIClass ;DECLARE_CLASS_CHECKERS (NMIClass,NMI , TYPE_NMI) -#define NMI (obj) \ - OBJECT_CHECK(NMIState, (obj), TYPE_NMI) -typedef struct NMIState NMIState ; +DECLARE_INSTANCE_CHECKER (NMIState,NMI , + TYPE_NMI) +struct NMIClass {InterfaceClass parent_class;
include/hw/ppc/pnv_xscom.h +2 -2
@@ -25,8 +25,8 @@typedef struct PnvXScomInterface PnvXScomInterface ;#define TYPE_PNV_XSCOM_INTERFACE "pnv-xscom-interface" -#define PNV_XSCOM_INTERFACE (obj) \ - OBJECT_CHECK(PnvXScomInterface, (obj), TYPE_PNV_XSCOM_INTERFACE) +DECLARE_INSTANCE_CHECKER (PnvXScomInterface,PNV_XSCOM_INTERFACE , + TYPE_PNV_XSCOM_INTERFACE)typedef struct PnvXScomInterfaceClass PnvXScomInterfaceClass ;DECLARE_CLASS_CHECKERS (PnvXScomInterfaceClass,PNV_XSCOM_INTERFACE ,TYPE_PNV_XSCOM_INTERFACE )
include/hw/ppc/spapr_irq.h +2 -2
@@ -34,8 +34,8 @@ struct SpaprMachineState;typedef struct SpaprInterruptController SpaprInterruptController ;#define TYPE_SPAPR_INTC "spapr-interrupt-controller" -#define SPAPR_INTC (obj) \ - OBJECT_CHECK(SpaprInterruptController, (obj), TYPE_SPAPR_INTC) +DECLARE_INSTANCE_CHECKER (SpaprInterruptController,SPAPR_INTC , + TYPE_SPAPR_INTC)typedef struct SpaprInterruptControllerClass SpaprInterruptControllerClass ;DECLARE_CLASS_CHECKERS (SpaprInterruptControllerClass,SPAPR_INTC ,TYPE_SPAPR_INTC )
include/hw/ppc/xics.h +2 -2
@@ -137,8 +137,8 @@ struct ICSIRQState { };#define TYPE_XICS_FABRIC "xics-fabric" -#define XICS_FABRIC (obj) \ - OBJECT_CHECK(XICSFabric, (obj), TYPE_XICS_FABRIC) +DECLARE_INSTANCE_CHECKER (XICSFabric,XICS_FABRIC , + TYPE_XICS_FABRIC)typedef struct XICSFabricClass XICSFabricClass ;DECLARE_CLASS_CHECKERS (XICSFabricClass,XICS_FABRIC ,TYPE_XICS_FABRIC )
include/hw/ppc/xive.h +6 -6
@@ -152,8 +152,8 @@typedef struct XiveNotifier XiveNotifier ;#define TYPE_XIVE_NOTIFIER "xive-notifier" -#define XIVE_NOTIFIER (obj) \ - OBJECT_CHECK(XiveNotifier, (obj), TYPE_XIVE_NOTIFIER) +DECLARE_INSTANCE_CHECKER (XiveNotifier,XIVE_NOTIFIER , + TYPE_XIVE_NOTIFIER)typedef struct XiveNotifierClass XiveNotifierClass ;DECLARE_CLASS_CHECKERS (XiveNotifierClass,XIVE_NOTIFIER ,TYPE_XIVE_NOTIFIER )
@@ -389,8 +389,8 @@ typedef struct XiveTCTXMatch { } XiveTCTXMatch;#define TYPE_XIVE_PRESENTER "xive-presenter" -#define XIVE_PRESENTER (obj) \ - OBJECT_CHECK(XivePresenter, (obj), TYPE_XIVE_PRESENTER) +DECLARE_INSTANCE_CHECKER (XivePresenter,XIVE_PRESENTER , + TYPE_XIVE_PRESENTER)typedef struct XivePresenterClass XivePresenterClass ;DECLARE_CLASS_CHECKERS (XivePresenterClass,XIVE_PRESENTER ,TYPE_XIVE_PRESENTER )
@@ -414,8 +414,8 @@ int xive_presenter_tctx_match(XivePresenter *xptr, XiveTCTX *tctx,*/ #define TYPE_XIVE_FABRIC "xive-fabric" -#define XIVE_FABRIC (obj) \ - OBJECT_CHECK(XiveFabric, (obj), TYPE_XIVE_FABRIC) +DECLARE_INSTANCE_CHECKER (XiveFabric,XIVE_FABRIC , + TYPE_XIVE_FABRIC)typedef struct XiveFabricClass XiveFabricClass ;DECLARE_CLASS_CHECKERS (XiveFabricClass,XIVE_FABRIC ,TYPE_XIVE_FABRIC )
include/hw/rdma/rdma.h +3 -4
@@ -22,11 +22,10 @@typedef struct RdmaProviderClass RdmaProviderClass ;DECLARE_CLASS_CHECKERS (RdmaProviderClass,RDMA_PROVIDER , INTERFACE_RDMA_PROVIDER) -#define RDMA_PROVIDER (obj) \ - OBJECT_CHECK(RdmaProvider, (obj), \ - INTERFACE_RDMA_PROVIDER) -typedef struct RdmaProvider RdmaProvider ; +DECLARE_INSTANCE_CHECKER (RdmaProvider,RDMA_PROVIDER , + INTERFACE_RDMA_PROVIDER) +struct RdmaProviderClass {InterfaceClass parent;
include/hw/rtc/m48t59.h +3 -3
@@ -34,10 +34,10 @@typedef struct NvramClass NvramClass ;DECLARE_CLASS_CHECKERS (NvramClass,NVRAM , TYPE_NVRAM) -#define NVRAM (obj) \ - OBJECT_CHECK(Nvram, (obj), TYPE_NVRAM) -typedef struct Nvram Nvram ; +DECLARE_INSTANCE_CHECKER (Nvram,NVRAM , + TYPE_NVRAM) +struct NvramClass {InterfaceClass parent;
include/hw/stream.h +3 -3
@@ -9,10 +9,10 @@typedef struct StreamSlaveClass StreamSlaveClass ;DECLARE_CLASS_CHECKERS (StreamSlaveClass,STREAM_SLAVE , TYPE_STREAM_SLAVE) -#define STREAM_SLAVE (obj) \ - OBJECT_CHECK(StreamSlave, (obj), TYPE_STREAM_SLAVE) -typedef struct StreamSlave StreamSlave ; +DECLARE_INSTANCE_CHECKER (StreamSlave,STREAM_SLAVE , + TYPE_STREAM_SLAVE) +typedef void (*StreamCanPushNotifyFn )(void *opaque);
include/hw/vmstate-if.h +3 -3
@@ -16,10 +16,10 @@typedef struct VMStateIfClass VMStateIfClass ;DECLARE_CLASS_CHECKERS (VMStateIfClass,VMSTATE_IF , TYPE_VMSTATE_IF) -#define VMSTATE_IF (obj) \ - OBJECT_CHECK(VMStateIf, (obj), TYPE_VMSTATE_IF) -typedef struct VMStateIf VMStateIf ; +DECLARE_INSTANCE_CHECKER (VMStateIf,VMSTATE_IF , + TYPE_VMSTATE_IF) +struct VMStateIfClass {InterfaceClass parent_class;
include/qom/object_interfaces.h +3 -4
@@ -9,11 +9,10 @@typedef struct UserCreatableClass UserCreatableClass ;DECLARE_CLASS_CHECKERS (UserCreatableClass,USER_CREATABLE , TYPE_USER_CREATABLE) -#define USER_CREATABLE (obj) \ - OBJECT_CHECK(UserCreatable, (obj), \ - TYPE_USER_CREATABLE) -typedef struct UserCreatable UserCreatable ; +DECLARE_INSTANCE_CHECKER (UserCreatable,USER_CREATABLE , +TYPE_USER_CREATABLE ) +/** * UserCreatableClass:
include/sysemu/tpm.h +3 -3
@@ -29,10 +29,10 @@ typedef enum TPMVersion {typedef struct TPMIfClass TPMIfClass ;DECLARE_CLASS_CHECKERS (TPMIfClass,TPM_IF , TYPE_TPM_IF) -#define TPM_IF (obj) \ - OBJECT_CHECK(TPMIf, (obj), TYPE_TPM_IF) -typedef struct TPMIf TPMIf ; +DECLARE_INSTANCE_CHECKER (TPMIf,TPM_IF , + TYPE_TPM_IF) +struct TPMIfClass {InterfaceClass parent_class;
target/arm/idau.h +3 -3
@@ -31,13 +31,13 @@#include "qom/object.h" #define TYPE_IDAU_INTERFACE "idau-interface" -#define IDAU_INTERFACE (obj) \ - OBJECT_CHECK(IDAUInterface, (obj), TYPE_IDAU_INTERFACE) +typedef struct IDAUInterface IDAUInterface ; +DECLARE_INSTANCE_CHECKER (IDAUInterface,IDAU_INTERFACE , + TYPE_IDAU_INTERFACE)typedef struct IDAUInterfaceClass IDAUInterfaceClass ;DECLARE_CLASS_CHECKERS (IDAUInterfaceClass,IDAU_INTERFACE , TYPE_IDAU_INTERFACE) -typedef struct IDAUInterface IDAUInterface ;#define IREGION_NOTVALID -1
tests/check-qom-interface.c +3 -3
@@ -19,10 +19,10 @@typedef struct TestIfClass TestIfClass ;DECLARE_CLASS_CHECKERS (TestIfClass,TEST_IF , TYPE_TEST_IF) -#define TEST_IF (obj) \ - OBJECT_CHECK(TestIf, (obj), TYPE_TEST_IF) -typedef struct TestIf TestIf ; +DECLARE_INSTANCE_CHECKER (TestIf,TEST_IF , + TYPE_TEST_IF) +struct TestIfClass {InterfaceClass parent_class;
Signature · 1 line
2.26.2
cover qom: Replace INTERFACE_CHECK with OBJECT_CHECK
This series replaces INTERFACE_CHECK with OBJECT_CHECK because both macros are exactly the same.
The last patch is a new run of the OBJECT_CHECK -> DECLARE*_CHECKER* converter script that will convert the former INTERFACE_CHECK-based macros.
Eduardo Habkost (3):
qom: Correct object_class_dynamic_cast_assert() documentation
qom: Replace INTERFACE_CHECK with OBJECT_CHECK [automated] Use DECLARE_*CHECKER* macros
include/hw/acpi/acpi_dev_interface.h | 7 +++---- include/hw/arm/linux-boot-if.h | 6 +++--- include/hw/fw-path-provider.h | 6 +++--- include/hw/hotplug.h | 6 +++--- include/hw/intc/intc.h | 7 +++---- include/hw/ipmi/ipmi.h | 6 +++--- include/hw/isa/isa.h | 2 +- include/hw/mem/memory-device.h | 6 +++--- include/hw/nmi.h | 6 +++--- include/hw/ppc/pnv_xscom.h | 4 ++-- include/hw/ppc/spapr_irq.h | 4 ++-- include/hw/ppc/xics.h | 4 ++-- include/hw/ppc/xive.h | 12 ++++++------ include/hw/rdma/rdma.h | 7 +++---- include/hw/rtc/m48t59.h | 6 +++--- include/hw/stream.h | 6 +++--- include/hw/vmstate-if.h | 6 +++--- include/qom/object.h | 14 +------------- include/qom/object_interfaces.h | 7 +++---- include/sysemu/tpm.h | 6 +++--- target/arm/idau.h | 6 +++--- tests/check-qom-interface.c | 6 +++--- 22 files changed, 62 insertions(+), 78 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/3 qom: Correct object_class_dynamic_cast_assert() documentation
object_class_dynamic_cast_assert() is not used by INTERFACE_CHECK, remove misleading mention of that function in the documentation.
---
Cc: Paolo Bonzini <[email protected]>
Cc: "Daniel P. Berrangé" <[email protected]>
Cc: Eduardo Habkost <[email protected]>
Cc: [email protected]
--- include/qom/object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/qom/object.h +1 -1
@@ -1257,7 +1257,7 @@ type_init(do_qemu_init_ ## type_array)* of this function. The only difference in behavior is that this function * asserts instead of returning #NULL on failure if QOM cast debugging is * enabled. This function is not meant to be called directly, but only through -* the wrapper macros OBJECT_CLASS_CHECK and INTERFACE_CHECK. +* the wrapper macro OBJECT_CLASS_CHECK. */ ObjectClass *object_class_dynamic_cast_assert(ObjectClass *klass, const char *typename,
Signature · 1 line
2.26.2
Hi
Quoted 8 lines · Eduardo Habkost
This series replaces
INTERFACE_CHECKwithOBJECT_CHECKbecause both macros are exactly the same.The last patch is a new run of the
OBJECT_CHECK-> DECLARE*_CHECKER* converter script that will convert the former INTERFACE_CHECK-based macros.
Well, at least having a different macro allows to tweak qom implementation or replace it with something different more easily.
I have some wip branch somewhere where I actually made Interface a different beast than Object (it was saving some fields, and avoiding some potentially wrong casts iirc - I didn't bother to upstream that yet). Also I have a different branch where I played with GObject to replace qom. In both cases, your proposal would have, or would make, the work more complicated.
Eduardo Habkost (3):
Quoted 34 lines
qom: Correct
object_class_dynamic_cast_assert()documentation
qom: ReplaceINTERFACE_CHECKwithOBJECT_CHECK[automated] Use DECLARE_*CHECKER* macrosinclude/hw/acpi/acpi_dev_interface.h | 7 +++---- include/hw/arm/linux-boot-if.h | 6 +++--- include/hw/fw-path-provider.h | 6 +++--- include/hw/hotplug.h | 6 +++--- include/hw/intc/intc.h | 7 +++---- include/hw/ipmi/ipmi.h | 6 +++--- include/hw/isa/isa.h | 2 +- include/hw/mem/memory-device.h | 6 +++--- include/hw/nmi.h | 6 +++--- include/hw/ppc/pnv_xscom.h | 4 ++-- include/hw/ppc/spapr_irq.h | 4 ++-- include/hw/ppc/xics.h | 4 ++-- include/hw/ppc/xive.h | 12 ++++++------ include/hw/rdma/rdma.h | 7 +++---- include/hw/rtc/m48t59.h | 6 +++--- include/hw/stream.h | 6 +++--- include/hw/vmstate-if.h | 6 +++--- include/qom/object.h | 14 +------------- include/qom/object_interfaces.h | 7 +++---- include/sysemu/tpm.h | 6 +++--- target/arm/idau.h | 6 +++--- tests/check-qom-interface.c | 6 +++--- 22 files changed, 62 insertions(+), 78 deletions(-)--
2.26.2
Signature · 1 line
Marc-André Lureau
Quoted 16 lines · Marc-André Lureau
Hi
Quoted 8 lines · Eduardo Habkost
This series replaces
INTERFACE_CHECKwithOBJECT_CHECKbecause both macros are exactly the same.The last patch is a new run of the
OBJECT_CHECK-> DECLARE*_CHECKER* converter script that will convert the former INTERFACE_CHECK-based macros.Well, at least having a different macro allows to tweak qom implementation or replace it with something different more easily.
Quoted 6 lines
I have some wip branch somewhere where I actually made Interface a different beast than Object (it was saving some fields, and avoiding some potentially wrong casts iirc - I didn't bother to upstream that yet). Also I have a different branch where I played with GObject to replace qom. In both cases, your proposal would have, or would make, the work more complicated.
If there are expectations that the distinction will become useful, we can keep it by now.
I will submit a different proposal to have aDECLARE_INTERFACE_CHECKER macro similar toDECLARE_INSTANCE_CHECKER, followed by aOBJECT_DECLARE_INTERFACE_TYPE macro similar toOBJECT_DECLARE_TYPE.
Signature · 1 line
Eduardo
Quoted 2 lines · Eduardo Habkost
This series replaces
INTERFACE_CHECKwithOBJECT_CHECKbecause both macros are exactly the same.
See also issue#2 in
Subject: Issues around TYPE_INTERFACE
Date: Tue, 12 Mar 2019 11:50:54 +0100
Message-ID: <[email protected]>
https://lists.nongnu.org/archive/html/qemu-devel/2019-03/msg03840.htmlQuoted 3 lines
The last patch is a new run of the
OBJECT_CHECK-> DECLARE*_CHECKER* converter script that will convert the former INTERFACE_CHECK-based macros.
Quoted 16 lines · Marc-André Lureau
Hi
On Wed, Sep 16, 2020 at 11:35 PM Eduardo Habkost <[email protected] <mailto:[email protected]>> wrote:
This series replaces
INTERFACE_CHECKwithOBJECT_CHECKbecause both macros are exactly the same.The last patch is a new run of the
OBJECT_CHECK-> DECLARE*_CHECKER* converter script that will convert the former INTERFACE_CHECK-based macros.Well, at least having a different macro allows to tweak qom implementation or replace it with something different more easily.
Quoted 6 lines
I have some wip branch somewhere where I actually made Interface a different beast than Object (it was saving some fields, and avoiding some potentially wrong casts iirc - I didn't bother to upstream that yet). Also I have a different branch where I played with GObject to replace qom. In both cases, your proposal would have, or would make, the work more complicated.
Considering "wip branch not bothered to upstream" as "fork", your comment from [*] applies here...
You can't blame upstream from doing cleanups and modernization, or stagnating. Forks are forks, with all the pain they carry. If they want to avoid the maintenance cost, they have to do the extra effort to get it upstream. This is also a "sneaky way" to remind them that effort is better spent in this direction.
[*] https://www.mail-archive.com/[email protected]/msg720284.html
Hi
Quoted 27 lines · Philippe Mathieu-Daudé
Quoted 16 lines · Marc-André Lureau
Hi
On Wed, Sep 16, 2020 at 11:35 PM Eduardo Habkost <[email protected] <mailto:[email protected]>> wrote:
This series replaces
INTERFACE_CHECKwithOBJECT_CHECKbecause both macros are exactly the same.The last patch is a new run of the
OBJECT_CHECK-> DECLARE*_CHECKER* converter script that will convert the former INTERFACE_CHECK-based macros.Well, at least having a different macro allows to tweak qom implementation or replace it with something different more easily.
Quoted 6 lines
I have some wip branch somewhere where I actually made Interface a different beast than Object (it was saving some fields, and avoiding some potentially wrong casts iirc - I didn't bother to upstream that yet). Also I have a different branch where I played with GObject to replace qom. In both cases, your proposal would have, or would make, the work more complicated.
Considering "wip branch not bothered to upstream" as "fork", your comment from [*] applies here...
Quoted 9 lines
You can't blame upstream from doing cleanups and modernization, or stagnating. Forks are forks, with all the pain they carry. If they want to avoid the maintenance cost, they have to do the extra effort to get it upstream. This is also a "sneaky way" to remind them that effort is better spent in this direction.
[*] https://www.mail-archive.com/[email protected]/msg720284.html
Fair enough. Note I didn't nack it, but in general the proposal seems to blurry some worthy semantic difference between object & interface. Maybe #define alias INTERFACE_CHECK with OBJECT_CHECK instead ?
Signature · 1 line
Marc-André Lureau
Quoted 38 lines · Marc-André Lureau
Hi
Quoted 33 lines · Philippe Mathieu-Daudé
Quoted 16 lines · Marc-André Lureau
Hi
On Wed, Sep 16, 2020 at 11:35 PM Eduardo Habkost <[email protected] <mailto:[email protected]>> wrote:
This series replaces
INTERFACE_CHECKwithOBJECT_CHECKbecause both macros are exactly the same.The last patch is a new run of the
OBJECT_CHECK-> DECLARE*_CHECKER* converter script that will convert the former INTERFACE_CHECK-based macros.Well, at least having a different macro allows to tweak qom implementation or replace it with something different more easily.
Quoted 6 lines
I have some wip branch somewhere where I actually made Interface a different beast than Object (it was saving some fields, and avoiding some potentially wrong casts iirc - I didn't bother to upstream that yet). Also I have a different branch where I played with GObject to replace qom. In both cases, your proposal would have, or would make, the work more complicated.
Considering "wip branch not bothered to upstream" as "fork", your comment from [*] applies here...
You can't blame upstream from doing cleanups and modernization, or stagnating. Forks are forks, with all the pain they carry. If they want to avoid the maintenance cost, they have to do the extra effort to get it upstream. This is also a "sneaky way" to remind them that effort is better spent in this direction.
Quoted 6 lines
Quoted 3 lines
[*] https://www.mail-archive.com/[email protected]/msg720284.html
Fair enough. Note I didn't nack it, but in general the proposal seems to blurry some worthy semantic difference between object & interface. Maybe #define alias
INTERFACE_CHECKwithOBJECT_CHECKinstead ?
I'm actually considering deleting INTERFACE_CHECK and OBJECT_CHECK completely after we finish the boilerplate conversion, and tell everybody to use OBJECT_DECLARE_INTERFACE/OBJECT_DECLARE_TYPE instead.
Signature · 1 line
Eduardo