[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/18] target/i386: Declare CPU QOM types using DEFINE_TYPES() ma
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 11/18] target/i386: Declare CPU QOM types using DEFINE_TYPES() macro |
Date: |
Tue, 10 Oct 2023 11:28:53 +0200 |
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é <philmd@linaro.org>
---
target/i386/cpu.c | 50 ++++++++++++++++++++++-------------------------
1 file changed, 23 insertions(+), 27 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 9fad31b8db..8f1fd5f304 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -4989,13 +4989,6 @@ static void max_x86_cpu_initfn(Object *obj)
&error_abort);
}
-static const TypeInfo max_x86_cpu_type_info = {
- .name = X86_CPU_TYPE_NAME("max"),
- .parent = TYPE_X86_CPU,
- .instance_init = max_x86_cpu_initfn,
- .class_init = max_x86_cpu_class_init,
-};
-
static char *feature_word_description(FeatureWordInfo *f, uint32_t bit)
{
assert(f->type == CPUID_FEATURE_WORD || f->type == MSR_FEATURE_WORD);
@@ -8017,19 +8010,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc,
void *data)
}
}
-static const TypeInfo x86_cpu_type_info = {
- .name = TYPE_X86_CPU,
- .parent = TYPE_CPU,
- .instance_size = sizeof(X86CPU),
- .instance_align = __alignof(X86CPU),
- .instance_init = x86_cpu_initfn,
- .instance_post_init = x86_cpu_post_initfn,
-
- .abstract = true,
- .class_size = sizeof(X86CPUClass),
- .class_init = x86_cpu_common_class_init,
-};
-
/* "base" CPU model, used by query-cpu-model-expansion */
static void x86_cpu_base_class_init(ObjectClass *oc, void *data)
{
@@ -8041,22 +8021,38 @@ static void x86_cpu_base_class_init(ObjectClass *oc,
void *data)
xcc->ordering = 8;
}
-static const TypeInfo x86_base_cpu_type_info = {
- .name = X86_CPU_TYPE_NAME("base"),
- .parent = TYPE_X86_CPU,
- .class_init = x86_cpu_base_class_init,
+static const TypeInfo x86_cpu_types[] = {
+ {
+ .name = TYPE_X86_CPU,
+ .parent = TYPE_CPU,
+ .abstract = true,
+ .instance_size = sizeof(X86CPU),
+ .instance_align = __alignof(X86CPU),
+ .instance_init = x86_cpu_initfn,
+ .instance_post_init = x86_cpu_post_initfn,
+ .class_size = sizeof(X86CPUClass),
+ .class_init = x86_cpu_common_class_init,
+ }, {
+ .name = X86_CPU_TYPE_NAME("base"),
+ .parent = TYPE_X86_CPU,
+ .class_init = x86_cpu_base_class_init,
+ }, {
+ .name = X86_CPU_TYPE_NAME("max"),
+ .parent = TYPE_X86_CPU,
+ .instance_init = max_x86_cpu_initfn,
+ .class_init = max_x86_cpu_class_init,
+ }
};
+DEFINE_TYPES(x86_cpu_types)
+
static void x86_cpu_register_types(void)
{
int i;
- type_register_static(&x86_cpu_type_info);
for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); i++) {
x86_register_cpudef_types(&builtin_x86_defs[i]);
}
- type_register_static(&max_x86_cpu_type_info);
- type_register_static(&x86_base_cpu_type_info);
}
type_init(x86_cpu_register_types)
--
2.41.0
- [PATCH 05/18] target/hexagon: Declare QOM definitions in 'cpu-qom.h', (continued)
- [PATCH 05/18] target/hexagon: Declare QOM definitions in 'cpu-qom.h', Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 06/18] target/loongarch: Declare QOM definitions in 'cpu-qom.h', Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 07/18] target/nios2: Declare QOM definitions in 'cpu-qom.h', Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 08/18] target/openrisc: Declare QOM definitions in 'cpu-qom.h', Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 10/18] target/riscv: Inline target specific TYPE_RISCV_CPU_BASE definition, Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 09/18] target/i386: Inline target specific TARGET_DEFAULT_CPU_TYPE definition, Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 12/18] target/mips: Declare CPU QOM types using DEFINE_TYPES() macro, Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 11/18] target/i386: Declare CPU QOM types using DEFINE_TYPES() macro,
Philippe Mathieu-Daudé <=
- [PATCH 13/18] target/ppc: Declare CPU QOM types using DEFINE_TYPES() macro, Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 14/18] target/sparc: Declare CPU QOM types using DEFINE_TYPES() macro, Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 15/18] cpus: Open code OBJECT_DECLARE_TYPE() in OBJECT_DECLARE_CPU_TYPE(), Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 16/18] target/i386: Make X86_CPU common to new I386_CPU / X86_64_CPU types, Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 17/18] target/mips: Make MIPS_CPU common to new MIPS32_CPU / MIPS64_CPU types, Philippe Mathieu-Daudé, 2023/10/10
- [PATCH 18/18] target/sparc: Make SPARC_CPU common to new SPARC32_CPU/SPARC64_CPU types, Philippe Mathieu-Daudé, 2023/10/10