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 | 4 ++-- hw/arm/virt.c | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 435f081d805..732ec2cd05d 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1065,8 +1065,8 @@ 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`` and ``virt-2.7`` (removed in 10.0) -''''''''''''''''''''''''''''''''''''''''''''''''''' +Arm ``virt-2.6`` up to ``virt-2.8`` (removed in 10.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''' These versioned machines have been supported for a period of more than 6 years. linux-user mode CPUs diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d7a7cee79df..4ec94190769 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3556,16 +3556,3 @@ static void virt_machine_2_9_options(MachineClass *mc) compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); } DEFINE_VIRT_MACHINE(2, 9) - -static void virt_machine_2_8_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_2_9_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len); - /* For 2.8 and earlier we falsely claimed in the DT that - * our timers were edge-triggered, not level-triggered. - */ - vmc->claim_edge_triggered_timers = true; -} -DEFINE_VIRT_MACHINE(2, 8) -- 2.47.1