qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/2] hw: m68k: add missing virt machine types
@ 2021-11-06 19:41 Laurent Vivier
  2021-11-06 19:41 ` [PATCH 1/2] hw: m68: virt: Add compat machines for 6.1 Laurent Vivier
  2021-11-06 19:41 ` [PATCH 2/2] hw: m68: virt: Add compat machines for 6.2 Laurent Vivier
  0 siblings, 2 replies; 3+ messages in thread
From: Laurent Vivier @ 2021-11-06 19:41 UTC (permalink / raw)
  To: qemu-devel; +Cc: Laurent Vivier

Add the machine type for 6.2, and also for 6.1 that I have
missed on the previous release.

Laurent Vivier (2):
  hw: m68: virt: Add compat machines for 6.1
  hw: m68: virt: Add compat machines for 6.2

 hw/m68k/virt.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

-- 
2.31.1



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 1/2] hw: m68: virt: Add compat machines for 6.1
  2021-11-06 19:41 [PATCH 0/2] hw: m68k: add missing virt machine types Laurent Vivier
@ 2021-11-06 19:41 ` Laurent Vivier
  2021-11-06 19:41 ` [PATCH 2/2] hw: m68: virt: Add compat machines for 6.2 Laurent Vivier
  1 sibling, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2021-11-06 19:41 UTC (permalink / raw)
  To: qemu-devel; +Cc: Laurent Vivier, qemu-stable

Add the missing machine type for m68k/virt

Cc: qemu-stable@nongnu.org
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



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/2] hw: m68: virt: Add compat machines for 6.2
  2021-11-06 19:41 [PATCH 0/2] hw: m68k: add missing virt machine types Laurent Vivier
  2021-11-06 19:41 ` [PATCH 1/2] hw: m68: virt: Add compat machines for 6.1 Laurent Vivier
@ 2021-11-06 19:41 ` Laurent Vivier
  1 sibling, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2021-11-06 19:41 UTC (permalink / raw)
  To: qemu-devel; +Cc: Laurent Vivier

Add the missing machine type for m68k/virt

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



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-11-06 19:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-06 19:41 [PATCH 0/2] hw: m68k: add missing virt machine types Laurent Vivier
2021-11-06 19:41 ` [PATCH 1/2] hw: m68: virt: Add compat machines for 6.1 Laurent Vivier
2021-11-06 19:41 ` [PATCH 2/2] hw: m68: virt: Add compat machines for 6.2 Laurent Vivier

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).