|
 |
26ba25 |
From 50dd601eeaa0d0aa6c082085b48b03351d2f0afa Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
26ba25 |
Date: Tue, 7 Aug 2018 09:05:53 +0000
|
|
|
26ba25 |
Subject: [PATCH 18/21] s390x: add RHEL 7.6 machine type for ccw
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Cornelia Huck <cohuck@redhat.com>
|
|
|
26ba25 |
Message-id: <20180807100554.29643-2-cohuck@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 81661
|
|
|
26ba25 |
O-Subject: [qemu-kvm RHEL8/virt212 PATCH 1/2] s390x: add RHEL 7.6 machine type for ccw
|
|
|
26ba25 |
Bugzilla: 1595718
|
|
|
26ba25 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Jens Freimann <jfreiman@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
Straight port of the s390-ccw-virtio-rhel7.6.0 machine from 7.6.
|
|
|
26ba25 |
Generic compat defines are already present.
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
hw/s390x/s390-virtio-ccw.c | 35 ++++++++++++++++++++++++++++++++---
|
|
|
26ba25 |
1 file changed, 32 insertions(+), 3 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
|
26ba25 |
index 3956ac3..64e2a3b 100644
|
|
|
26ba25 |
--- a/hw/s390x/s390-virtio-ccw.c
|
|
|
26ba25 |
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
|
26ba25 |
@@ -671,6 +671,8 @@ bool css_migration_enabled(void)
|
|
|
26ba25 |
} \
|
|
|
26ba25 |
type_init(ccw_machine_register_##suffix)
|
|
|
26ba25 |
|
|
|
26ba25 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
26ba25 |
+
|
|
|
26ba25 |
#define CCW_COMPAT_2_11 \
|
|
|
26ba25 |
HW_COMPAT_2_11 \
|
|
|
26ba25 |
{\
|
|
|
26ba25 |
@@ -682,8 +684,6 @@ bool css_migration_enabled(void)
|
|
|
26ba25 |
#define CCW_COMPAT_2_10 \
|
|
|
26ba25 |
HW_COMPAT_2_10
|
|
|
26ba25 |
|
|
|
26ba25 |
-#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
26ba25 |
-
|
|
|
26ba25 |
#define CCW_COMPAT_2_9 \
|
|
|
26ba25 |
HW_COMPAT_2_9 \
|
|
|
26ba25 |
{\
|
|
|
26ba25 |
@@ -883,14 +883,43 @@ DEFINE_CCW_MACHINE(2_4, "2.4", false);
|
|
|
26ba25 |
|
|
|
26ba25 |
#else
|
|
|
26ba25 |
|
|
|
26ba25 |
+/*
|
|
|
26ba25 |
+ * like CCW_COMPAT_2_11, but includes HW_COMPAT_RHEL7_5 (derived from
|
|
|
26ba25 |
+ * HW_COMPAT_2_11 and HW_COMPAT_2_10) instead of HW_COMPAT_2_11
|
|
|
26ba25 |
+ */
|
|
|
26ba25 |
+#define CCW_COMPAT_RHEL7_5 \
|
|
|
26ba25 |
+ HW_COMPAT_RHEL7_5 \
|
|
|
26ba25 |
+ {\
|
|
|
26ba25 |
+ .driver = TYPE_SCLP_EVENT_FACILITY,\
|
|
|
26ba25 |
+ .property = "allow_all_mask_sizes",\
|
|
|
26ba25 |
+ .value = "off",\
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+static void ccw_machine_rhel760_instance_options(MachineState *machine)
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+static void ccw_machine_rhel760_class_options(MachineClass *mc)
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+DEFINE_CCW_MACHINE(rhel760, "rhel7.6.0", true);
|
|
|
26ba25 |
+
|
|
|
26ba25 |
static void ccw_machine_rhel750_instance_options(MachineState *machine)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
+ static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V2_11 };
|
|
|
26ba25 |
+ ccw_machine_rhel760_instance_options(machine);
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+ /* before 2.12 we emulated the very first z900, and RHEL 7.5 is
|
|
|
26ba25 |
+ based on 2.10 */
|
|
|
26ba25 |
+ s390_set_qemu_cpu_model(0x2064, 7, 1, qemu_cpu_feat);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
static void ccw_machine_rhel750_class_options(MachineClass *mc)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
+ ccw_machine_rhel760_class_options(mc);
|
|
|
26ba25 |
+ SET_MACHINE_COMPAT(mc, CCW_COMPAT_RHEL7_5);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
-DEFINE_CCW_MACHINE(rhel750, "rhel7.5.0", true);
|
|
|
26ba25 |
+DEFINE_CCW_MACHINE(rhel750, "rhel7.5.0", false);
|
|
|
26ba25 |
|
|
|
26ba25 |
#endif
|
|
|
26ba25 |
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|