The following machines:

  - virt-6.0
  - virt-6.1
  - virt-6.2
  - virt-7.0
  - virt-7.1
  - virt-7.2

have 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"), they can now be removed.

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

diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 98cfe43c73a..1874499f43e 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -427,45 +427,3 @@ static void virt_machine_8_0_options(MachineClass *mc)
     compat_props_add(mc->compat_props, hw_compat_8_0, hw_compat_8_0_len);
 }
 DEFINE_VIRT_MACHINE(8, 0)
-
-static void virt_machine_7_2_options(MachineClass *mc)
-{
-    virt_machine_8_0_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
-}
-DEFINE_VIRT_MACHINE(7, 2)
-
-static void virt_machine_7_1_options(MachineClass *mc)
-{
-    virt_machine_7_2_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
-}
-DEFINE_VIRT_MACHINE(7, 1)
-
-static void virt_machine_7_0_options(MachineClass *mc)
-{
-    virt_machine_7_1_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len);
-}
-DEFINE_VIRT_MACHINE(7, 0)
-
-static void virt_machine_6_2_options(MachineClass *mc)
-{
-    virt_machine_7_0_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len);
-}
-DEFINE_VIRT_MACHINE(6, 2)
-
-static void virt_machine_6_1_options(MachineClass *mc)
-{
-    virt_machine_6_2_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len);
-}
-DEFINE_VIRT_MACHINE(6, 1)
-
-static void virt_machine_6_0_options(MachineClass *mc)
-{
-    virt_machine_6_1_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len);
-}
-DEFINE_VIRT_MACHINE(6, 0)
-- 
2.51.0

On Fri, Oct 17, 2025 at 02:41:04PM +0200, Philippe Mathieu-Daudé wrote:
> The following machines:
> 
>   - virt-6.0
>   - virt-6.1
>   - virt-6.2
>   - virt-7.0
>   - virt-7.1
>   - virt-7.2
> 
> have 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"), they can now be removed.

Err ythat calculation is wrong.  The 6.0 release dates from 2021,
so the virt-6.0 machine has not even existed for 5 years yet.

The versioned machine type macros automatically mark machines as
deprecated on the required timescale, and will automatically hide
deprecated machines when they hit the removal point.

IOW, a versioned machine can be removed if-and-only-if the output
from '$QEMU -machine help' no longer includes the machine version.
None of these can be removed yet.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

On 17/10/25 15:16, Daniel P. Berrangé wrote:
> On Fri, Oct 17, 2025 at 02:41:04PM +0200, Philippe Mathieu-Daudé wrote:
>> The following machines:
>>
>>    - virt-6.0
>>    - virt-6.1
>>    - virt-6.2
>>    - virt-7.0
>>    - virt-7.1
>>    - virt-7.2
>>
>> have 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"), they can now be removed.
> 
> Err ythat calculation is wrong.  The 6.0 release dates from 2021,
> so the virt-6.0 machine has not even existed for 5 years yet.
> 
> The versioned machine type macros automatically mark machines as
> deprecated on the required timescale, and will automatically hide
> deprecated machines when they hit the removal point.
> 
> IOW, a versioned machine can be removed if-and-only-if the output
> from '$QEMU -machine help' no longer includes the machine version.
> None of these can be removed yet.

Right, OK.