fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

target/arm/hvf_arm: Avoid using poisoned CONFIG_HVF definition

Browse source 
In order to allow non-target specific code to include
"hvf_arm.h", define the stubs in hvf-stub.c.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20250513173928.77376-3-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-05-29 17:45:10 +01:00 • committed by Peter Maydell
parent 4f8599f20c
commit f1bcfa81d8
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MAINTAINERS
View file

@ -510,6 +510,7 @@ Apple Silicon HVF CPUs
M: Alexander Graf <agraf@csgraf.de>
S: Maintained
F: target/arm/hvf/
F: target/arm/hvf-stub.c
X86 HVF CPUs
M: Cameron Esfahani <dirty@apple.com>

20
target/arm/hvf-stub.c Normal file
View file

@ -0,0 +1,20 @@
/*
* QEMU Hypervisor.framework (HVF) stubs for ARM
*
* Copyright (c) Linaro
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "qemu/osdep.h"
#include "hvf_arm.h"
uint32_t hvf_arm_get_default_ipa_bit_size(void)
{
g_assert_not_reached();
}
uint32_t hvf_arm_get_max_ipa_bit_size(void)
{
g_assert_not_reached();
}

16
target/arm/hvf_arm.h
View file

@ -22,23 +22,7 @@ void hvf_arm_init_debug(void);
void hvf_arm_set_cpu_features_from_host(ARMCPU *cpu);
#ifdef CONFIG_HVF
uint32_t hvf_arm_get_default_ipa_bit_size(void);
uint32_t hvf_arm_get_max_ipa_bit_size(void);
#else
static inline uint32_t hvf_arm_get_default_ipa_bit_size(void)
{
return 0;
}
static inline uint32_t hvf_arm_get_max_ipa_bit_size(void)
{
return 0;
}
#endif
#endif

1
target/arm/meson.build
View file

@ -32,6 +32,7 @@ arm_common_system_ss.add(files('cpu.c'), capstone)
arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files(
'cpu32-stubs.c'))
arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
arm_common_system_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c'))
arm_common_system_ss.add(files(
'arch_dump.c',
'arm-powerctl.c',