2fe1fc7b2d
- kvm-virtio-introduce-macro-VIRTIO_CONFIG_IRQ_IDX.patch [bz#1905805] - kvm-virtio-pci-decouple-notifier-from-interrupt-process.patch [bz#1905805] - kvm-virtio-pci-decouple-the-single-vector-from-the-inter.patch [bz#1905805] - kvm-vhost-introduce-new-VhostOps-vhost_set_config_call.patch [bz#1905805] - kvm-vhost-vdpa-add-support-for-config-interrupt.patch [bz#1905805] - kvm-virtio-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-vhost-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-virtio-net-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-virtio-mmio-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-virtio-pci-add-support-for-configure-interrupt.patch [bz#1905805] - kvm-s390x-s390-virtio-ccw-Activate-zPCI-features-on-s390.patch [bz#2159408] - kvm-vhost-fix-vq-dirty-bitmap-syncing-when-vIOMMU-is-ena.patch [bz#2124856] - kvm-block-drop-bdrv_remove_filter_or_cow_child.patch [bz#2155112] - kvm-qed-Don-t-yield-in-bdrv_qed_co_drain_begin.patch [bz#2155112] - kvm-test-bdrv-drain-Don-t-yield-in-.bdrv_co_drained_begi.patch [bz#2155112] - kvm-block-Revert-.bdrv_drained_begin-end-to-non-coroutin.patch [bz#2155112] - kvm-block-Remove-drained_end_counter.patch [bz#2155112] - kvm-block-Inline-bdrv_drain_invoke.patch [bz#2155112] - kvm-block-Fix-locking-for-bdrv_reopen_queue_child.patch [bz#2155112] - kvm-block-Drain-individual-nodes-during-reopen.patch [bz#2155112] - kvm-block-Don-t-use-subtree-drains-in-bdrv_drop_intermed.patch [bz#2155112] - kvm-stream-Replace-subtree-drain-with-a-single-node-drai.patch [bz#2155112] - kvm-block-Remove-subtree-drains.patch [bz#2155112] - kvm-block-Call-drain-callbacks-only-once.patch [bz#2155112] - kvm-block-Remove-ignore_bds_parents-parameter-from-drain.patch [bz#2155112] - kvm-block-Drop-out-of-coroutine-in-bdrv_do_drained_begin.patch [bz#2155112] - kvm-block-Don-t-poll-in-bdrv_replace_child_noperm.patch [bz#2155112] - kvm-block-Remove-poll-parameter-from-bdrv_parent_drained.patch [bz#2155112] - kvm-accel-introduce-accelerator-blocker-API.patch [bz#1979276] - kvm-KVM-keep-track-of-running-ioctls.patch [bz#1979276] - kvm-kvm-Atomic-memslot-updates.patch [bz#1979276] - Resolves: bz#1905805 (support config interrupt in vhost-vdpa qemu) - Resolves: bz#2159408 ([s390x] VMs with ISM passthrough don't autostart after leapp upgrade from RHEL 8) - Resolves: bz#2124856 (VM with virtio interface and iommu=on will crash when try to migrate) - Resolves: bz#2155112 (Qemu coredump after do snapshot of mirrored top image and its converted base image(iothread enabled)) - Resolves: bz#1979276 (SVM: non atomic memslot updates cause boot failure with seabios and cpu-pm=on)
71 lines
2.9 KiB
Diff
71 lines
2.9 KiB
Diff
From 51fcf352a97f2e99a6a3fb8ae663b45436304120 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
|
|
Date: Tue, 10 Jan 2023 14:25:34 +0100
|
|
Subject: [PATCH 11/31] s390x/s390-virtio-ccw: Activate zPCI features on
|
|
s390-ccw-virtio-rhel8.6.0
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Cédric Le Goater <clg@redhat.com>
|
|
RH-MergeRequest: 133: s390x/s390-virtio-ccw: Activate zPCI features on s390-ccw-virtio-rhel8.6.0
|
|
RH-Bugzilla: 2159408
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [1/1] 1ed82e56fe74a283a1726c4893dc3387e645072c (clegoate/qemu-kvm-c9s)
|
|
|
|
commit c7b14d3af7 ("s390x/s390-virtio-ccw: Switch off zPCI enhancements
|
|
on older machines") activated zPCI enhancement features (interpretation
|
|
and forward assist) silently on the s390-ccw-virtio-rhel8.6.0 machine
|
|
for RHEL8.8. It didn't seem to be a problem since migration is not
|
|
possible but it broke LEAPP upgrade to RHEL9 when the machine is
|
|
defined with a passthrough device. Activate the zPCI features also on
|
|
RHEL9.2 for the machines to be alike in both latest RHEL distros.
|
|
|
|
Upstream Status: RHEL-only
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2159408
|
|
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
|
---
|
|
hw/s390x/s390-virtio-ccw.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
index aa142a1a4e..4cdd59c394 100644
|
|
--- a/hw/s390x/s390-virtio-ccw.c
|
|
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
@@ -1234,8 +1234,14 @@ static void ccw_machine_rhel860_instance_options(MachineState *machine)
|
|
|
|
static void ccw_machine_rhel860_class_options(MachineClass *mc)
|
|
{
|
|
+ static GlobalProperty compat[] = {
|
|
+ { TYPE_S390_PCI_DEVICE, "interpret", "on", },
|
|
+ { TYPE_S390_PCI_DEVICE, "forwarding-assist", "on", },
|
|
+ };
|
|
+
|
|
ccw_machine_rhel900_class_options(mc);
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_8_6, hw_compat_rhel_8_6_len);
|
|
+ compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
|
|
|
|
/* All RHEL machines for prior major releases are deprecated */
|
|
mc->deprecation_reason = rhel_old_machine_deprecation;
|
|
@@ -1259,8 +1265,14 @@ static void ccw_machine_rhel850_instance_options(MachineState *machine)
|
|
|
|
static void ccw_machine_rhel850_class_options(MachineClass *mc)
|
|
{
|
|
+ static GlobalProperty compat[] = {
|
|
+ { TYPE_S390_PCI_DEVICE, "interpret", "off", },
|
|
+ { TYPE_S390_PCI_DEVICE, "forwarding-assist", "off", },
|
|
+ };
|
|
+
|
|
ccw_machine_rhel860_class_options(mc);
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len);
|
|
+ compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
|
|
mc->smp_props.prefer_sockets = true;
|
|
}
|
|
DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", false);
|
|
--
|
|
2.31.1
|
|
|