From eb773f38d127117597a1640cd623f1fcd000c067 Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Fri, 19 Apr 2024 16:37:57 +0200 Subject: [PATCH 08/14] s390x: remove deprecated rhel machine types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Thomas Huth RH-MergeRequest: 252: s390x: remove legacy CPU types RH-Jira: RHEL-39898 RH-Acked-by: Cédric Le Goater RH-Acked-by: Miroslav Rezanina RH-Commit: [1/5] 5ed0651c38584980b1fe51592a788032526c0f2f (thuth/qemu-kvm-cs9) Upstream-status: N/A Remove the following deprecated s390x rhel specific machine types: s390-ccw-virtio-rhel8.6.0 s390-ccw-virtio-rhel8.5.0 s390-ccw-virtio-rhel8.4.0 s390-ccw-virtio-rhel8.2.0 s390-ccw-virtio-rhel7.6.0 Signed-off-by: Sebastian Ott Signed-off-by: Thomas Huth --- hw/s390x/s390-virtio-ccw.c | 106 +------------------------------------ 1 file changed, 2 insertions(+), 104 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 9ad54682c6..b0b903b78c 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -610,6 +610,7 @@ static void s390_nmi(NMIState *n, int cpu_index, Error **errp) s390_cpu_restart(S390_CPU(cs)); } +#if 0 /* Disabled for Red Hat Enterprise Linux */ static ram_addr_t s390_fixup_ram_size(ram_addr_t sz) { /* same logic as in sclp.c */ @@ -629,6 +630,7 @@ static ram_addr_t s390_fixup_ram_size(ram_addr_t sz) } return newsz; } +#endif /* disabled for RHEL */ static inline bool machine_get_aes_key_wrap(Object *obj, Error **errp) { @@ -1329,110 +1331,6 @@ static void ccw_machine_rhel900_class_options(MachineClass *mc) } DEFINE_CCW_MACHINE(rhel900, "rhel9.0.0", false); -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) -{ - static GlobalProperty compat[] = { - { TYPE_S390_PCI_DEVICE, "interpret", "on", }, - { TYPE_S390_PCI_DEVICE, "forwarding-assist", "on", }, - }; - - ccw_machine_rhel900_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_rhel_8_6, hw_compat_rhel_8_6_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); - - /* All RHEL machines for prior major releases are deprecated */ - mc->deprecation_reason = rhel_old_machine_deprecation; -} -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); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_BEAR_ENH); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_RDP); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAI); -} - -static void ccw_machine_rhel850_class_options(MachineClass *mc) -{ - static GlobalProperty compat[] = { - { TYPE_S390_PCI_DEVICE, "interpret", "off", }, - { TYPE_S390_PCI_DEVICE, "forwarding-assist", "off", }, - }; - - ccw_machine_rhel860_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); - mc->smp_props.prefer_sockets = true; -} -DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", false); - -static void ccw_machine_rhel840_instance_options(MachineState *machine) -{ - ccw_machine_rhel850_instance_options(machine); -} - -static void ccw_machine_rhel840_class_options(MachineClass *mc) -{ - ccw_machine_rhel850_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_rhel_8_4, hw_compat_rhel_8_4_len); -} -DEFINE_CCW_MACHINE(rhel840, "rhel8.4.0", false); - -static void ccw_machine_rhel820_instance_options(MachineState *machine) -{ - ccw_machine_rhel840_instance_options(machine); -} - -static void ccw_machine_rhel820_class_options(MachineClass *mc) -{ - ccw_machine_rhel840_class_options(mc); - mc->fixup_ram_size = s390_fixup_ram_size; - /* we did not publish a rhel8.3.0 machine */ - compat_props_add(mc->compat_props, hw_compat_rhel_8_3, hw_compat_rhel_8_3_len); - compat_props_add(mc->compat_props, hw_compat_rhel_8_2, hw_compat_rhel_8_2_len); -} -DEFINE_CCW_MACHINE(rhel820, "rhel8.2.0", false); - -static void ccw_machine_rhel760_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 }; - - ccw_machine_rhel820_instance_options(machine); - - s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat); - - /* The multiple-epoch facility was not available with rhel7.6.0 on z14GA1 */ - s390_cpudef_featoff(14, 1, S390_FEAT_MULTIPLE_EPOCH); - s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_QSIE); - s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_QTOUE); - s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_STOE); - s390_cpudef_featoff(14, 1, S390_FEAT_PTFF_STOUE); -} - -static void ccw_machine_rhel760_class_options(MachineClass *mc) -{ - ccw_machine_rhel820_class_options(mc); - /* We never published the s390x version of RHEL-AV 8.0 and 8.1, so add this here */ - compat_props_add(mc->compat_props, hw_compat_rhel_8_1, hw_compat_rhel_8_1_len); - compat_props_add(mc->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len); - compat_props_add(mc->compat_props, hw_compat_rhel_7_6, hw_compat_rhel_7_6_len); -} -DEFINE_CCW_MACHINE(rhel760, "rhel7.6.0", false); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); -- 2.39.3