Message ID | 20250115171009.19302-2-philmd@linaro.org (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | hw/arm: Remove virt-2.6 up to virt-2.12 machines | expand |
On 15/1/25 18:09, Philippe Mathieu-Daudé wrote: > This machines has been supported for a period of more than 6 years. Typo in all this series :/ To be replaced by "This machine". > 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é <philmd@linaro.org> > --- > docs/about/removed-features.rst | 4 ++++ > hw/arm/virt.c | 12 ------------ > 2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index c6616ce05e5..813988fad4a 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1065,6 +1065,10 @@ 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`` (removed in 10.0) +'''''''''''''''''''''''''''''''''' +This versioned machine has 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 99e0a68b6c5..3bb8a9c7bd6 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3606,15 +3606,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)
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é <philmd@linaro.org> --- docs/about/removed-features.rst | 4 ++++ hw/arm/virt.c | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-)