|
 |
495e37 |
From 0e85c10b73c36f386723c842a797d5e2155e758f Mon Sep 17 00:00:00 2001
|
|
|
495e37 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
495e37 |
Date: Fri, 10 Dec 2021 10:07:40 +0100
|
|
|
495e37 |
Subject: [PATCH 1/2] redhat: Add rhel8.6.0 and rhel9.0.0 machine types for
|
|
|
495e37 |
s390x
|
|
|
495e37 |
MIME-Version: 1.0
|
|
|
495e37 |
Content-Type: text/plain; charset=UTF-8
|
|
|
495e37 |
Content-Transfer-Encoding: 8bit
|
|
|
495e37 |
|
|
|
495e37 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
495e37 |
RH-MergeRequest: 55: redhat: Add rhel8.6.0 and rhel9.0.0 machine types for s390x
|
|
|
495e37 |
RH-Commit: [1/1] ad8fd5c825ae52a8fbb3a28f700a514509c59978 (thuth/qemu-kvm-cs9)
|
|
|
495e37 |
RH-Bugzilla: 2008060
|
|
|
495e37 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
495e37 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
495e37 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
495e37 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
495e37 |
|
|
|
495e37 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2008060
|
|
|
495e37 |
|
|
|
495e37 |
The new machine types have better default values for the upcoming
|
|
|
495e37 |
"generation 16" mainframe.
|
|
|
495e37 |
|
|
|
495e37 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
495e37 |
---
|
|
|
495e37 |
hw/s390x/s390-virtio-ccw.c | 26 +++++++++++++++++++++++++-
|
|
|
495e37 |
1 file changed, 25 insertions(+), 1 deletion(-)
|
|
|
495e37 |
|
|
|
495e37 |
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
|
495e37 |
index c654045964..9da6e9b1d4 100644
|
|
|
495e37 |
--- a/hw/s390x/s390-virtio-ccw.c
|
|
|
495e37 |
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
|
495e37 |
@@ -1103,10 +1103,33 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
|
|
|
495e37 |
DEFINE_CCW_MACHINE(2_4, "2.4", false);
|
|
|
495e37 |
#endif
|
|
|
495e37 |
|
|
|
495e37 |
+static void ccw_machine_rhel900_instance_options(MachineState *machine)
|
|
|
495e37 |
+{
|
|
|
495e37 |
+}
|
|
|
495e37 |
+
|
|
|
495e37 |
+static void ccw_machine_rhel900_class_options(MachineClass *mc)
|
|
|
495e37 |
+{
|
|
|
495e37 |
+}
|
|
|
495e37 |
+DEFINE_CCW_MACHINE(rhel900, "rhel9.0.0", true);
|
|
|
495e37 |
+
|
|
|
495e37 |
+static void ccw_machine_rhel860_instance_options(MachineState *machine)
|
|
|
495e37 |
+{
|
|
|
495e37 |
+ /* Note: The -rhel8.6.0 and -rhel9.0.0 machines are technically identical */
|
|
|
495e37 |
+ ccw_machine_rhel900_instance_options(machine);
|
|
|
495e37 |
+}
|
|
|
495e37 |
+
|
|
|
495e37 |
+static void ccw_machine_rhel860_class_options(MachineClass *mc)
|
|
|
495e37 |
+{
|
|
|
495e37 |
+ ccw_machine_rhel900_class_options(mc);
|
|
|
495e37 |
+}
|
|
|
495e37 |
+DEFINE_CCW_MACHINE(rhel860, "rhel8.6.0", false);
|
|
|
495e37 |
+
|
|
|
495e37 |
static void ccw_machine_rhel850_instance_options(MachineState *machine)
|
|
|
495e37 |
{
|
|
|
495e37 |
static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_0 };
|
|
|
495e37 |
|
|
|
495e37 |
+ ccw_machine_rhel860_instance_options(machine);
|
|
|
495e37 |
+
|
|
|
495e37 |
s390_set_qemu_cpu_model(0x2964, 13, 2, qemu_cpu_feat);
|
|
|
495e37 |
|
|
|
495e37 |
s390_cpudef_featoff_greater(16, 1, S390_FEAT_NNPA);
|
|
|
495e37 |
@@ -1118,10 +1141,11 @@ static void ccw_machine_rhel850_instance_options(MachineState *machine)
|
|
|
495e37 |
|
|
|
495e37 |
static void ccw_machine_rhel850_class_options(MachineClass *mc)
|
|
|
495e37 |
{
|
|
|
495e37 |
+ ccw_machine_rhel860_class_options(mc);
|
|
|
495e37 |
compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len);
|
|
|
495e37 |
mc->smp_props.prefer_sockets = true;
|
|
|
495e37 |
}
|
|
|
495e37 |
-DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", true);
|
|
|
495e37 |
+DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", false);
|
|
|
495e37 |
|
|
|
495e37 |
static void ccw_machine_rhel840_instance_options(MachineState *machine)
|
|
|
495e37 |
{
|
|
|
495e37 |
--
|
|
|
495e37 |
2.27.0
|
|
|
495e37 |
|