67 lines
2.0 KiB
Diff
67 lines
2.0 KiB
Diff
|
From 926a9d0ca2437b4c4270062f707ed24284ad469f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Mon, 26 Aug 2024 14:42:24 +0200
|
||
|
|
Subject: redhat: Add rhel9.6.0 and rhel10.0.0 machine types
|
||
|
|
|
||
|
|
JIRA: https://issues.redhat.com/browse/RHEL-52319
|
||
|
|
|
||
|
|
Add a new machine types to enable the latest features by default.
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
---
|
||
|
|
hw/s390x/s390-virtio-ccw.c | 25 ++++++++++++++++++++++++-
|
||
|
|
1 file changed, 24 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
||
|
|
index feef81ed8b..b61392bac1 100644
|
||
|
|
--- a/hw/s390x/s390-virtio-ccw.c
|
||
|
|
+++ b/hw/s390x/s390-virtio-ccw.c
|
||
|
|
@@ -1310,8 +1310,29 @@ DEFINE_CCW_MACHINE(2, 4);
|
||
|
|
#endif
|
||
|
|
#endif /* disabled for RHEL */
|
||
|
|
|
||
|
|
+static void ccw_rhel_machine_10_0_0_instance_options(MachineState *machine)
|
||
|
|
+{
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+static void ccw_rhel_machine_10_0_0_class_options(MachineClass *mc)
|
||
|
|
+{
|
||
|
|
+}
|
||
|
|
+DEFINE_CCW_MACHINE_AS_LATEST(10, 0, 0);
|
||
|
|
+
|
||
|
|
+static void ccw_rhel_machine_9_6_0_instance_options(MachineState *machine)
|
||
|
|
+{
|
||
|
|
+ ccw_rhel_machine_10_0_0_instance_options(machine);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+static void ccw_rhel_machine_9_6_0_class_options(MachineClass *mc)
|
||
|
|
+{
|
||
|
|
+ ccw_rhel_machine_10_0_0_class_options(mc);
|
||
|
|
+}
|
||
|
|
+DEFINE_CCW_MACHINE(9, 6, 0);
|
||
|
|
+
|
||
|
|
static void ccw_rhel_machine_9_4_0_instance_options(MachineState *machine)
|
||
|
|
{
|
||
|
|
+ ccw_rhel_machine_9_6_0_instance_options(machine);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void ccw_rhel_machine_9_4_0_class_options(MachineClass *mc)
|
||
|
|
@@ -1320,11 +1341,13 @@ static void ccw_rhel_machine_9_4_0_class_options(MachineClass *mc)
|
||
|
|
{ TYPE_QEMU_S390_FLIC, "migrate-all-state", "off", },
|
||
|
|
};
|
||
|
|
|
||
|
|
+ ccw_rhel_machine_9_6_0_class_options(mc);
|
||
|
|
+
|
||
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_10_0, hw_compat_rhel_10_0_len);
|
||
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_9_5, hw_compat_rhel_9_5_len);
|
||
|
|
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
|
||
|
|
}
|
||
|
|
-DEFINE_CCW_MACHINE_AS_LATEST(9, 4, 0);
|
||
|
|
+DEFINE_CCW_MACHINE(9, 4, 0);
|
||
|
|
|
||
|
|
static void ccw_rhel_machine_9_2_0_instance_options(MachineState *machine)
|
||
|
|
{
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|