From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Thu, 16 Jan 2025 14:59:32 +0000 (+0100)
Subject: hw/arm/virt: Remove deprecated virt-2.6 machine
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1731ec33c38ccc9b7629182e896737d2e31789c0;p=thirdparty%2Fqemu.git

hw/arm/virt: Remove deprecated virt-2.6 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.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 177f3dd22c..17a88aa9b2 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3667,15 +3667,3 @@ static void virt_machine_2_7_options(MachineClass *mc)
     mc->minimum_page_bits = 0;
 }
 DEFINE_VIRT_MACHINE(2, 7)
-
-static void virt_machine_2_6_options(MachineClass *mc)
-{
-    VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
-
-    virt_machine_2_7_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len);
-    vmc->disallow_affinity_adjustment = true;
-    /* Disable PMU for 2.6 as PMU support was first introduced in 2.7 */
-    vmc->no_pmu = true;
-}
-DEFINE_VIRT_MACHINE(2, 6)