From: Philippe Mathieu-Daudé Date: Mon, 20 Oct 2025 09:40:18 +0000 (+0200) Subject: hw/arm/virt: Remove deprecated virt-4.1 machine X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7c52f28bf5b61751a9d3fbf4961dc826068ef51;p=thirdparty%2Fqemu.git hw/arm/virt: Remove deprecated virt-4.1 machine This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Message-id: 20251020094022.68768-2-philmd@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b3ecd6dce3..6cf8ed58d5 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3711,14 +3711,3 @@ static void virt_machine_4_2_options(MachineClass *mc) vmc->kvm_no_adjvtime = true; } DEFINE_VIRT_MACHINE(4, 2) - -static void virt_machine_4_1_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_4_2_options(mc); - compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); - vmc->no_ged = true; - mc->auto_enable_numa_with_memhp = false; -} -DEFINE_VIRT_MACHINE(4, 1)