On 8/12/25 03:06, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> target/arm/cpu.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
>
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index d9a8f62934d..1dc2a8330d8 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -1551,7 +1551,6 @@ static const Property arm_cpu_pmsav7_dregion_property =
> DEFINE_PROP_UNSIGNED_NODEFAULT("pmsav7-dregion", ARMCPU,
> pmsav7_dregion,
> qdev_prop_uint32, uint32_t);
> -#endif
>
> static bool arm_get_pmu(Object *obj, Error **errp)
> {
> @@ -1576,6 +1575,8 @@ static void arm_set_pmu(Object *obj, bool value, Error **errp)
> cpu->has_pmu = value;
> }
>
> +#endif
> +
> static bool aarch64_cpu_get_aarch64(Object *obj, Error **errp)
> {
> ARMCPU *cpu = ARM_CPU(obj);
> @@ -1771,12 +1772,12 @@ static void arm_cpu_post_init(Object *obj)
> if (arm_feature(&cpu->env, ARM_FEATURE_EL2)) {
> qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el2_property);
> }
> -#endif
>
> if (arm_feature(&cpu->env, ARM_FEATURE_PMU)) {
> cpu->has_pmu = true;
> object_property_add_bool(obj, "pmu", arm_get_pmu, arm_set_pmu);
> }
> +#endif
>
> /*
> * Allow user to turn off VFP and Neon support, but only for TCG --