Re: [PATCH-for-9.1 03/21] target/ppc: Declare CPU QOM types using DEFINE_TYPES() macro

[Zhao Liu]

On Fri, Mar 15, 2024 at 02:08:51PM +0100, Philippe Mathieu-Daudé wrote:
> Date: Fri, 15 Mar 2024 14:08:51 +0100
> From: Philippe Mathieu-Daudé 
> Subject: [PATCH-for-9.1 03/21] target/ppc: Declare CPU QOM types using
>  DEFINE_TYPES() macro
> X-Mailer: git-send-email 2.41.0
> 
> When multiple QOM types are registered in the same file,
> it is simpler to use the the DEFINE_TYPES() macro. In
> particular because type array declared with such macro
> are easier to review.
> 
> In few commits we are going to add more types, so replace
> the type_register_static() to ease further reviews.
> 
> Signed-off-by: Philippe Mathieu-Daudé 
> Reviewed-by: Richard Henderson 
> Message-Id: <20231013140116.255-16-phi...@linaro.org>
> ---
>  target/ppc/cpu_init.c | 52 +++
>  1 file changed, 23 insertions(+), 29 deletions(-)

Reviewed-by: Zhao Liu 

[PATCH-for-9.1 03/21] target/ppc: Declare CPU QOM types using DEFINE_TYPES() macro

[Philippe Mathieu-Daudé]

When multiple QOM types are registered in the same file,
it is simpler to use the the DEFINE_TYPES() macro. In
particular because type array declared with such macro
are easier to review.

In few commits we are going to add more types, so replace
the type_register_static() to ease further reviews.

Signed-off-by: Philippe Mathieu-Daudé 
Reviewed-by: Richard Henderson 
Message-Id: <20231013140116.255-16-phi...@linaro.org>
---
 target/ppc/cpu_init.c | 52 +++
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 7e65f08147..d5e227a6fb 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -7432,39 +7432,34 @@ static void ppc_cpu_class_init(ObjectClass *oc, void 
*data)
 #endif /* CONFIG_TCG */
 }
 
-static const TypeInfo ppc_cpu_type_info = {
-.name = TYPE_POWERPC_CPU,
-.parent = TYPE_CPU,
-.instance_size = sizeof(PowerPCCPU),
-.instance_align = __alignof__(PowerPCCPU),
-.instance_init = ppc_cpu_instance_init,
-.instance_finalize = ppc_cpu_instance_finalize,
-.abstract = true,
-.class_size = sizeof(PowerPCCPUClass),
-.class_init = ppc_cpu_class_init,
+static const TypeInfo ppc_cpu_types[] = {
+{
+.name   = TYPE_POWERPC_CPU,
+.parent = TYPE_CPU,
+.abstract   = true,
+.instance_size  = sizeof(PowerPCCPU),
+.instance_align = __alignof__(PowerPCCPU),
+.instance_init  = ppc_cpu_instance_init,
+.instance_finalize = ppc_cpu_instance_finalize,
+.class_size = sizeof(PowerPCCPUClass),
+.class_init = ppc_cpu_class_init,
 #ifndef CONFIG_USER_ONLY
-.interfaces = (InterfaceInfo[]) {
-  { TYPE_INTERRUPT_STATS_PROVIDER },
-  { }
+.interfaces = (InterfaceInfo[]) {
+  { TYPE_INTERRUPT_STATS_PROVIDER },
+  { }
+},
+#endif
+},
+#ifndef CONFIG_USER_ONLY
+{
+.name   = TYPE_PPC_VIRTUAL_HYPERVISOR,
+.parent = TYPE_INTERFACE,
+.class_size = sizeof(PPCVirtualHypervisorClass),
 },
 #endif
 };
 
-#ifndef CONFIG_USER_ONLY
-static const TypeInfo ppc_vhyp_type_info = {
-.name = TYPE_PPC_VIRTUAL_HYPERVISOR,
-.parent = TYPE_INTERFACE,
-.class_size = sizeof(PPCVirtualHypervisorClass),
-};
-#endif
-
-static void ppc_cpu_register_types(void)
-{
-type_register_static(_cpu_type_info);
-#ifndef CONFIG_USER_ONLY
-type_register_static(_vhyp_type_info);
-#endif
-}
+DEFINE_TYPES(ppc_cpu_types)
 
 void ppc_cpu_dump_state(CPUState *cs, FILE *f, int flags)
 {
@@ -7658,4 +7653,3 @@ void ppc_cpu_dump_state(CPUState *cs, FILE *f, int flags)
 #undef RGPL
 #undef RFPL
 }
-type_init(ppc_cpu_register_types)
-- 
2.41.0