From 25b42bd14aaccb87b51807343df72b0e473fa445 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 23 May 2024 14:14:16 +0300 Subject: [PATCH] import SLOF-20210217-2.module+el8.10.0+20141+6faa2812 --- ...erial-Do-not-close-stdout-on-quiesce.patch | 21 ++++++++----------- ...ke-read-and-write-methods-report-fai.patch | 21 ++++++++----------- SPECS/SLOF.spec | 16 +++++++------- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/SOURCES/slof-virtio-serial-Do-not-close-stdout-on-quiesce.patch b/SOURCES/slof-virtio-serial-Do-not-close-stdout-on-quiesce.patch index 6119f6d..594a6be 100644 --- a/SOURCES/slof-virtio-serial-Do-not-close-stdout-on-quiesce.patch +++ b/SOURCES/slof-virtio-serial-Do-not-close-stdout-on-quiesce.patch @@ -1,17 +1,14 @@ -From 75b3aadd67cd00f89304c7ce153da984635ddd4b Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Fri, 10 Nov 2023 12:24:20 +0100 +From 27f045e2d52ee49ddbb375b5593d4fc387aad4b0 Mon Sep 17 00:00:00 2001 +From: Jordan Niethe +Date: Tue, 29 Aug 2023 10:12:01 +1000 Subject: [PATCH 2/2] virtio-serial: Do not close stdout on quiesce -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit RH-Author: Thomas Huth -RH-MergeRequest: 2: Fix SLOF regression that prevents VM startup with virtio-serial consoles -RH-Jira: RHEL-15999 +RH-MergeRequest: 1: Fix SLOF crash when only using virtio console (without spapr-vty) +RH-Jira: RHEL-3709 +RH-Acked-by: David Gibson (Red Hat) RH-Acked-by: Laurent Vivier -RH-Acked-by: Cédric Le Goater -RH-Commit: [2/2] c31c71be9476f21a07ee386a0d62b62e2d37d373 +RH-Commit: [2/2] cbde239703a11aa2676a12b8415281d37cba54a5 Commit 76fee95 ("slof: Only close stdout for virtio-serial devices") says that commit cf28264 ("virtio-serial: Rework shutdown sequence") @@ -44,7 +41,7 @@ Signed-off-by: Jordan Niethe Reviewed-by: Thomas Huth Signed-off-by: Alexey Kardashevskiy (cherry picked from commit dd4d4ea0add97df078d571b48192adaf7c4b0d87) -JIRA: https://issues.redhat.com/browse/RHEL-15999 +Jira: https://issues.redhat.com/browse/RHEL-3709 Signed-off-by: Thomas Huth --- board-qemu/slof/virtio-serial.fs | 12 +++++------- @@ -86,5 +83,5 @@ index 41e2e04..de42cc7 100644 : write ( addr len -- actual ) -- -2.39.3 +2.41.0 diff --git a/SOURCES/slof-virtio-serial-Make-read-and-write-methods-report-fai.patch b/SOURCES/slof-virtio-serial-Make-read-and-write-methods-report-fai.patch index a00f30e..db0eea1 100644 --- a/SOURCES/slof-virtio-serial-Make-read-and-write-methods-report-fai.patch +++ b/SOURCES/slof-virtio-serial-Make-read-and-write-methods-report-fai.patch @@ -1,17 +1,14 @@ -From b9cd05513cc18363f46ad14a09c26b1dbc5c5c3f Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Fri, 10 Nov 2023 12:23:47 +0100 +From 67cbc16b3e6d34cf3932f88fd32323878026d6a0 Mon Sep 17 00:00:00 2001 +From: Kautuk Consul +Date: Tue, 29 Aug 2023 10:12:00 +1000 Subject: [PATCH 1/2] virtio-serial: Make read and write methods report failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit RH-Author: Thomas Huth -RH-MergeRequest: 2: Fix SLOF regression that prevents VM startup with virtio-serial consoles -RH-Jira: RHEL-15999 +RH-MergeRequest: 1: Fix SLOF crash when only using virtio console (without spapr-vty) +RH-Jira: RHEL-3709 +RH-Acked-by: David Gibson (Red Hat) RH-Acked-by: Laurent Vivier -RH-Acked-by: Cédric Le Goater -RH-Commit: [1/2] dbe438e180d62b9550abdc60e6166f88115fe642 +RH-Commit: [1/2] 7aee41dceade77a47edd794cab43672ff95896d0 The read and write methods return successfully even if the virtio device is closed (virtiodev is 0) and it is not able to send or receive any @@ -28,7 +25,7 @@ Signed-off-by: Jordan Niethe Reviewed-by: Thomas Huth Signed-off-by: Alexey Kardashevskiy (cherry picked from commit 63b66a5147069bda815989732442cb07790609db) -JIRA: https://issues.redhat.com/browse/RHEL-15999 +Jira: https://issues.redhat.com/browse/RHEL-3709 Signed-off-by: Thomas Huth --- board-qemu/slof/virtio-serial.fs | 4 ++-- @@ -57,5 +54,5 @@ index 82868e2..41e2e04 100644 virtiodev virtio-serial-getchar swap c! 1 ; -- -2.39.3 +2.41.0 diff --git a/SPECS/SLOF.spec b/SPECS/SLOF.spec index 13765a1..7cfe110 100644 --- a/SPECS/SLOF.spec +++ b/SPECS/SLOF.spec @@ -4,7 +4,7 @@ Name: SLOF Version: %{GITDATE} -Release: 1%{?dist}.1 +Release: 2%{?dist} Summary: Slimline Open Firmware Group: Applications/Emulators License: BSD @@ -12,9 +12,9 @@ URL: http://www.openfirmware.info/SLOF Source0: https://github.com/aik/SLOF/archive/qemu-slof-20210217.tar.gz -# For RHEL-15999 - SLOF regression prevents VM startup [rhel-8.9.0.z] +# For RHEL-3709 - SLOF regression prevents VM startup Patch1: slof-virtio-serial-Make-read-and-write-methods-report-fai.patch -# For RHEL-15999 - SLOF regression prevents VM startup [rhel-8.9.0.z] +# For RHEL-3709 - SLOF regression prevents VM startup Patch2: slof-virtio-serial-Do-not-close-stdout-on-quiesce.patch BuildArch: noarch @@ -60,11 +60,11 @@ install -c -m 0644 boot_rom.bin $RPM_BUILD_ROOT%{_datadir}/qemu-kvm/slof.bin %{_datadir}/qemu-kvm/slof.bin %changelog -* Wed Nov 22 2023 Miroslav Rezanina - 20210217-1.el8_9.1 -- slof-virtio-serial-Make-read-and-write-methods-report-fai.patch [RHEL-15999] -- slof-virtio-serial-Do-not-close-stdout-on-quiesce.patch [RHEL-15999] -- Resolves: RHEL-15999 - (SLOF regression prevents VM startup [rhel-8.9.0.z]) +* Wed Oct 04 2023 Jon Maloy - 20210217-2.el8 +- slof-virtio-serial-Make-read-and-write-methods-report-fai.patch [RHEL-3709] +- slof-virtio-serial-Do-not-close-stdout-on-quiesce.patch [RHEL-3709] +- Resolves: RHEL-3709 + (SLOF regression prevents VM startup) * Thu Sep 2 2021 Danilo C. L. de Paula - 20210217-1.el8 - Resolves: bz#2000225