virt-6.0 must consider hw_compat_6_0.

Fixes: da7e13c00b59 ("hw: add compat machines for 6.1")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
---
v2:
	add missing Fixes: tag
---
 hw/arm/virt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 840758666d..8bc3b408fe 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2764,6 +2764,8 @@ DEFINE_VIRT_MACHINE_AS_LATEST(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.30.2

On 6/12/21 1:46 AM, Heinrich Schuchardt wrote:
> virt-6.0 must consider hw_compat_6_0.
>
> Fixes: da7e13c00b59 ("hw: add compat machines for 6.1")
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Reviewed-by: Cornelia Huck <cohuck@redhat.com>

This patch was applied to target-arm.next by Peter.

> ---
> v2:
> 	add missing Fixes: tag
> ---
>   hw/arm/virt.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 840758666d..8bc3b408fe 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2764,6 +2764,8 @@ DEFINE_VIRT_MACHINE_AS_LATEST(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.30.2
>