[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] target/arm: Use aarch64_cpu_register() for 'host' CPU type
From: |
Peter Maydell |
Subject: |
[PATCH 2/6] target/arm: Use aarch64_cpu_register() for 'host' CPU type |
Date: |
Fri, 4 Feb 2022 16:55:02 +0000 |
Use the aarch64_cpu_register() machinery to register the 'host' CPU
type. This doesn't gain us anything functionally, but it does mean
that the code for initializing it looks more like that for the other
CPU types, in that its initfn then doesn't need to call
arm_cpu_post_init() (because aarch64_cpu_instance_init() does that
for it).
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/cpu64.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index 052666b819e..590ac562714 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -683,7 +683,7 @@ void aarch64_add_pauth_properties(Object *obj)
}
#if defined(CONFIG_KVM) || defined(CONFIG_HVF)
-static void arm_host_initfn(Object *obj)
+static void aarch64_host_initfn(Object *obj)
{
ARMCPU *cpu = ARM_CPU(obj);
@@ -696,15 +696,7 @@ static void arm_host_initfn(Object *obj)
#else
hvf_arm_set_cpu_features_from_host(cpu);
#endif
- arm_cpu_post_init(obj);
}
-
-static const TypeInfo host_arm_cpu_type_info = {
- .name = TYPE_ARM_HOST_CPU,
- .parent = TYPE_AARCH64_CPU,
- .instance_init = arm_host_initfn,
-};
-
#endif
/* -cpu max: if KVM is enabled, like -cpu host (best possible with this host);
@@ -943,6 +935,9 @@ static const ARMCPUInfo aarch64_cpus[] = {
{ .name = "cortex-a72", .initfn = aarch64_a72_initfn },
{ .name = "a64fx", .initfn = aarch64_a64fx_initfn },
{ .name = "max", .initfn = aarch64_max_initfn },
+#if defined(CONFIG_KVM) || defined(CONFIG_HVF)
+ { .name = "host", .initfn = aarch64_host_initfn },
+#endif
};
static bool aarch64_cpu_get_aarch64(Object *obj, Error **errp)
@@ -1049,10 +1044,6 @@ static void aarch64_cpu_register_types(void)
for (i = 0; i < ARRAY_SIZE(aarch64_cpus); ++i) {
aarch64_cpu_register(&aarch64_cpus[i]);
}
-
-#if defined(CONFIG_KVM) || defined(CONFIG_HVF)
- type_register_static(&host_arm_cpu_type_info);
-#endif
}
type_init(aarch64_cpu_register_types)
--
2.25.1
- [PATCH 0/6] target/arm: -cpu host/max KVM and HVF fixes, Peter Maydell, 2022/02/04
- [PATCH 1/6] target/arm: Move '-cpu host' code to cpu64.c, Peter Maydell, 2022/02/04
- [PATCH 3/6] target/arm: Make KVM -cpu max exactly like -cpu host, Peter Maydell, 2022/02/04
- [PATCH 2/6] target/arm: Use aarch64_cpu_register() for 'host' CPU type,
Peter Maydell <=
- [PATCH 6/6] target/arm: Support PAuth extension for hvf, Peter Maydell, 2022/02/04
- [PATCH 4/6] target/arm: Unindent unnecessary else-clause, Peter Maydell, 2022/02/04
- [PATCH 5/6] target/arm: Fix '-cpu max' for HVF, Peter Maydell, 2022/02/04
- Re: [PATCH 0/6] target/arm: -cpu host/max KVM and HVF fixes, Philippe Mathieu-Daudé, 2022/02/06
- Re: [PATCH 0/6] target/arm: -cpu host/max KVM and HVF fixes, Andrew Jones, 2022/02/09