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