diff mbox series

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

Message ID 20250116145944.38028-11-philmd@linaro.org
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 | 10 ----------
 1 file changed, 10 deletions(-)

Comments

Richard Henderson Jan. 16, 2025, 6:03 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 | 10 ----------
>   1 file changed, 10 deletions(-)
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 54c7b92b6d9..582a5aa077b 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -3541,13 +3541,3 @@ static void virt_machine_2_12_options(MachineClass *mc)
>       mc->max_cpus = 255;
>   }
>   DEFINE_VIRT_MACHINE(2, 12)
> -
> -static void virt_machine_2_11_options(MachineClass *mc)
> -{
> -    VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
> -
> -    virt_machine_2_12_options(mc);
> -    compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len);
> -    vmc->smbios_old_sys_ver = true;
> -}
> -DEFINE_VIRT_MACHINE(2, 11)

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 54c7b92b6d9..582a5aa077b 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3541,13 +3541,3 @@  static void virt_machine_2_12_options(MachineClass *mc)
     mc->max_cpus = 255;
 }
 DEFINE_VIRT_MACHINE(2, 12)
-
-static void virt_machine_2_11_options(MachineClass *mc)
-{
-    VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
-
-    virt_machine_2_12_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len);
-    vmc->smbios_old_sys_ver = true;
-}
-DEFINE_VIRT_MACHINE(2, 11)