diff mbox series

[PATCH-for-10.1,v2,04/13] hw/arm/virt: Remove deprecated virt-2.7 machine

Message ID 20250116145944.38028-5-philmd@linaro.org (mailing list archive)
State New
Headers show
Series hw/arm: Remove virt-2.6 up to virt-2.12 machines | expand

Commit Message

Philippe Mathieu-Daudé Jan. 16, 2025, 2:59 p.m. UTC
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.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/arm/virt.c | 13 -------------
 1 file changed, 13 deletions(-)

Comments

Richard Henderson Jan. 16, 2025, 5:47 p.m. UTC | #1
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.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/arm/virt.c | 13 -------------
>   1 file changed, 13 deletions(-)
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 53f4a96e517..eb27305dcd3 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -3589,16 +3589,3 @@ static void virt_machine_2_8_options(MachineClass *mc)
>       vmc->claim_edge_triggered_timers = true;
>   }
>   DEFINE_VIRT_MACHINE(2, 8)
> -
> -static void virt_machine_2_7_options(MachineClass *mc)
> -{
> -    VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
> -
> -    virt_machine_2_8_options(mc);
> -    compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len);
> -    /* ITS was introduced with 2.8 */
> -    vmc->no_its = true;
> -    /* Stick with 1K pages for migration compatibility */
> -    mc->minimum_page_bits = 0;
> -}
> -DEFINE_VIRT_MACHINE(2, 7)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
diff mbox series

Patch

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 53f4a96e517..eb27305dcd3 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3589,16 +3589,3 @@  static void virt_machine_2_8_options(MachineClass *mc)
     vmc->claim_edge_triggered_timers = true;
 }
 DEFINE_VIRT_MACHINE(2, 8)
-
-static void virt_machine_2_7_options(MachineClass *mc)
-{
-    VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
-
-    virt_machine_2_8_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len);
-    /* ITS was introduced with 2.8 */
-    vmc->no_its = true;
-    /* Stick with 1K pages for migration compatibility */
-    mc->minimum_page_bits = 0;
-}
-DEFINE_VIRT_MACHINE(2, 7)