aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2025-01-16 15:59:32 +0100
committerPeter Maydell <peter.maydell@linaro.org>2025-05-06 15:01:22 +0100
commit1731ec33c38ccc9b7629182e896737d2e31789c0 (patch)
treef0257f50bc8a3a85ba33678dea61424177a356e8
parente1781b38af5e5c2e8a4b8f11e3e54de393a82eb2 (diff)
downloadqemu-1731ec33c38ccc9b7629182e896737d2e31789c0.zip
qemu-1731ec33c38ccc9b7629182e896737d2e31789c0.tar.gz
qemu-1731ec33c38ccc9b7629182e896737d2e31789c0.tar.bz2
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>
-rw-r--r--hw/arm/virt.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 177f3dd..17a88aa 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)