From 514712d5277de5237a49a4852f0f90c51696f94c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 16 Jan 2025 15:59:33 +0100 Subject: [PATCH] hw/arm/virt: Remove VirtMachineClass::no_pmu field MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The VirtMachineClass::no_pmu field was only used by virt-2.6 machine, which got removed. Remove it and simplify machvirt_init(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- hw/arm/virt.c | 4 ---- include/hw/arm/virt.h | 1 - 2 files changed, 5 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 17a88aa9b2..e82b8a4566 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2273,10 +2273,6 @@ static void machvirt_init(MachineState *machine) object_property_set_bool(cpuobj, "kvm-steal-time", false, NULL); } - if (vmc->no_pmu && object_property_find(cpuobj, "pmu")) { - object_property_set_bool(cpuobj, "pmu", false, NULL); - } - if (vmc->no_tcg_lpa2 && object_property_find(cpuobj, "lpa2")) { object_property_set_bool(cpuobj, "lpa2", false, NULL); } diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index c8e94e6aed..27c5bb585c 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -120,7 +120,6 @@ struct VirtMachineClass { bool disallow_affinity_adjustment; bool no_its; bool no_tcg_its; - bool no_pmu; bool claim_edge_triggered_timers; bool smbios_old_sys_ver; bool no_highmem_compact; -- 2.39.5