|
 |
a83cc2 |
From a5e149c13279386c4fc3fae130289ac4ac53bd3e Mon Sep 17 00:00:00 2001
|
|
|
a83cc2 |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
a83cc2 |
Date: Mon, 10 May 2021 14:41:31 -0400
|
|
|
a83cc2 |
Subject: [PATCH 06/15] redhat: s390x: add rhel-8.5.0 compat machine
|
|
|
a83cc2 |
|
|
|
a83cc2 |
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
a83cc2 |
RH-MergeRequest: 5: Synchronize RHEL-AV 8.5 release 18 to RHEL 9 Beta
|
|
|
a83cc2 |
RH-Commit: [1/12] 3560ef3f773425f1479a131df7a351df2cbb502c (mrezanin/centos-src-qemu-kvm)
|
|
|
a83cc2 |
RH-Bugzilla: 1957194
|
|
|
a83cc2 |
RH-Acked-by: Danilo Cesar Lemes de Paula <ddepaula@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Greg Kurz <gkurz@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
a83cc2 |
|
|
|
a83cc2 |
Note that the compat entries for 8.4.0 were already wired up
|
|
|
a83cc2 |
in the rhel-8.4.0 machine type.
|
|
|
a83cc2 |
|
|
|
a83cc2 |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
a83cc2 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
a83cc2 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
a83cc2 |
---
|
|
|
a83cc2 |
hw/s390x/s390-virtio-ccw.c | 13 ++++++++++++-
|
|
|
a83cc2 |
1 file changed, 12 insertions(+), 1 deletion(-)
|
|
|
a83cc2 |
|
|
|
a83cc2 |
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
|
a83cc2 |
index 432f36bce5..667a99f336 100644
|
|
|
a83cc2 |
--- a/hw/s390x/s390-virtio-ccw.c
|
|
|
a83cc2 |
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
|
a83cc2 |
@@ -1074,15 +1074,26 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
|
|
|
a83cc2 |
DEFINE_CCW_MACHINE(2_4, "2.4", false);
|
|
|
a83cc2 |
#endif
|
|
|
a83cc2 |
|
|
|
a83cc2 |
+static void ccw_machine_rhel850_instance_options(MachineState *machine)
|
|
|
a83cc2 |
+{
|
|
|
a83cc2 |
+}
|
|
|
a83cc2 |
+
|
|
|
a83cc2 |
+static void ccw_machine_rhel850_class_options(MachineClass *mc)
|
|
|
a83cc2 |
+{
|
|
|
a83cc2 |
+}
|
|
|
a83cc2 |
+DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", true);
|
|
|
a83cc2 |
+
|
|
|
a83cc2 |
static void ccw_machine_rhel840_instance_options(MachineState *machine)
|
|
|
a83cc2 |
{
|
|
|
a83cc2 |
+ ccw_machine_rhel850_instance_options(machine);
|
|
|
a83cc2 |
}
|
|
|
a83cc2 |
|
|
|
a83cc2 |
static void ccw_machine_rhel840_class_options(MachineClass *mc)
|
|
|
a83cc2 |
{
|
|
|
a83cc2 |
+ ccw_machine_rhel850_class_options(mc);
|
|
|
a83cc2 |
compat_props_add(mc->compat_props, hw_compat_rhel_8_4, hw_compat_rhel_8_4_len);
|
|
|
a83cc2 |
}
|
|
|
a83cc2 |
-DEFINE_CCW_MACHINE(rhel840, "rhel8.4.0", true);
|
|
|
a83cc2 |
+DEFINE_CCW_MACHINE(rhel840, "rhel8.4.0", false);
|
|
|
a83cc2 |
|
|
|
a83cc2 |
static void ccw_machine_rhel820_instance_options(MachineState *machine)
|
|
|
a83cc2 |
{
|
|
|
a83cc2 |
--
|
|
|
a83cc2 |
2.27.0
|
|
|
a83cc2 |
|