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