| Message ID | 20250116145944.38028-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 1/16/25 06:59, Philippe Mathieu-Daudé wrote: > 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> > --- > hw/arm/virt.c | 12 ------------ > 1 file changed, 12 deletions(-) > > 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) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
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)