Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
Based-On: <20211217143948.289995-1-cohuck@redhat.com>

 hw/m68k/virt.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 0efa4a45c7f4..78e926a55457 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -304,10 +304,17 @@ type_init(virt_machine_register_types)
     } \
     type_init(machvirt_machine_##major##_##minor##_init);
 
+static void virt_machine_7_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE(7, 0, true)
+
 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, true)
+DEFINE_VIRT_MACHINE(6, 2, false)
 
 static void virt_machine_6_1_options(MachineClass *mc)
 {
-- 
2.33.1

On 18/12/2021 12.43, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
> Based-On: <20211217143948.289995-1-cohuck@redhat.com>
> 
>   hw/m68k/virt.c | 9 ++++++++-
>   1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index 0efa4a45c7f4..78e926a55457 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -304,10 +304,17 @@ type_init(virt_machine_register_types)
>       } \
>       type_init(machvirt_machine_##major##_##minor##_init);
>   
> +static void virt_machine_7_0_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE(7, 0, true)
> +
>   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, true)
> +DEFINE_VIRT_MACHINE(6, 2, false)
>   
>   static void virt_machine_6_1_options(MachineClass *mc)
>   {
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

On Sat, Dec 18 2021, Laurent Vivier <laurent@vivier.eu> wrote:

> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
> Based-On: <20211217143948.289995-1-cohuck@redhat.com>
>
>  hw/m68k/virt.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)

Oh, I didn't realize we do it for m68k as well.

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Le 20/12/2021 à 09:17, Cornelia Huck a écrit :
> On Sat, Dec 18 2021, Laurent Vivier <laurent@vivier.eu> wrote:
> 
>> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
>> ---
>> Based-On: <20211217143948.289995-1-cohuck@redhat.com>
>>
>>   hw/m68k/virt.c | 9 ++++++++-
>>   1 file changed, 8 insertions(+), 1 deletion(-)
> 
> Oh, I didn't realize we do it for m68k as well.

virt-m68k is only a toy and is only used by debian for their m68k buildd.

So there is no problem if you don't manage the update, I will.

> 
> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
> 

Thanks,
Laurent

On Mon, Dec 20 2021, Laurent Vivier <laurent@vivier.eu> wrote:

> Le 20/12/2021 à 09:17, Cornelia Huck a écrit :
>> On Sat, Dec 18 2021, Laurent Vivier <laurent@vivier.eu> wrote:
>> 
>>> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
>>> ---
>>> Based-On: <20211217143948.289995-1-cohuck@redhat.com>
>>>
>>>   hw/m68k/virt.c | 9 ++++++++-
>>>   1 file changed, 8 insertions(+), 1 deletion(-)
>> 
>> Oh, I didn't realize we do it for m68k as well.
>
> virt-m68k is only a toy and is only used by debian for their m68k buildd.
>
> So there is no problem if you don't manage the update, I will.

Ok, let's just keep it as a separate patch for this round, and I'll try
to remember to add it when I'm sending machine type patches in the
future.