versal: use OBJECT_DECLARE_SIMPLE_TYPE

As part of moving the device implementations for LPD INT CSR, LPD SLCR, and PMC INT CSR from Xilinx QEMU to stable 9.1, some of the device models need to be migrated to use the modern QOM templates for device structures. This eliminates the use of OBJECT_CHECK in favor of the OBJECT_DECLARE_TYPE macros. Signed-off-by: Nelson Ho <[email protected]>
Wind-River · Dec 10, 2024 · b0bfc4d · b0bfc4d
1 parent b797140
commit b0bfc4d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/include/hw/misc/xlnx-versal-intlpd-config.h b/include/hw/misc/xlnx-versal-intlpd-config.h
@@ -26,9 +26,7 @@
 #include "qom/object.h"
 
 #define TYPE_XILINX_INTLPD_CONFIG "xlnx-intlpd-config"
-
-#define XILINX_INTLPD_CONFIG(obj) \
-     OBJECT_CHECK(INTLPD_CONFIG, (obj), TYPE_XILINX_INTLPD_CONFIG)
+OBJECT_DECLARE_SIMPLE_TYPE(INTLPD_CONFIG, XILINX_INTLPD_CONFIG)
 
 #define AFIFS_SERBS_ID 1
 

diff --git a/include/hw/misc/xlnx-versal-lpd-slcr.h b/include/hw/misc/xlnx-versal-lpd-slcr.h
@@ -26,9 +26,7 @@
 #include "qom/object.h"
 
 #define TYPE_XILINX_LPD_SLCR "xlnx.versal-lpd-slcr"
-
-#define XILINX_LPD_SLCR(obj) \
-     OBJECT_CHECK(LPD_SLCR, (obj), TYPE_XILINX_LPD_SLCR)
+OBJECT_DECLARE_SIMPLE_TYPE(LPD_SLCR, XILINX_LPD_SLCR)
 
 #define LPD_SLCR_R_MAX 83
 

diff --git a/include/hw/misc/xlnx-versal-pmc-int.h b/include/hw/misc/xlnx-versal-pmc-int.h
@@ -27,9 +27,6 @@
 #define TYPE_XILINX_PMC_INT_REGS "xlnx.versal-pmc-int"
 OBJECT_DECLARE_SIMPLE_TYPE(PMC_INT_REGS, XILINX_PMC_INT_REGS)
 
-#define XILINX_PMC_INT_REGS(obj) \
-     OBJECT_CHECK(PMC_INT_REGS, (obj), TYPE_XILINX_PMC_INT_REGS)
-
 #define PMC_INT_REGS_R_MAX 44
 
 typedef struct PMC_INT_REGS {