From a3bcde27feff7156c24d79f88e171b9d90322575 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 30 Sep 2021 09:25:23 +0200 Subject: [PATCH 4/4] redhat: Add s390x machine type compatibility update for 6.1 rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Thomas Huth RH-MergeRequest: 44: Add s390x machine type compatibility update for 6.1 rebase in RHEL 8.6 RH-Commit: [2/2] 13d855fd5dbeb1d67d0716e9f85384e7361d3f9d RH-Bugzilla: 1998950 RH-Acked-by: Greg Kurz RH-Acked-by: Daniel P. Berrangé RH-Acked-by: Cornelia Huck Add hw_compat_rhel_8_5 for the s390-ccw-virtio-rhel8.5.0 machine type. It's currently not urgently required, since hw_compat_rhel_8_5 only contains entries that are not related to s390x, but just in case some other entries are added there later, it's better if we add this right from the start to the s390x machine, too. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1998950 Signed-off-by: Thomas Huth --- hw/s390x/s390-virtio-ccw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 18effb8f7a..1a1bac57a2 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1091,6 +1091,7 @@ static void ccw_machine_rhel850_instance_options(MachineState *machine) static void ccw_machine_rhel850_class_options(MachineClass *mc) { + compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len); } DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", true); -- 2.18.2