From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 2/2] hw: m68k: virt: Add compat machine for 6.2
Date: Tue, 9 Nov 2021 12:15:17 +0100 [thread overview]
Message-ID: <20211109111517.996104-3-laurent@vivier.eu> (raw)
In-Reply-To: <20211109111517.996104-1-laurent@vivier.eu>
Add the missing machine type for m68k/virt
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20211106194158.4068596-3-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 0d9e3f83c169..978c26e025a7 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_6_2_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE(6, 2, true)
+
static void virt_machine_6_1_options(MachineClass *mc)
{
+ virt_machine_6_2_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len);
}
-DEFINE_VIRT_MACHINE(6, 1, true)
+DEFINE_VIRT_MACHINE(6, 1, false)
static void virt_machine_6_0_options(MachineClass *mc)
{
--
2.31.1
next prev parent reply other threads:[~2021-11-09 11:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-09 11:15 [PULL 0/2] M68k for 6.2 patches Laurent Vivier
2021-11-09 11:15 ` [PULL 1/2] hw: m68k: virt: Add compat machine for 6.1 Laurent Vivier
2021-11-09 12:34 ` BALATON Zoltan
2021-11-09 12:55 ` Daniel P. Berrangé
2021-11-09 19:58 ` BALATON Zoltan
2021-11-09 21:27 ` Peter Maydell
2021-11-09 23:33 ` BALATON Zoltan
2021-11-10 14:27 ` Peter Maydell
2021-11-10 14:35 ` Daniel P. Berrangé
2021-11-09 11:15 ` Laurent Vivier [this message]
2021-11-09 15:07 ` [PULL 0/2] M68k for 6.2 patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211109111517.996104-3-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).