From: Laurent Vivier <laurent@vivier.eu>
Date: Sat, 18 Dec 2021 11:43:40 +0000 (+0100)
Subject: hw: m68k: Add virt compat machine type for 7.0
X-Git-Tag: v7.0.0-rc0~99^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=214bdf8e7199a34fe6f46ac7a83b61d8cc3f8ad0;p=thirdparty%2Fqemu.git

hw: m68k: Add virt compat machine type for 7.0

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20211218114340.1856757-1-laurent@vivier.eu>
---

diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 0efa4a45c7f..78e926a5545 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)
 {