From 27c188c6a4cbd908269cf06affd24025708ecb5c Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 17 Nov 2022 16:47:16 +0100 Subject: redhat: Update s390x machine type compatibility for QEMU 7.2.0 update Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2143585 Upstream Status: n/a (rhel-only) Add the compatibility handling for the rebase from QEMU 7.1 to 7.2, i.e. the settings from ccw_machine_7_1_class_options() and ccw_machine_7_1_instance_options() to the rhel9.1.0 machine type (earlier settings have been added by previous rebases already). Signed-off-by: Thomas Huth --- hw/s390x/s390-virtio-ccw.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index ba640e3d9e..97e868ada0 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1195,12 +1195,21 @@ static void ccw_machine_rhel900_instance_options(MachineState *machine) static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_2 }; s390_set_qemu_cpu_model(0x3906, 14, 2, qemu_cpu_feat); + s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAIE); } static void ccw_machine_rhel900_class_options(MachineClass *mc) { + S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc); + static GlobalProperty compat[] = { + { TYPE_S390_PCI_DEVICE, "interpret", "off", }, + { TYPE_S390_PCI_DEVICE, "forwarding-assist", "off", }, + }; + + compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); compat_props_add(mc->compat_props, hw_compat_rhel_9_1, hw_compat_rhel_9_1_len); compat_props_add(mc->compat_props, hw_compat_rhel_9_0, hw_compat_rhel_9_0_len); + s390mc->max_threads = S390_MAX_CPUS; } DEFINE_CCW_MACHINE(rhel900, "rhel9.0.0", true); -- 2.31.1