qom: DECLARE_INTERFACE_CHECKER macro
v2 cover qom: DECLARE_INTERFACE_CHECKER macro
This is an alternative to the series:
Subject: [PATCH 0/3] qom: Replace INTERFACE_CHECK with OBJECT_CHECK
https://lore.kernel.org/qemu-devel/[email protected]/
Instead of removing INTERFACE_CHECK completely, keep it but use a DECLARE_INTERFACE_CHECKER macro to define the type checking functions for interface types.
Changes v1 -> v2:
* Move declaration after typedefs, so the code actually compiles
Link to v1:
https://lore.kernel.org/qemu-devel/[email protected]
Eduardo Habkost (2):
qom: DECLARE_INTERFACE_CHECKER macro
qom: Use DECLARE_INTERFACE_CHECKER macro
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 | 4 ++-- 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, 76 insertions(+), 66 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/2 qom: DECLARE_INTERFACE_CHECKER macro
The new macro will be similar to DECLARE_INSTANCE_CHECKER, but for interface types (that use INTEFACE_CHECK instead of OBJECT_CHECK).
---
Changes series v1 -> v2: none
---
Cc: Paolo Bonzini <[email protected]>
Cc: "Daniel P. Berrangé" <[email protected]>
Cc: Eduardo Habkost <[email protected]>
Cc: [email protected]
--- include/qom/object.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
include/qom/object.h +14 -0
@@ -571,6 +571,20 @@ struct Object OBJ_NAME(const void *obj) \ {return OBJECT_CHECK (InstanceType, obj,TYPENAME ); } +/** +* DECLARE_INTERFACE_CHECKER: +* @InstanceType: instance type +* @OBJ_NAME: the object name in uppercase with underscore separators +* @TYPENAME: type name +* +* This macro will provide the instance type cast functions for a +* QOM interface type. +*/ +#define DECLARE_INTERFACE_CHECKER (InstanceType,OBJ_NAME ,TYPENAME ) \ + static inline G_GNUC_UNUSED InstanceType * \ + OBJ_NAME(const void *obj) \ + { return INTERFACE_CHECK(InstanceType, obj, TYPENAME); } +/** * DECLARE_CLASS_CHECKERS: * @ClassType: class struct name
Signature · 1 line
2.26.2
PATCH v2 2/2 qom: Use DECLARE_INTERFACE_CHECKER macro
In reply to Eduardo HabkostMechanical search/replace to use the new DECLARE_INTERFACE_CHECKER macro instead of manually defining macros using INTERFACE_CHECK.
---
This is an alternative to the patches submitted at
https://lore.kernel.org/qemu-devel/[email protected]/
https://lore.kernel.org/qemu-devel/[email protected]/
---
Changes v1 -> v2:
* Build fix: move declarations after typedef
---
--- 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 | 4 ++-- 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 +++--- 21 files changed, 62 insertions(+), 66 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) \ - INTERFACE_CHECK(AcpiDeviceIf, (obj), \ - TYPE_ACPI_DEVICE_IF) -typedef struct AcpiDeviceIf AcpiDeviceIf ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(ARMLinuxBootIf, (obj), TYPE_ARM_LINUX_BOOT_IF) -typedef struct ARMLinuxBootIf ARMLinuxBootIf ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(FWPathProvider, (obj), TYPE_FW_PATH_PROVIDER) -typedef struct FWPathProvider FWPathProvider ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(HotplugHandler, (obj), TYPE_HOTPLUG_HANDLER) -typedef struct HotplugHandler HotplugHandler ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(InterruptStatsProvider, (obj), \ - TYPE_INTERRUPT_STATS_PROVIDER) -typedef struct InterruptStatsProvider InterruptStatsProvider ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(IPMIInterface, (obj), TYPE_IPMI_INTERFACE) +typedef struct IPMIInterface IPMIInterface ; +DECLARE_INTERFACE_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/isa/isa.h +2 -2
@@ -38,8 +38,8 @@ static inline uint16_t applesmc_port(void)typedef struct IsaDmaClass IsaDmaClass ;DECLARE_CLASS_CHECKERS (IsaDmaClass,ISADMA , TYPE_ISADMA) -#define ISADMA (obj) \ - INTERFACE_CHECK(IsaDma, (obj), TYPE_ISADMA) +DECLARE_INTERFACE_CHECKER (IsaDma,ISADMA , + TYPE_ISADMA) typedef enum { ISADMA_TRANSFER_VERIFY,
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) \ - INTERFACE_CHECK(MemoryDeviceState, (obj), TYPE_MEMORY_DEVICE) -typedef struct MemoryDeviceState MemoryDeviceState ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(NMIState, (obj), TYPE_NMI) -typedef struct NMIState NMIState ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(PnvXScomInterface, (obj), TYPE_PNV_XSCOM_INTERFACE) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(SpaprInterruptController, (obj), TYPE_SPAPR_INTC) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(XICSFabric, (obj), TYPE_XICS_FABRIC) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(XiveNotifier, (obj), TYPE_XIVE_NOTIFIER) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(XivePresenter, (obj), TYPE_XIVE_PRESENTER) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(XiveFabric, (obj), TYPE_XIVE_FABRIC) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(RdmaProvider, (obj), \ - INTERFACE_RDMA_PROVIDER) -typedef struct RdmaProvider RdmaProvider ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(Nvram, (obj), TYPE_NVRAM) -typedef struct Nvram Nvram ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(StreamSlave, (obj), TYPE_STREAM_SLAVE) -typedef struct StreamSlave StreamSlave ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(VMStateIf, (obj), TYPE_VMSTATE_IF) -typedef struct VMStateIf VMStateIf ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(UserCreatable, (obj), \ - TYPE_USER_CREATABLE) -typedef struct UserCreatable UserCreatable ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(TPMIf, (obj), TYPE_TPM_IF) -typedef struct TPMIf TPMIf ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(IDAUInterface, (obj), TYPE_IDAU_INTERFACE) +typedef struct IDAUInterface IDAUInterface ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(TestIf, (obj), TYPE_TEST_IF) -typedef struct TestIf TestIf ; +DECLARE_INTERFACE_CHECKER (TestIf,TEST_IF , + TYPE_TEST_IF) +struct TestIfClass {InterfaceClass parent_class;
Signature · 1 line
2.26.2
Re: [PATCH v2 2/2] qom: Use DECLARE_INTERFACE_CHECKER macro
Quoted 6 lines · Eduardo Habkost
Mechanical search/replace to use the new
DECLARE_INTERFACE_CHECKERmacro instead of manually defining macros usingINTERFACE_CHECK.Acked-by David Gibson <[email protected]>Signed-off-by Eduardo Habkost <[email protected]>
Quoted 7 lines
---
This is an alternative to the patches submitted at
https://lore.kernel.org/qemu-devel/[email protected]/
https://lore.kernel.org/qemu-devel/[email protected]/
---
Changes v1 -> v2:
* Build fix: move declarations after typedef
Would it be possible to move the typedef in the DECLARE_INTERFACE_CHECKER macro ?
C.
Quoted 440 lines
---
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]>Signed-off-by Eduardo Habkost <[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/isa/isa.h | 4 ++-- 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 +++--- 21 files changed, 62 insertions(+), 66 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) \ - INTERFACE_CHECK(AcpiDeviceIf, (obj), \ - TYPE_ACPI_DEVICE_IF) -typedef struct AcpiDeviceIf AcpiDeviceIf ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(ARMLinuxBootIf, (obj), TYPE_ARM_LINUX_BOOT_IF) -typedef struct ARMLinuxBootIf ARMLinuxBootIf ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(FWPathProvider, (obj), TYPE_FW_PATH_PROVIDER) -typedef struct FWPathProvider FWPathProvider ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(HotplugHandler, (obj), TYPE_HOTPLUG_HANDLER) -typedef struct HotplugHandler HotplugHandler ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(InterruptStatsProvider, (obj), \ - TYPE_INTERRUPT_STATS_PROVIDER) -typedef struct InterruptStatsProvider InterruptStatsProvider ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(IPMIInterface, (obj), TYPE_IPMI_INTERFACE) +typedef struct IPMIInterface IPMIInterface ; +DECLARE_INTERFACE_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/isa/isa.h +2
-2@@ -38,8 +38,8 @@ static inline uint16_t applesmc_port(void)typedef struct IsaDmaClass IsaDmaClass ;DECLARE_CLASS_CHECKERS (IsaDmaClass,ISADMA , TYPE_ISADMA) -#define ISADMA (obj) \ - INTERFACE_CHECK(IsaDma, (obj), TYPE_ISADMA) +DECLARE_INTERFACE_CHECKER (IsaDma,ISADMA , + TYPE_ISADMA) typedef enum { ISADMA_TRANSFER_VERIFY,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) \ - INTERFACE_CHECK(MemoryDeviceState, (obj), TYPE_MEMORY_DEVICE) -typedef struct MemoryDeviceState MemoryDeviceState ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(NMIState, (obj), TYPE_NMI) -typedef struct NMIState NMIState ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(PnvXScomInterface, (obj), TYPE_PNV_XSCOM_INTERFACE) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(SpaprInterruptController, (obj), TYPE_SPAPR_INTC) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(XICSFabric, (obj), TYPE_XICS_FABRIC) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(XiveNotifier, (obj), TYPE_XIVE_NOTIFIER) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(XivePresenter, (obj), TYPE_XIVE_PRESENTER) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(XiveFabric, (obj), TYPE_XIVE_FABRIC) +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(RdmaProvider, (obj), \ - INTERFACE_RDMA_PROVIDER) -typedef struct RdmaProvider RdmaProvider ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(Nvram, (obj), TYPE_NVRAM) -typedef struct Nvram Nvram ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(StreamSlave, (obj), TYPE_STREAM_SLAVE) -typedef struct StreamSlave StreamSlave ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(VMStateIf, (obj), TYPE_VMSTATE_IF) -typedef struct VMStateIf VMStateIf ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(UserCreatable, (obj), \ - TYPE_USER_CREATABLE) -typedef struct UserCreatable UserCreatable ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(TPMIf, (obj), TYPE_TPM_IF) -typedef struct TPMIf TPMIf ; +DECLARE_INTERFACE_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) \ - INTERFACE_CHECK(IDAUInterface, (obj), TYPE_IDAU_INTERFACE) +typedef struct IDAUInterface IDAUInterface ; +DECLARE_INTERFACE_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 -1tests/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) \ - INTERFACE_CHECK(TestIf, (obj), TYPE_TEST_IF) -typedef struct TestIf TestIf ; +DECLARE_INTERFACE_CHECKER (TestIf,TEST_IF , + TYPE_TEST_IF) +struct TestIfClass {InterfaceClass parent_class;
Re: [PATCH v2 2/2] qom: Use DECLARE_INTERFACE_CHECKER macro
Quoted 15 lines · Cédric Le Goater
Quoted 6 lines · Eduardo Habkost
Mechanical search/replace to use the new
DECLARE_INTERFACE_CHECKERmacro instead of manually defining macros usingINTERFACE_CHECK.Acked-by David Gibson <[email protected]>Signed-off-by Eduardo Habkost <[email protected]>Quoted 7 lines
---
This is an alternative to the patches submitted at
https://lore.kernel.org/qemu-devel/[email protected]/
https://lore.kernel.org/qemu-devel/[email protected]/
---
Changes v1 -> v2:
* Build fix: move declarations after typedef
Quoted 2 lines
Would it be possible to move the typedef in the
DECLARE_INTERFACE_CHECKERmacro ?
The typedef will be moved later to a OBJECT_DECLARE_INTERFACE macro, to follow the same pattern as DECLARE_INTERFACE_CHECKER/OBJECT_DECLARE_TYPE.
Signature · 1 line
Eduardo