[qemu-xen stable-4.16] hw: m68k: virt: Add compat machine for 6.1

[patchbot@xxxxxxx]

commit 7d71e6bfb0a2f03bd35165d4fc11da64b7ccc0d7
Author:     Laurent Vivier <laurent@xxxxxxxxx>
AuthorDate: Sat Nov 6 20:41:57 2021 +0100
Commit:     Michael Roth <michael.roth@xxxxxxx>
CommitDate: Tue Dec 14 14:23:21 2021 -0600

    hw: m68k: virt: Add compat machine for 6.1
    
    Add the missing machine type for m68k/virt
    
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Laurent Vivier <laurent@xxxxxxxxx>
    Message-Id: <20211106194158.4068596-2-laurent@xxxxxxxxx>
    Signed-off-by: Laurent Vivier <laurent@xxxxxxxxx>
    (cherry picked from commit 6837f299762679429924242a63f16490862578e3)
    Signed-off-by: Michael Roth <michael.roth@xxxxxxx>
---
 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 4e8bce5aa6..0d9e3f83c1 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -304,7 +304,14 @@ type_init(virt_machine_register_types)
     } \
     type_init(machvirt_machine_##major##_##minor##_init);
 
+static void virt_machine_6_1_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE(6, 1, true)
+
 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, true)
+DEFINE_VIRT_MACHINE(6, 0, false)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.16