From 18f6045496b816af03d19a546d83bd14732279c2 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 15 Dec 2023 14:33:32 +0300 Subject: [PATCH] import seabios-1.16.0-4.module+el8.9.0+19570+14a90618 --- ...-ZoneHigh-when-there-is-enough-memor.patch | 36 ++++++--------- ...alloc-use-variable-for-ZoneHigh-size.patch | 44 ++++++++----------- SPECS/seabios.spec | 14 +++--- 3 files changed, 39 insertions(+), 55 deletions(-) diff --git a/SOURCES/seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch b/SOURCES/seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch index 058a9ef..11b1f81 100644 --- a/SOURCES/seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch +++ b/SOURCES/seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch @@ -1,29 +1,21 @@ -From c80f616bf9c35de475539b90efa80a6134377d31 Mon Sep 17 00:00:00 2001 -From: Jon Maloy -Date: Thu, 3 Aug 2023 20:07:38 -0400 +From 93ba763d219be90b088b15a5fc585ff7f051e424 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Mon, 25 Apr 2022 09:25:31 +0200 Subject: [PATCH 2/2] malloc: use large ZoneHigh when there is enough memory -RH-Author: Jon Maloy -RH-MergeRequest: 10: malloc: use variable for ZoneHigh size -RH-Bugzilla: 2228485 -RH-Acked-by: Paolo Bonzini -RH-Acked-by: Miroslav Rezanina -RH-Commit: [2/2] d21be18a702b8935cd912127bc148af8d92af19f (jmaloy/jmaloy-src-seabios) +RH-Author: Paolo Bonzini +RH-MergeRequest: 9: malloc: use large ZoneHigh when there is enough memory +RH-Bugzilla: 2227373 +RH-Acked-by: Thomas Huth +RH-Acked-by: Oliver Steffen +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Jon Maloy +RH-Commit: [2/2] aa6072543a124ad152199d5263c590cb95609d81 -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2228485 -Upstream: Merged +In case there is enough memory installed use a large ZoneHigh. -commit dc88f9b72df52b22c35b127b80c487e0b6fca4af -Author: Gerd Hoffmann -Date: Mon Apr 25 09:25:31 2022 +0200 - - malloc: use large ZoneHigh when there is enough memory - - In case there is enough memory installed use a large ZoneHigh. - - Signed-off-by: Gerd Hoffmann - -Signed-off-by: Jon Maloy +Signed-off-by: Gerd Hoffmann +(cherry picked from commit dc88f9b72df52b22c35b127b80c487e0b6fca4af) --- src/config.h | 3 ++- src/malloc.c | 14 +++++++++----- diff --git a/SOURCES/seabios-malloc-use-variable-for-ZoneHigh-size.patch b/SOURCES/seabios-malloc-use-variable-for-ZoneHigh-size.patch index 9742387..4171bea 100644 --- a/SOURCES/seabios-malloc-use-variable-for-ZoneHigh-size.patch +++ b/SOURCES/seabios-malloc-use-variable-for-ZoneHigh-size.patch @@ -1,34 +1,26 @@ -From dd4841701064e7649c0fe70db1d7f322a08215d2 Mon Sep 17 00:00:00 2001 -From: Jon Maloy -Date: Thu, 3 Aug 2023 20:07:38 -0400 +From 2be730cc469be472bc3e3967690a83f1327e9fc1 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Mon, 25 Apr 2022 09:20:02 +0200 Subject: [PATCH 1/2] malloc: use variable for ZoneHigh size -RH-Author: Jon Maloy -RH-MergeRequest: 10: malloc: use variable for ZoneHigh size -RH-Bugzilla: 2228485 -RH-Acked-by: Paolo Bonzini -RH-Acked-by: Miroslav Rezanina -RH-Commit: [1/2] 7508668d9288ac3a2ed73802fc100c969c2e3784 (jmaloy/jmaloy-src-seabios) +RH-Author: Paolo Bonzini +RH-MergeRequest: 9: malloc: use large ZoneHigh when there is enough memory +RH-Bugzilla: 2227373 +RH-Acked-by: Thomas Huth +RH-Acked-by: Oliver Steffen +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Jon Maloy +RH-Commit: [1/2] 9e60f2104cc297ed4e78b92c5e5e11e11395bfc3 -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2228485 -Upstream: Merged +Use the variable highram_size instead of the BUILD_MAX_HIGHTABLE #define +for the ZoneHigh size. Initialize the new variable with the old #define, +so behavior does not change. -commit 3b91e8e9fe93d5ff7edf17f984c401f9e6ba55fe -Author: Gerd Hoffmann -Date: Mon Apr 25 09:20:02 2022 +0200 +This allows to easily adjust the ZoneHigh size at runtime in a followup +patch. - malloc: use variable for ZoneHigh size - - Use the variable highram_size instead of the BUILD_MAX_HIGHTABLE #define - for the ZoneHigh size. Initialize the new variable with the old #define, - so behavior does not change. - - This allows to easily adjust the ZoneHigh size at runtime in a followup - patch. - - Signed-off-by: Gerd Hoffmann - -Signed-off-by: Jon Maloy +Signed-off-by: Gerd Hoffmann +(cherry picked from commit 3b91e8e9fe93d5ff7edf17f984c401f9e6ba55fe) --- src/malloc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/SPECS/seabios.spec b/SPECS/seabios.spec index f18f7a0..1ba1493 100644 --- a/SPECS/seabios.spec +++ b/SPECS/seabios.spec @@ -30,9 +30,9 @@ Patch6: seabios-pci-refactor-the-pci_config_-functions.patch Patch7: seabios-reset-force-standard-PCI-configuration-access.patch # For bz#2101787 - [rhel.8.7] Loading a kernel/initrd is sometimes very slow Patch8: seabios-virtio-blk-use-larger-default-request-size.patch -# For bz#2228485 - "No bootable device" with OS boot disk interface VirtIO-SCSI and with more than 9 VirtIO disks. [rhel-8.8.0.z] +# For bz#2227373 - "No bootable device" with OS boot disk interface VirtIO-SCSI and with more than 9 VirtIO disks. Patch9: seabios-malloc-use-variable-for-ZoneHigh-size.patch -# For bz#2228485 - "No bootable device" with OS boot disk interface VirtIO-SCSI and with more than 9 VirtIO disks. [rhel-8.8.0.z] +# For bz#2227373 - "No bootable device" with OS boot disk interface VirtIO-SCSI and with more than 9 VirtIO disks. Patch10: seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch BuildRequires: python3 iasl @@ -155,11 +155,11 @@ install -m 0644 binaries/vgabios*.bin $RPM_BUILD_ROOT%{_datadir}/seavgabios * Tue Dec 12 2023 MSVSphere Packaging Team - 1.16.0-4.el8_8 - Rebuilt for MSVSphere 8.8 -* Tue Aug 08 2023 Jon Maloy - 1.16.0-4.el8_8 -- seabios-malloc-use-variable-for-ZoneHigh-size.patch [bz#2228485] -- seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch [bz#2228485] -- Resolves: bz#2228485 - ("No bootable device" with OS boot disk interface VirtIO-SCSI and with more than 9 VirtIO disks. [rhel-8.8.0.z]) +* Thu Aug 03 2023 Jon Maloy - 1.16.0-4 +- seabios-malloc-use-variable-for-ZoneHigh-size.patch [bz#2227373] +- seabios-malloc-use-large-ZoneHigh-when-there-is-enough-memor.patch [bz#2227373] +- Resolves: bz#2227373 + ("No bootable device" with OS boot disk interface VirtIO-SCSI and with more than 9 VirtIO disks.) * Wed Jul 27 2022 Miroslav Rezanina - 1.16.0-3 - seabios-virtio-blk-use-larger-default-request-size.patch [bz#2101787]