[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/2] hw: m68k: virt: Add compat machine for 6.1
From: |
Laurent Vivier |
Subject: |
[PULL 1/2] hw: m68k: virt: Add compat machine for 6.1 |
Date: |
Tue, 9 Nov 2021 12:15:16 +0100 |
Add the missing machine type for m68k/virt
Cc: qemu-stable@nongnu.org
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20211106194158.4068596-2-laurent@vivier.eu>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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 4e8bce5aa6f7..0d9e3f83c169 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)
--
2.31.1
- [PULL 0/2] M68k for 6.2 patches, Laurent Vivier, 2021/11/09
- [PULL 1/2] hw: m68k: virt: Add compat machine for 6.1,
Laurent Vivier <=
- Re: [PULL 1/2] hw: m68k: virt: Add compat machine for 6.1, BALATON Zoltan, 2021/11/09
- Re: [PULL 1/2] hw: m68k: virt: Add compat machine for 6.1, Daniel P . Berrangé, 2021/11/09
- Re: [PULL 1/2] hw: m68k: virt: Add compat machine for 6.1, BALATON Zoltan, 2021/11/09
- Re: [PULL 1/2] hw: m68k: virt: Add compat machine for 6.1, Peter Maydell, 2021/11/09
- Re: [PULL 1/2] hw: m68k: virt: Add compat machine for 6.1, BALATON Zoltan, 2021/11/09
- Re: [PULL 1/2] hw: m68k: virt: Add compat machine for 6.1, Peter Maydell, 2021/11/10
- Re: [PULL 1/2] hw: m68k: virt: Add compat machine for 6.1, Daniel P . Berrangé, 2021/11/10
[PULL 2/2] hw: m68k: virt: Add compat machine for 6.2, Laurent Vivier, 2021/11/09
Re: [PULL 0/2] M68k for 6.2 patches, Richard Henderson, 2021/11/09