motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-24 02:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/arm/cpu: remove TARGET_AARCH64 in arm_cpu_finalize_features

Browse source 
Need to stub cpu64 finalize functions.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-id: 20250512180502.2395029-10-pierrick.bouvier@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Pierrick Bouvier 2025-05-12 11:04:23 -07:00 • committed by Peter Maydell
parent 07e13d5fb5
commit 2a028eab39
3 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
target/arm/cpu.c
View file

@ -1913,7 +1913,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
#ifdef TARGET_AARCH64
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
arm_cpu_sve_finalize(cpu, &local_err); arm_cpu_sve_finalize(cpu, &local_err);
if (local_err != NULL) { if (local_err != NULL) {
@ -1949,7 +1948,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp)
return; return;
} }
} }
#endif
if (kvm_enabled()) { if (kvm_enabled()) {
kvm_arm_steal_time_finalize(cpu, &local_err); kvm_arm_steal_time_finalize(cpu, &local_err);

26
target/arm/cpu32-stubs.c Normal file
View file

@ -0,0 +1,26 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "qemu/osdep.h"
#include "target/arm/cpu.h"
#include "target/arm/internals.h"
#include <glib.h>
void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp)
{
g_assert_not_reached();
}
void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
{
g_assert_not_reached();
}
void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp)
{
g_assert_not_reached();
}
void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp)
{
g_assert_not_reached();
}

11
target/arm/meson.build
View file

@ -11,10 +11,13 @@ arm_ss.add(zlib)
arm_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c')) arm_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c'))
arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c'))
arm_ss.add(when: 'TARGET_AARCH64', if_true: files( arm_ss.add(when: 'TARGET_AARCH64',
'cpu64.c', if_true: files(
'gdbstub64.c', 'cpu64.c',
)) 'gdbstub64.c'),
if_false: files(
'cpu32-stubs.c'),
)
arm_system_ss = ss.source_set() arm_system_ss = ss.source_set()
arm_system_ss.add(files( arm_system_ss.add(files(