This machines 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é <phi...@linaro.org> --- docs/about/removed-features.rst | 2 +- hw/arm/virt.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 0594bbd4363..c915b2cbd41 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1065,7 +1065,7 @@ for all machine types using the PXA2xx and OMAP2 SoCs. We are also dropping the ``cheetah`` OMAP1 board, because we don't have any test images for it and don't know of anybody who does. -Arm ``virt-2.6`` up to ``virt-2.11`` (removed in 10.0) +Arm ``virt-2.6`` up to ``virt-2.12`` (removed in 10.0) '''''''''''''''''''''''''''''''''''''''''''''''''''''' These versioned machines have been supported for a period of more than 6 years. diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 08117b396a6..a607a66a198 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3512,14 +3512,3 @@ static void virt_machine_3_0_options(MachineClass *mc) compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len); } DEFINE_VIRT_MACHINE(3, 0) - -static void virt_machine_2_12_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_3_0_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len); - vmc->no_highmem_ecam = true; - mc->max_cpus = 255; -} -DEFINE_VIRT_MACHINE(2, 12) -- 2.47.1