|
 |
a83cc2 |
From 64a9a5c971c424ff2d8074f52d48dd6233dc97ac Mon Sep 17 00:00:00 2001
|
|
|
a83cc2 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
a83cc2 |
Date: Tue, 18 May 2021 18:27:54 +0200
|
|
|
a83cc2 |
Subject: [PATCH] hw/s390x: Remove the RHEL7-only machine type
|
|
|
a83cc2 |
|
|
|
a83cc2 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
a83cc2 |
RH-MergeRequest: 7: hw/s390x: Remove the RHEL7-only machine type
|
|
|
a83cc2 |
RH-Commit: [1/1] 8c53d4ae81 (thuth/qemu-kvm)
|
|
|
a83cc2 |
RH-Bugzilla: 1944730
|
|
|
a83cc2 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
a83cc2 |
|
|
|
a83cc2 |
We only support live migration from RHEL8 in RHEL9, so we can remove
|
|
|
a83cc2 |
the RHEL7 machine type "s390-ccw-virtio-rhel7.5.0".
|
|
|
a83cc2 |
|
|
|
a83cc2 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
a83cc2 |
---
|
|
|
a83cc2 |
hw/s390x/s390-virtio-ccw.c | 32 --------------------------------
|
|
|
a83cc2 |
1 file changed, 32 deletions(-)
|
|
|
a83cc2 |
|
|
|
a83cc2 |
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
|
a83cc2 |
index 8df6dd1c71..432f36bce5 100644
|
|
|
a83cc2 |
--- a/hw/s390x/s390-virtio-ccw.c
|
|
|
a83cc2 |
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
|
a83cc2 |
@@ -1125,38 +1125,6 @@ static void ccw_machine_rhel760_class_options(MachineClass *mc)
|
|
|
a83cc2 |
}
|
|
|
a83cc2 |
DEFINE_CCW_MACHINE(rhel760, "rhel7.6.0", false);
|
|
|
a83cc2 |
|
|
|
a83cc2 |
-static void ccw_machine_rhel750_instance_options(MachineState *machine)
|
|
|
a83cc2 |
-{
|
|
|
a83cc2 |
- static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V2_11 };
|
|
|
a83cc2 |
- ccw_machine_rhel760_instance_options(machine);
|
|
|
a83cc2 |
-
|
|
|
a83cc2 |
- /* before 2.12 we emulated the very first z900, and RHEL 7.5 is
|
|
|
a83cc2 |
- based on 2.10 */
|
|
|
a83cc2 |
- s390_set_qemu_cpu_model(0x2064, 7, 1, qemu_cpu_feat);
|
|
|
a83cc2 |
-
|
|
|
a83cc2 |
- /* bpb and ppa15 were only in the full model in RHEL 7.5 */
|
|
|
a83cc2 |
- s390_cpudef_featoff_greater(11, 1, S390_FEAT_PPA15);
|
|
|
a83cc2 |
- s390_cpudef_featoff_greater(11, 1, S390_FEAT_BPB);
|
|
|
a83cc2 |
-}
|
|
|
a83cc2 |
-
|
|
|
a83cc2 |
-GlobalProperty ccw_compat_rhel_7_5[] = {
|
|
|
a83cc2 |
- {
|
|
|
a83cc2 |
- .driver = TYPE_SCLP_EVENT_FACILITY,
|
|
|
a83cc2 |
- .property = "allow_all_mask_sizes",
|
|
|
a83cc2 |
- .value = "off",
|
|
|
a83cc2 |
- },
|
|
|
a83cc2 |
-};
|
|
|
a83cc2 |
-const size_t ccw_compat_rhel_7_5_len = G_N_ELEMENTS(ccw_compat_rhel_7_5);
|
|
|
a83cc2 |
-
|
|
|
a83cc2 |
-static void ccw_machine_rhel750_class_options(MachineClass *mc)
|
|
|
a83cc2 |
-{
|
|
|
a83cc2 |
- ccw_machine_rhel760_class_options(mc);
|
|
|
a83cc2 |
- compat_props_add(mc->compat_props, hw_compat_rhel_7_5, hw_compat_rhel_7_5_len);
|
|
|
a83cc2 |
- compat_props_add(mc->compat_props, ccw_compat_rhel_7_5, ccw_compat_rhel_7_5_len);
|
|
|
a83cc2 |
- S390_CCW_MACHINE_CLASS(mc)->hpage_1m_allowed = false;
|
|
|
a83cc2 |
-}
|
|
|
a83cc2 |
-DEFINE_CCW_MACHINE(rhel750, "rhel7.5.0", false);
|
|
|
a83cc2 |
-
|
|
|
a83cc2 |
static void ccw_machine_register_types(void)
|
|
|
a83cc2 |
{
|
|
|
a83cc2 |
type_register_static(&ccw_machine_info);
|
|
|
a83cc2 |
--
|
|
|
a83cc2 |
2.27.0
|
|
|
a83cc2 |
|