refactor(qom/object): optimise out object class cast using compile-time knowledge

VisualEhrmanntraut · VisualEhrmanntraut · commit 9863d2c31a2a · 2026-03-03T06:54:23.000+02:00
diff --git a/hw/nvram/npcm7xx_otp.c b/hw/nvram/npcm7xx_otp.c
@@ -73,9 +73,9 @@ struct NPCM7xxOTPClass {
 };
 
 #define NPCM7XX_OTP_CLASS(klass) \
-    OBJECT_CLASS_CHECK(NPCM7xxOTPClass, (klass), TYPE_NPCM7XX_OTP)
+    OBJECT_CLASS_CHECK(NPCM7xxOTPClass, (klass), NPCM7XX_OTP, TYPE_NPCM7XX_OTP)
 #define NPCM7XX_OTP_GET_CLASS(obj) \
-    OBJECT_GET_CLASS(NPCM7xxOTPClass, (obj), TYPE_NPCM7XX_OTP)
+    OBJECT_GET_CLASS(NPCM7xxOTPClass, (obj), NPCM7XX_OTP, TYPE_NPCM7XX_OTP)
 
 static uint8_t ecc_encode_nibble(uint8_t n)
 {
diff --git a/include/hw/acpi/acpi_aml_interface.h b/include/hw/acpi/acpi_aml_interface.h
@@ -7,7 +7,7 @@
 
 #define TYPE_ACPI_DEV_AML_IF "acpi-dev-aml-interface"
 typedef struct AcpiDevAmlIfClass AcpiDevAmlIfClass;
-DECLARE_CLASS_CHECKERS(AcpiDevAmlIfClass, ACPI_DEV_AML_IF, TYPE_ACPI_DEV_AML_IF)
+DECLARE_CLASS_CHECKERS_IF(AcpiDevAmlIfClass, ACPI_DEV_AML_IF, TYPE_ACPI_DEV_AML_IF)
 #define ACPI_DEV_AML_IF(obj) \
      INTERFACE_CHECK(AcpiDevAmlIf, (obj), TYPE_ACPI_DEV_AML_IF)
 
diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h
@@ -18,7 +18,7 @@ typedef enum {
 #define TYPE_ACPI_DEVICE_IF "acpi-device-interface"
 
 typedef struct AcpiDeviceIfClass AcpiDeviceIfClass;
-DECLARE_CLASS_CHECKERS(AcpiDeviceIfClass, ACPI_DEVICE_IF,
+DECLARE_CLASS_CHECKERS_IF(AcpiDeviceIfClass, ACPI_DEVICE_IF,
                        TYPE_ACPI_DEVICE_IF)
 #define ACPI_DEVICE_IF(obj) \
      INTERFACE_CHECK(AcpiDeviceIf, (obj), \
diff --git a/include/hw/arm/linux-boot-if.h b/include/hw/arm/linux-boot-if.h
@@ -10,7 +10,7 @@
 
 #define TYPE_ARM_LINUX_BOOT_IF "arm-linux-boot-if"
 typedef struct ARMLinuxBootIfClass ARMLinuxBootIfClass;
-DECLARE_CLASS_CHECKERS(ARMLinuxBootIfClass, ARM_LINUX_BOOT_IF,
+DECLARE_CLASS_CHECKERS_IF(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)
diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h
@@ -74,9 +74,9 @@ typedef struct NPCM7xxMachineClass {
 } NPCM7xxMachineClass;
 
 #define NPCM7XX_MACHINE_CLASS(klass)                                    \
-    OBJECT_CLASS_CHECK(NPCM7xxMachineClass, (klass), TYPE_NPCM7XX_MACHINE)
+    OBJECT_CLASS_CHECK(NPCM7xxMachineClass, (klass), NPCM7XX_MACHINE, TYPE_NPCM7XX_MACHINE)
 #define NPCM7XX_MACHINE_GET_CLASS(obj)                                  \
-    OBJECT_GET_CLASS(NPCM7xxMachineClass, (obj), TYPE_NPCM7XX_MACHINE)
+    OBJECT_GET_CLASS(NPCM7xxMachineClass, (obj), NPCM7XX_MACHINE, TYPE_NPCM7XX_MACHINE)
 
 struct NPCM7xxState {
     DeviceState         parent;
diff --git a/include/hw/cxl/cxl.h b/include/hw/cxl/cxl.h
@@ -63,12 +63,14 @@ OBJECT_DECLARE_SIMPLE_TYPE(CXLHost, PXB_CXL_HOST)
 #define TYPE_CXL_USP "cxl-upstream"
 
 typedef struct CXLUpstreamPort CXLUpstreamPort;
+DO_OBJECT_INTERFACE_INFO(CXL_USP, false);
 DECLARE_INSTANCE_CHECKER(CXLUpstreamPort, CXL_USP, TYPE_CXL_USP)
 CXLComponentState *cxl_usp_to_cstate(CXLUpstreamPort *usp);
 
 #define TYPE_CXL_DSP "cxl-downstream"
 
 typedef struct CXLDownstreamPort CXLDownstreamPort;
+DO_OBJECT_INTERFACE_INFO(CXL_DSP, false);
 DECLARE_INSTANCE_CHECKER(CXLDownstreamPort, CXL_DSP, TYPE_CXL_DSP)
 
 #endif
diff --git a/include/hw/fw-path-provider.h b/include/hw/fw-path-provider.h
@@ -23,7 +23,7 @@
 #define TYPE_FW_PATH_PROVIDER "fw-path-provider"
 
 typedef struct FWPathProviderClass FWPathProviderClass;
-DECLARE_CLASS_CHECKERS(FWPathProviderClass, FW_PATH_PROVIDER,
+DECLARE_CLASS_CHECKERS_IF(FWPathProviderClass, FW_PATH_PROVIDER,
                        TYPE_FW_PATH_PROVIDER)
 #define FW_PATH_PROVIDER(obj) \
      INTERFACE_CHECK(FWPathProvider, (obj), TYPE_FW_PATH_PROVIDER)
diff --git a/include/hw/hotplug.h b/include/hw/hotplug.h
@@ -17,7 +17,7 @@
 #define TYPE_HOTPLUG_HANDLER "hotplug-handler"
 
 typedef struct HotplugHandlerClass HotplugHandlerClass;
-DECLARE_CLASS_CHECKERS(HotplugHandlerClass, HOTPLUG_HANDLER,
+DECLARE_CLASS_CHECKERS_IF(HotplugHandlerClass, HOTPLUG_HANDLER,
                        TYPE_HOTPLUG_HANDLER)
 #define HOTPLUG_HANDLER(obj) \
      INTERFACE_CHECK(HotplugHandler, (obj), TYPE_HOTPLUG_HANDLER)
diff --git a/include/hw/intc/intc.h b/include/hw/intc/intc.h
@@ -6,7 +6,7 @@
 #define TYPE_INTERRUPT_STATS_PROVIDER "intctrl"
 
 typedef struct InterruptStatsProviderClass InterruptStatsProviderClass;
-DECLARE_CLASS_CHECKERS(InterruptStatsProviderClass, INTERRUPT_STATS_PROVIDER,
+DECLARE_CLASS_CHECKERS_IF(InterruptStatsProviderClass, INTERRUPT_STATS_PROVIDER,
                        TYPE_INTERRUPT_STATS_PROVIDER)
 #define INTERRUPT_STATS_PROVIDER(obj) \
     INTERFACE_CHECK(InterruptStatsProvider, (obj), \
diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h
@@ -127,7 +127,7 @@ uint32_t ipmi_next_uuid(void);
 #define IPMI_INTERFACE(obj) \
      INTERFACE_CHECK(IPMIInterface, (obj), TYPE_IPMI_INTERFACE)
 typedef struct IPMIInterfaceClass IPMIInterfaceClass;
-DECLARE_CLASS_CHECKERS(IPMIInterfaceClass, IPMI_INTERFACE,
+DECLARE_CLASS_CHECKERS_IF(IPMIInterfaceClass, IPMI_INTERFACE,
                        TYPE_IPMI_INTERFACE)
 
 typedef struct IPMIInterface IPMIInterface;
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
@@ -19,7 +19,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(ISABus, ISA_BUS)
 #define TYPE_ISADMA "isa-dma"
 
 typedef struct IsaDmaClass IsaDmaClass;
-DECLARE_CLASS_CHECKERS(IsaDmaClass, ISADMA,
+DECLARE_CLASS_CHECKERS_IF(IsaDmaClass, ISADMA,
                        TYPE_ISADMA)
 #define ISADMA(obj) \
     INTERFACE_CHECK(IsaDma, (obj), TYPE_ISADMA)
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
@@ -20,7 +20,7 @@
 #define TYPE_MEMORY_DEVICE "memory-device"
 
 typedef struct MemoryDeviceClass MemoryDeviceClass;
-DECLARE_CLASS_CHECKERS(MemoryDeviceClass, MEMORY_DEVICE,
+DECLARE_CLASS_CHECKERS_IF(MemoryDeviceClass, MEMORY_DEVICE,
                        TYPE_MEMORY_DEVICE)
 #define MEMORY_DEVICE(obj) \
      INTERFACE_CHECK(MemoryDeviceState, (obj), TYPE_MEMORY_DEVICE)
diff --git a/include/hw/misc/xlnx-cfi-if.h b/include/hw/misc/xlnx-cfi-if.h
@@ -15,7 +15,7 @@
 
 #define TYPE_XLNX_CFI_IF "xlnx-cfi-if"
 typedef struct XlnxCfiIfClass XlnxCfiIfClass;
-DECLARE_CLASS_CHECKERS(XlnxCfiIfClass, XLNX_CFI_IF, TYPE_XLNX_CFI_IF)
+DECLARE_CLASS_CHECKERS_IF(XlnxCfiIfClass, XLNX_CFI_IF, TYPE_XLNX_CFI_IF)
 
 #define XLNX_CFI_IF(obj) \
      INTERFACE_CHECK(XlnxCfiIf, (obj), TYPE_XLNX_CFI_IF)
diff --git a/include/hw/nmi.h b/include/hw/nmi.h
@@ -27,7 +27,7 @@
 #define TYPE_NMI "nmi"
 
 typedef struct NMIClass NMIClass;
-DECLARE_CLASS_CHECKERS(NMIClass, NMI,
+DECLARE_CLASS_CHECKERS_IF(NMIClass, NMI,
                        TYPE_NMI)
 #define NMI(obj) \
      INTERFACE_CHECK(NMIState, (obj), TYPE_NMI)
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
@@ -17,7 +17,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(FWCfgIoState, FW_CFG_IO)
 OBJECT_DECLARE_SIMPLE_TYPE(FWCfgMemState, FW_CFG_MEM)
 
 typedef struct FWCfgDataGeneratorClass FWCfgDataGeneratorClass;
-DECLARE_CLASS_CHECKERS(FWCfgDataGeneratorClass, FW_CFG_DATA_GENERATOR,
+DECLARE_CLASS_CHECKERS_IF(FWCfgDataGeneratorClass, FW_CFG_DATA_GENERATOR,
                        TYPE_FW_CFG_DATA_GENERATOR_INTERFACE)
 
 struct FWCfgDataGeneratorClass {
diff --git a/include/hw/nvram/npcm7xx_otp.h b/include/hw/nvram/npcm7xx_otp.h
@@ -16,6 +16,7 @@
 #ifndef NPCM7XX_OTP_H
 #define NPCM7XX_OTP_H
 
+#include "qom/object.h"
 #include "system/memory.h"
 #include "hw/sysbus.h"
 
@@ -57,6 +58,7 @@ typedef struct NPCM7xxOTPState {
 
 #define TYPE_NPCM7XX_OTP "npcm7xx-otp"
 #define NPCM7XX_OTP(obj) OBJECT_CHECK(NPCM7xxOTPState, (obj), TYPE_NPCM7XX_OTP)
+DO_OBJECT_INTERFACE_INFO(NPCM7XX_OTP, false);
 
 #define TYPE_NPCM7XX_KEY_STORAGE "npcm7xx-key-storage"
 #define TYPE_NPCM7XX_FUSE_ARRAY "npcm7xx-fuse-array"
diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h
@@ -29,7 +29,7 @@ typedef struct PnvChip PnvChip;
 #define PNV_XSCOM_INTERFACE(obj) \
     INTERFACE_CHECK(PnvXScomInterface, (obj), TYPE_PNV_XSCOM_INTERFACE)
 typedef struct PnvXScomInterfaceClass PnvXScomInterfaceClass;
-DECLARE_CLASS_CHECKERS(PnvXScomInterfaceClass, PNV_XSCOM_INTERFACE,
+DECLARE_CLASS_CHECKERS_IF(PnvXScomInterfaceClass, PNV_XSCOM_INTERFACE,
                        TYPE_PNV_XSCOM_INTERFACE)
 
 struct PnvXScomInterfaceClass {
diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
@@ -49,7 +49,7 @@ typedef struct SpaprInterruptController SpaprInterruptController;
 #define SPAPR_INTC(obj)                                     \
     INTERFACE_CHECK(SpaprInterruptController, (obj), TYPE_SPAPR_INTC)
 typedef struct SpaprInterruptControllerClass SpaprInterruptControllerClass;
-DECLARE_CLASS_CHECKERS(SpaprInterruptControllerClass, SPAPR_INTC,
+DECLARE_CLASS_CHECKERS_IF(SpaprInterruptControllerClass, SPAPR_INTC,
                        TYPE_SPAPR_INTC)
 
 struct SpaprInterruptControllerClass {
diff --git a/include/hw/ppc/vof.h b/include/hw/ppc/vof.h
@@ -33,7 +33,7 @@ uint32_t vof_client_open_store(void *fdt, Vof *vof, const char *nodename,
 #define TYPE_VOF_MACHINE_IF "vof-machine-if"
 
 typedef struct VofMachineIfClass VofMachineIfClass;
-DECLARE_CLASS_CHECKERS(VofMachineIfClass, VOF_MACHINE, TYPE_VOF_MACHINE_IF)
+DECLARE_CLASS_CHECKERS_IF(VofMachineIfClass, VOF_MACHINE, TYPE_VOF_MACHINE_IF)
 
 struct VofMachineIfClass {
     InterfaceClass parent;
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
@@ -140,7 +140,7 @@ struct ICSIRQState {
 #define XICS_FABRIC(obj)                                     \
     INTERFACE_CHECK(XICSFabric, (obj), TYPE_XICS_FABRIC)
 typedef struct XICSFabricClass XICSFabricClass;
-DECLARE_CLASS_CHECKERS(XICSFabricClass, XICS_FABRIC,
+DECLARE_CLASS_CHECKERS_IF(XICSFabricClass, XICS_FABRIC,
                        TYPE_XICS_FABRIC)
 
 struct XICSFabricClass {
diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h
@@ -153,7 +153,7 @@ typedef struct XiveNotifier XiveNotifier;
 #define XIVE_NOTIFIER(obj)                                     \
     INTERFACE_CHECK(XiveNotifier, (obj), TYPE_XIVE_NOTIFIER)
 typedef struct XiveNotifierClass XiveNotifierClass;
-DECLARE_CLASS_CHECKERS(XiveNotifierClass, XIVE_NOTIFIER,
+DECLARE_CLASS_CHECKERS_IF(XiveNotifierClass, XIVE_NOTIFIER,
                        TYPE_XIVE_NOTIFIER)
 
 struct XiveNotifierClass {
@@ -435,7 +435,7 @@ typedef struct XiveTCTXMatch {
 #define XIVE_PRESENTER(obj)                                     \
     INTERFACE_CHECK(XivePresenter, (obj), TYPE_XIVE_PRESENTER)
 typedef struct XivePresenterClass XivePresenterClass;
-DECLARE_CLASS_CHECKERS(XivePresenterClass, XIVE_PRESENTER,
+DECLARE_CLASS_CHECKERS_IF(XivePresenterClass, XIVE_PRESENTER,
                        TYPE_XIVE_PRESENTER)
 
 #define XIVE_PRESENTER_GEN1_TIMA_OS     0x1
@@ -474,7 +474,7 @@ uint8_t xive_get_group_level(bool crowd, bool ignore,
 #define XIVE_FABRIC(obj)                                     \
     INTERFACE_CHECK(XiveFabric, (obj), TYPE_XIVE_FABRIC)
 typedef struct XiveFabricClass XiveFabricClass;
-DECLARE_CLASS_CHECKERS(XiveFabricClass, XIVE_FABRIC,
+DECLARE_CLASS_CHECKERS_IF(XiveFabricClass, XIVE_FABRIC,
                        TYPE_XIVE_FABRIC)
 
 struct XiveFabricClass {
diff --git a/include/hw/resettable.h b/include/hw/resettable.h
@@ -18,7 +18,7 @@
 #define TYPE_RESETTABLE_INTERFACE "resettable"
 
 typedef struct ResettableClass ResettableClass;
-DECLARE_CLASS_CHECKERS(ResettableClass, RESETTABLE,
+DECLARE_CLASS_CHECKERS_IF(ResettableClass, RESETTABLE,
                        TYPE_RESETTABLE_INTERFACE)
 
 
diff --git a/include/hw/rtc/m48t59.h b/include/hw/rtc/m48t59.h
@@ -32,7 +32,7 @@
 #define TYPE_NVRAM "nvram"
 
 typedef struct NvramClass NvramClass;
-DECLARE_CLASS_CHECKERS(NvramClass, NVRAM,
+DECLARE_CLASS_CHECKERS_IF(NvramClass, NVRAM,
                        TYPE_NVRAM)
 #define NVRAM(obj) \
     INTERFACE_CHECK(Nvram, (obj), TYPE_NVRAM)
diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h
@@ -129,7 +129,7 @@ void hmp_info_skeys(Monitor *mon, const QDict *qdict);
 #define TYPE_DUMP_SKEYS_INTERFACE "dump-skeys-interface"
 
 typedef struct DumpSKeysInterface DumpSKeysInterface;
-DECLARE_CLASS_CHECKERS(DumpSKeysInterface, DUMP_SKEYS_INTERFACE,
+DECLARE_CLASS_CHECKERS_IF(DumpSKeysInterface, DUMP_SKEYS_INTERFACE,
                        TYPE_DUMP_SKEYS_INTERFACE)
 
 struct DumpSKeysInterface {
diff --git a/include/hw/stream.h b/include/hw/stream.h
@@ -6,7 +6,7 @@
 #define TYPE_STREAM_SINK "stream-sink"
 
 typedef struct StreamSinkClass StreamSinkClass;
-DECLARE_CLASS_CHECKERS(StreamSinkClass, STREAM_SINK,
+DECLARE_CLASS_CHECKERS_IF(StreamSinkClass, STREAM_SINK,
                        TYPE_STREAM_SINK)
 #define STREAM_SINK(obj) \
      INTERFACE_CHECK(StreamSink, (obj), TYPE_STREAM_SINK)
diff --git a/include/hw/vmstate-if.h b/include/hw/vmstate-if.h
@@ -14,7 +14,7 @@
 #define TYPE_VMSTATE_IF "vmstate-if"
 
 typedef struct VMStateIfClass VMStateIfClass;
-DECLARE_CLASS_CHECKERS(VMStateIfClass, VMSTATE_IF,
+DECLARE_CLASS_CHECKERS_IF(VMStateIfClass, VMSTATE_IF,
                        TYPE_VMSTATE_IF)
 #define VMSTATE_IF(obj)                             \
     INTERFACE_CHECK(VMStateIf, (obj), TYPE_VMSTATE_IF)
diff --git a/include/qemu/accel.h b/include/qemu/accel.h
@@ -34,12 +34,13 @@ typedef struct AccelClass AccelClass;
 #define ACCEL_CLASS_SUFFIX  "-" TYPE_ACCEL
 #define ACCEL_CLASS_NAME(a) (a ACCEL_CLASS_SUFFIX)
 
+DO_OBJECT_INTERFACE_INFO(ACCEL, false);
 #define ACCEL_CLASS(klass) \
-    OBJECT_CLASS_CHECK(AccelClass, (klass), TYPE_ACCEL)
+    OBJECT_CLASS_CHECK(AccelClass, (klass), ACCEL, TYPE_ACCEL)
 #define ACCEL(obj) \
     OBJECT_CHECK(AccelState, (obj), TYPE_ACCEL)
 #define ACCEL_GET_CLASS(obj) \
-    OBJECT_GET_CLASS(AccelClass, (obj), TYPE_ACCEL)
+    OBJECT_GET_CLASS(AccelClass, (obj), ACCEL, TYPE_ACCEL)
 
 AccelClass *accel_find(const char *opt_name);
 AccelState *current_accel(void);
diff --git a/include/qom/object.h b/include/qom/object.h
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
diff --git a/include/system/memory.h b/include/system/memory.h
diff --git a/include/system/tpm.h b/include/system/tpm.h
diff --git a/migration/savevm.c b/migration/savevm.c
diff --git a/net/net.c b/net/net.c
diff --git a/qom/object.c b/qom/object.c
diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
diff --git a/target/arm/idau.h b/target/arm/idau.h
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
