* Tue Jun 27 2023 Oliver Steffen <osteffen@redhat.com> - 20230524-1

- Rebase to edk2-stable202305 tag [RHEL-585] - Resolves: RHEL-585 ([rhel-9.3] rebase EDK2 to edk2-stable202305) - Resolves: bz#2203094 (Add more than 17 pcie-root-ports, display Out Of Resource) - Resolves: bz#2055123 ([Q35] Failed to hot-plug a device whose membar > 2M into the vm)
2023-06-27 05:16:50 -04:00 · 2023-06-27 05:16:50 -04:00 · f6a4f10ae6
commit f6a4f10ae6
parent 06d527f3f0
35 changed files with 903 additions and 892 deletions
--- a/0002-Remove-submodules.patch
+++ b/0002-Remove-submodules.patch
@ -1,8 +1,17 @@
-From e059bdb72b083241da0742e11c2ac3cc61ed8ad9 Mon Sep 17 00:00:00 2001
+From a4954b2259c4be78f61127684239cb11486bc0f7 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Thu, 24 Mar 2022 03:23:02 -0400
 Subject: Remove submodules
 Rebase to edk2-stable202305: removing additional submodules:
 -  MdePkg/Library/BaseFdtLib/libfdt
 -  MdePkg/Library/MipiSysTLib/mipisyst
 -  UnitTestFrameworkPkg/Library/GoogleTestLib/googletest
 -  UnitTestFrameworkPkg/Library/SubhookLib/subhook
 Signed-off-by: Oliver Steffen <osteffen@redhat.com>
 Upstream edk2 tracks several submodules we do not need in RHEL (removal
 done by individual commits in previous RHEL versions):
@ -41,26 +50,35 @@ remove the include path too.
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit e05e0de713c4a2b8adb6ff9809611f222bfe50ed)
 ---
- .gitmodules                                   | 25 -------------------
+ .gitmodules                                   | 34 -------------------
 .../ArmSoftFloatLib/berkeley-softfloat-3      |  1 -
 BaseTools/Source/C/BrotliCompress/brotli      |  1 -
 BaseTools/Source/C/GNUmakefile                |  1 -
 CryptoPkg/.gitignore                          |  1 +
 CryptoPkg/Library/OpensslLib/openssl          |  1 -
 .../Library/BrotliCustomDecompressLib/brotli  |  1 -
- MdeModulePkg/MdeModulePkg.dec                 |  3 ---
+ MdeModulePkg/MdeModulePkg.dec                 |  3 --
 .../Universal/RegularExpressionDxe/oniguruma  |  1 -
 MdePkg/Library/BaseFdtLib/libfdt              |  1 -
 MdePkg/Library/MipiSysTLib/mipisyst           |  1 -
 MdePkg/MdePkg.dec                             |  5 ---
 RedfishPkg/Library/JsonLib/jansson            |  1 -
 UnitTestFrameworkPkg/Library/CmockaLib/cmocka |  1 -
- 11 files changed, 1 insertion(+), 36 deletions(-)
+ .../Library/GoogleTestLib/googletest          |  1 -
 .../Library/SubhookLib/subhook                |  1 -
 16 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 160000 ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
 delete mode 160000 BaseTools/Source/C/BrotliCompress/brotli
 create mode 100644 CryptoPkg/.gitignore
 delete mode 160000 CryptoPkg/Library/OpensslLib/openssl
 delete mode 160000 MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
 delete mode 160000 MdeModulePkg/Universal/RegularExpressionDxe/oniguruma
 delete mode 160000 MdePkg/Library/BaseFdtLib/libfdt
 delete mode 160000 MdePkg/Library/MipiSysTLib/mipisyst
 delete mode 160000 RedfishPkg/Library/JsonLib/jansson
 delete mode 160000 UnitTestFrameworkPkg/Library/CmockaLib/cmocka
 delete mode 160000 UnitTestFrameworkPkg/Library/GoogleTestLib/googletest
 delete mode 160000 UnitTestFrameworkPkg/Library/SubhookLib/subhook
 diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
 index 5275f657ef..39d7199753 100644
@ -75,12 +93,12 @@ index 5275f657ef..39d7199753 100644
   EfiRom \
   GenFfs \
 diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
-index e8058c8bfa..f33312fb35 100644
+index 95dd077e19..1609b6d9c2 100644
 --- a/MdeModulePkg/MdeModulePkg.dec
 +++ b/MdeModulePkg/MdeModulePkg.dec
-@@ -25,9 +25,6 @@
+@@ -26,9 +26,6 @@
 [Includes]
   Include
   Test/Mock/Include
 -[Includes.Common.Private]
 -  Library/BrotliCustomDecompressLib/brotli/c/include
@ -88,3 +106,26 @@ index e8058c8bfa..f33312fb35 100644
 [LibraryClasses]
   ##  @libraryclass  Defines a set of methods to reset whole system.
   ResetSystemLib|Include/Library/ResetSystemLib.h
 diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
 index b85614992b..57b0b5ea6f 100644
 --- a/MdePkg/MdePkg.dec
 +++ b/MdePkg/MdePkg.dec
@@ -29,7 +29,6 @@
   Include
   Test/UnitTest/Include
   Test/Mock/Include
 -  Library/MipiSysTLib/mipisyst/library/include
 [Includes.IA32]
   Include/Ia32
@@ -295,10 +294,6 @@
   #
   FdtLib|Include/Library/FdtLib.h
 -  ##  @libraryclass  Provides general mipi sys-T services.
 -  #
 -  MipiSysTLib|Include/Library/MipiSysTLib.h
 -
   ##  @libraryclass  Provides API to output Trace Hub debug message.
   #
   TraceHubDebugSysTLib|Include/Library/TraceHubDebugSysTLib.h
--- a/0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
+++ b/0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
@ -1,4 +1,4 @@
-From 11668111e3a73c14e5cfd71196190a63949372c9 Mon Sep 17 00:00:00 2001
+From 5eef1273ee036bfa0ba9da1b276e0bf130b1cfbc Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Tue, 25 Feb 2014 22:40:01 +0100
 Subject: MdeModulePkg: TerminalDxe: set xterm resolution on mode change (RH
@ -95,30 +95,30 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 3 files changed, 36 insertions(+)
 diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
-index f33312fb35..020f62fcc6 100644
+index 1609b6d9c2..705fb02f66 100644
 --- a/MdeModulePkg/MdeModulePkg.dec
 +++ b/MdeModulePkg/MdeModulePkg.dec
-@@ -2102,6 +2102,10 @@
+@@ -2127,6 +2127,10 @@
   # @Prompt The shared bit mask when Intel Tdx is enabled.
   gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask|0x0|UINT64|0x10000025
-+  ## Controls whether TerminalDxe outputs an XTerm resize sequence on terminal
+  ## Controls whether TerminalDxe outputs an XTerm resize sequence on terminal
-+  #  mode change.
+  #  mode change.
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE|BOOLEAN|0x00010080
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE|BOOLEAN|0x00010080
-+
+
 [PcdsPatchableInModule]
   ## Specify memory size with page number for PEI code when
   #  Loading Module at Fixed Address feature is enabled.
 diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
-index 7809869e7d..0ce931d644 100644
+index 7809869e7d..3be801039b 100644
 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
 +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -7,6 +7,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
-+#include <Library/PrintLib.h>
+#include <Library/PrintLib.h>
-+
+
 #include "Terminal.h"
 //
@ -126,16 +126,16 @@ index 7809869e7d..0ce931d644 100644
 CHAR16  mCursorForwardString[]     = { ESC, '[', '0', '0', 'C', 0 };
 CHAR16  mCursorBackwardString[]    = { ESC, '[', '0', '0', 'D', 0 };
-+//
+//
-+// Note that this is an ASCII format string, taking two INT32 arguments:
+// Note that this is an ASCII format string, taking two INT32 arguments:
-+// rows, columns.
+// rows, columns.
-+//
+//
-+// A %d (INT32) format specification can expand to at most 11 characters.
+// A %d (INT32) format specification can expand to at most 11 characters.
-+//
+//
-+CHAR8 mResizeTextAreaFormatString[] = "\x1B[8;%d;%dt";
+CHAR8 mResizeTextAreaFormatString[] = "\x1B[8;%d;%dt";
-+#define RESIZE_SEQ_SIZE (sizeof mResizeTextAreaFormatString + 2 * (11 - 2))
+#define RESIZE_SEQ_SIZE (sizeof mResizeTextAreaFormatString + 2 * (11 - 2))
-+
+
-+
+
 //
 // Body of the ConOut functions
 //
@ -143,36 +143,36 @@ index 7809869e7d..0ce931d644 100644
     return EFI_DEVICE_ERROR;
   }
-+  if (PcdGetBool (PcdResizeXterm)) {
+  if (PcdGetBool (PcdResizeXterm)) {
-+    CHAR16 ResizeSequence[RESIZE_SEQ_SIZE];
+    CHAR16 ResizeSequence[RESIZE_SEQ_SIZE];
-+
+
-+    UnicodeSPrintAsciiFormat (
+    UnicodeSPrintAsciiFormat (
-+      ResizeSequence,
+      ResizeSequence,
-+      sizeof ResizeSequence,
+      sizeof ResizeSequence,
-+      mResizeTextAreaFormatString,
+      mResizeTextAreaFormatString,
-+      (INT32) TerminalDevice->TerminalConsoleModeData[ModeNumber].Rows,
+      (INT32) TerminalDevice->TerminalConsoleModeData[ModeNumber].Rows,
-+      (INT32) TerminalDevice->TerminalConsoleModeData[ModeNumber].Columns
+      (INT32) TerminalDevice->TerminalConsoleModeData[ModeNumber].Columns
-+      );
+      );
-+    TerminalDevice->OutputEscChar = TRUE;
+    TerminalDevice->OutputEscChar = TRUE;
-+    Status                        = This->OutputString (This, ResizeSequence);
+    Status                        = This->OutputString (This, ResizeSequence);
-+    TerminalDevice->OutputEscChar = FALSE;
+    TerminalDevice->OutputEscChar = FALSE;
-+    if (EFI_ERROR (Status)) {
+    if (EFI_ERROR (Status)) {
-+      return EFI_DEVICE_ERROR;
+      return EFI_DEVICE_ERROR;
-+    }
+    }
-+  }
+  }
-+
+
   This->Mode->Mode = (INT32)ModeNumber;
   Status = This->ClearScreen (This);
 diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-index b2a8aeba85..eff6253465 100644
+index b2a8aeba85..96810f337c 100644
 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
 +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -55,6 +55,7 @@
   DebugLib
   PcdLib
   BaseLib
-+  PrintLib
+  PrintLib
 [Guids]
   ## SOMETIMES_PRODUCES ## Variable:L"ConInDev"
@ -180,10 +180,10 @@ index b2a8aeba85..eff6253465 100644
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType           ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable    ## CONSUMES
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm             ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm             ## CONSUMES
 # [Event]
 # # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout.
 -- 
-2.39.1
+2.39.3
--- a/0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
+++ b/0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
@ -1,4 +1,4 @@
-From 621a73783ba83b3f1038193726197b4d47da31a5 Mon Sep 17 00:00:00 2001
+From a1d4a00637d184cff886bc150cdfd8de165ed162 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Wed, 14 Oct 2015 15:59:06 +0200
 Subject: OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only)
@ -82,133 +82,133 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 9 files changed, 21 insertions(+), 1 deletion(-)
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index 1cebd6b4bc..0bec51d5ee 100644
+index b32049194d..c62d6e2805 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
 +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -477,6 +477,7 @@
+@@ -476,6 +476,7 @@
 [PcdsDynamicDefault]
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
 diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
-index fda7d2b9e5..97a74cfb07 100644
+index 2a1139daaa..cfa4943ed4 100644
 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc
 +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
-@@ -587,6 +587,7 @@
+@@ -575,6 +575,7 @@
   #   ($(SMM_REQUIRE) == FALSE)
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
 !if $(SMM_REQUIRE) == FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
 diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
-index 95b9594ddc..bf4bf4cb1d 100644
+index d4403f11a7..e4bc192733 100644
 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
 +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
-@@ -485,6 +485,7 @@
+@@ -473,6 +473,7 @@
   #   ($(SMM_REQUIRE) == FALSE)
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
 diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
-index 0d65d21e65..6ee25b2a39 100644
+index 5f671bc384..49d1d7ef5c 100644
 --- a/OvmfPkg/Microvm/MicrovmX64.dsc
 +++ b/OvmfPkg/Microvm/MicrovmX64.dsc
-@@ -584,7 +584,7 @@
+@@ -572,7 +572,7 @@
   # only set when
   #   ($(SMM_REQUIRE) == FALSE)
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
 -
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index 22dc29330d..9242e77140 100644
+index e333b8b418..b4f7334569 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -606,6 +606,7 @@
+@@ -595,6 +595,7 @@
   #   ($(SMM_REQUIRE) == FALSE)
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
 !if $(SMM_REQUIRE) == FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 6b539814bd..43d40ddc9c 100644
+index 25974230a2..e11ccae622 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -613,6 +613,7 @@
+@@ -603,6 +603,7 @@
   #   ($(SMM_REQUIRE) == FALSE)
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
 !if $(SMM_REQUIRE) == FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index e3c64456df..231e5e7e4d 100644
+index c1762ffca4..4ac6b492e2 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -636,6 +636,7 @@
+@@ -626,6 +626,7 @@
   #   ($(SMM_REQUIRE) == FALSE)
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
 !if $(SMM_REQUIRE) == FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
 diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
-index 148240342b..d324ae95f8 100644
+index c56247e294..bf5d37c1f6 100644
 --- a/OvmfPkg/PlatformPei/Platform.c
 +++ b/OvmfPkg/PlatformPei/Platform.c
@@ -41,6 +41,18 @@
 #include "Platform.h"
-+#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName)                   \
+#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName)                   \
-+          do {                                                      \
+          do {                                                      \
-+            BOOLEAN       Setting;                                  \
+            BOOLEAN       Setting;                                  \
-+            RETURN_STATUS PcdStatus;                                \
+            RETURN_STATUS PcdStatus;                                \
-+                                                                    \
+                                                                    \
-+            if (!RETURN_ERROR (QemuFwCfgParseBool (                 \
+            if (!RETURN_ERROR (QemuFwCfgParseBool (                 \
-+                              "opt/ovmf/" #TokenName, &Setting))) { \
+                              "opt/ovmf/" #TokenName, &Setting))) { \
-+              PcdStatus = PcdSetBoolS (TokenName, Setting);         \
+              PcdStatus = PcdSetBoolS (TokenName, Setting);         \
-+              ASSERT_RETURN_ERROR (PcdStatus);                      \
+              ASSERT_RETURN_ERROR (PcdStatus);                      \
-+            }                                                       \
+            }                                                       \
-+          } while (0)
+          } while (0)
-+
+
 EFI_PEI_PPI_DESCRIPTOR  mPpiBootMode[] = {
   {
     EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
-@@ -385,6 +397,7 @@ InitializePlatform (
+@@ -386,6 +398,7 @@ InitializePlatform (
     MemTypeInfoInitialization (PlatformInfoHob);
     MemMapInitialization (PlatformInfoHob);
     NoexecDxeInitialization (PlatformInfoHob);
-+    UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);
+    UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);
   }
   InstallClearCacheCallback ();
 diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
-index 1fadadeb55..3e28e1596d 100644
+index 3934aeed95..d84aefee6d 100644
 --- a/OvmfPkg/PlatformPei/PlatformPei.inf
 +++ b/OvmfPkg/PlatformPei/PlatformPei.inf
-@@ -99,6 +99,7 @@
+@@ -100,6 +100,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
 -- 
-2.39.1
+2.39.3
--- a/0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
+++ b/0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
@ -1,4 +1,4 @@
-From 58dedcbd4dde8db3f413dd708bb7df1478e598cd Mon Sep 17 00:00:00 2001
+From 5b458fdeac6a656ab83e0be1662f22e293a5622a Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Sun, 26 Jul 2015 08:02:50 +0000
 Subject: ArmVirtPkg: take PcdResizeXterm from the QEMU command line (RH only)
@ -95,109 +95,109 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
 diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
-index 72a0cacab4..7a3be7e859 100644
+index 449e73b9e1..b6b9a7f192 100644
 --- a/ArmVirtPkg/ArmVirtQemu.dsc
 +++ b/ArmVirtPkg/ArmVirtQemu.dsc
-@@ -304,6 +304,8 @@
+@@ -307,6 +307,8 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0
 !endif
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
-+
+
 [PcdsDynamicHii]
   gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS
-@@ -418,7 +420,10 @@
+@@ -416,7 +418,10 @@
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
 -  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-+  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf {
+  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf {
-+    <LibraryClasses>
+    <LibraryClasses>
-+      NULL|ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
+      NULL|ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
-+  }
+  }
   MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
 new file mode 100644
-index 0000000000..bfd3a6a535
+index 0000000000..37f71c5e4c
 --- /dev/null
 +++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
@@ -0,0 +1,34 @@
-+/** @file
+/** @file
-+*  Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg
+*  Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg
-+*
+*
-+*  Copyright (C) 2015-2020, Red Hat, Inc.
+*  Copyright (C) 2015-2020, Red Hat, Inc.
-+*  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
+*  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
-+*
+*
-+*  SPDX-License-Identifier: BSD-2-Clause-Patent
+*  SPDX-License-Identifier: BSD-2-Clause-Patent
-+**/
+**/
-+
+
-+#include <Library/DebugLib.h>
+#include <Library/DebugLib.h>
-+#include <Library/PcdLib.h>
+#include <Library/PcdLib.h>
-+#include <Library/QemuFwCfgSimpleParserLib.h>
+#include <Library/QemuFwCfgSimpleParserLib.h>
-+
+
-+#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName)                             \
+#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName)                             \
-+          do {                                                                \
+          do {                                                                \
-+            BOOLEAN       Setting;                                            \
+            BOOLEAN       Setting;                                            \
-+            RETURN_STATUS PcdStatus;                                          \
+            RETURN_STATUS PcdStatus;                                          \
-+                                                                              \
+                                                                              \
-+            if (!RETURN_ERROR (QemuFwCfgParseBool (                           \
+            if (!RETURN_ERROR (QemuFwCfgParseBool (                           \
-+                    "opt/org.tianocore.edk2.aavmf/" #TokenName, &Setting))) { \
+                    "opt/org.tianocore.edk2.aavmf/" #TokenName, &Setting))) { \
-+              PcdStatus = PcdSetBoolS (TokenName, Setting);                   \
+              PcdStatus = PcdSetBoolS (TokenName, Setting);                   \
-+              ASSERT_RETURN_ERROR (PcdStatus);                                \
+              ASSERT_RETURN_ERROR (PcdStatus);                                \
-+            }                                                                 \
+            }                                                                 \
-+          } while (0)
+          } while (0)
-+
+
-+RETURN_STATUS
+RETURN_STATUS
-+EFIAPI
+EFIAPI
-+TerminalPcdProducerLibConstructor (
+TerminalPcdProducerLibConstructor (
-+  VOID
+  VOID
-+  )
+  )
-+{
+{
-+  UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);
+  UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);
-+  return RETURN_SUCCESS;
+  return RETURN_SUCCESS;
-+}
+}
 diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
 new file mode 100644
-index 0000000000..a51dbd1670
+index 0000000000..c840f6f97a
 --- /dev/null
 +++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
@@ -0,0 +1,33 @@
-+## @file
+## @file
-+#  Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg
+#  Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg
-+#
+#
-+#  Copyright (C) 2015-2020, Red Hat, Inc.
+#  Copyright (C) 2015-2020, Red Hat, Inc.
-+#  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
+#  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
-+#
+#
-+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
-+##
+##
-+
+
-+[Defines]
+[Defines]
-+  INF_VERSION                    = 0x00010005
+  INF_VERSION                    = 0x00010005
-+  BASE_NAME                      = TerminalPcdProducerLib
+  BASE_NAME                      = TerminalPcdProducerLib
-+  FILE_GUID                      = 4a0c5ed7-8c42-4c01-8f4c-7bf258316a96
+  FILE_GUID                      = 4a0c5ed7-8c42-4c01-8f4c-7bf258316a96
-+  MODULE_TYPE                    = BASE
+  MODULE_TYPE                    = BASE
-+  VERSION_STRING                 = 1.0
+  VERSION_STRING                 = 1.0
-+  LIBRARY_CLASS                  = NULL
+  LIBRARY_CLASS                  = NULL
-+  CONSTRUCTOR                    = TerminalPcdProducerLibConstructor
+  CONSTRUCTOR                    = TerminalPcdProducerLibConstructor
-+
+
-+[Sources]
+[Sources]
-+  TerminalPcdProducerLib.c
+  TerminalPcdProducerLib.c
-+
+
-+[Packages]
+[Packages]
-+  MdeModulePkg/MdeModulePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
-+  MdePkg/MdePkg.dec
+  MdePkg/MdePkg.dec
-+  OvmfPkg/OvmfPkg.dec
+  OvmfPkg/OvmfPkg.dec
-+
+
-+[LibraryClasses]
+[LibraryClasses]
-+  DebugLib
+  DebugLib
-+  PcdLib
+  PcdLib
-+  QemuFwCfgSimpleParserLib
+  QemuFwCfgSimpleParserLib
-+
+
-+[Pcd]
+[Pcd]
-+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## SOMETIMES_PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## SOMETIMES_PRODUCES
 -- 
-2.39.1
+2.39.3
--- a/0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch
+++ b/0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch
@ -1,4 +1,4 @@
-From 9f0df40d1623ce6af4ce2653d555d216c2c15355 Mon Sep 17 00:00:00 2001
+From 23e43af54fd29691bf94a5f4e2ac3014b819e37e Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Tue, 21 Nov 2017 00:57:45 +0100
 Subject: OvmfPkg: enable DEBUG_VERBOSE (RHEL only)
@ -65,57 +65,57 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 4 files changed, 4 insertions(+), 4 deletions(-)
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index 0bec51d5ee..ae3f9c75c4 100644
+index c62d6e2805..ac73229829 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
 +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -429,7 +429,7 @@
+@@ -426,7 +426,7 @@
   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may
   #                             // significantly impact boot performance
   # DEBUG_ERROR     0x80000000  // Error
 -  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index 9242e77140..bb3b0c1c96 100644
+index b4f7334569..0b9fc53884 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -546,7 +546,7 @@
+@@ -535,7 +535,7 @@
   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may
   #                             // significantly impact boot performance
   # DEBUG_ERROR     0x80000000  // Error
 -  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 43d40ddc9c..19b968bd94 100644
+index e11ccae622..51823fb746 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -551,7 +551,7 @@
+@@ -541,7 +541,7 @@
   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may
   #                             // significantly impact boot performance
   # DEBUG_ERROR     0x80000000  // Error
 -  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 231e5e7e4d..876f2374a2 100644
+index 4ac6b492e2..d1474b0155 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -572,7 +572,7 @@
+@@ -562,7 +562,7 @@
   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may
   #                             // significantly impact boot performance
   # DEBUG_ERROR     0x80000000  // Error
 -  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
 -- 
-2.39.1
+2.39.3
--- a/0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch
+++ b/0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch
@ -1,4 +1,4 @@
-From 7e05ce023df72737aa4ac840e445bf3fe07e8bb2 Mon Sep 17 00:00:00 2001
+From 13c6ac7528d5be2638f121b19432597cc529ea7c Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Tue, 21 Nov 2017 00:57:46 +0100
 Subject: OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in
@ -76,98 +76,99 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 (cherry picked from commit 1355849ad97c1e4a5c430597a377165a5cc118f7)
 ---
 OvmfPkg/AmdSev/AmdSevX64.dsc | 10 ++++++++--
- OvmfPkg/OvmfPkgIa32.dsc      | 10 ++++++++--
+ OvmfPkg/OvmfPkgIa32.dsc      | 12 +++++++++---
 OvmfPkg/OvmfPkgIa32X64.dsc   | 10 ++++++++--
 OvmfPkg/OvmfPkgX64.dsc       | 10 ++++++++--
- 4 files changed, 32 insertions(+), 8 deletions(-)
+ 4 files changed, 33 insertions(+), 9 deletions(-)
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index ae3f9c75c4..c7d7add60d 100644
+index ac73229829..70f154b477 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
 +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -682,8 +682,14 @@
+@@ -684,8 +684,14 @@
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
 -  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
 -  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
-+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
-+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   #
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index bb3b0c1c96..30b843d228 100644
+index 0b9fc53884..b05e010069 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -851,9 +851,15 @@
+@@ -841,9 +841,15 @@
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
 !ifndef $(CSM_ENABLE)
 -  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
-+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
+-!endif
 +    <PcdsFixedAtBuild>
 +      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
 +  }
 !endif
 -  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
-+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
 +!endif
 +  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
 +    <PcdsFixedAtBuild>
 +      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
 +  }
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   #
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 19b968bd94..2327c5c296 100644
+index 51823fb746..78f97ff17e 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -864,9 +864,15 @@
+@@ -855,9 +855,15 @@
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
 !ifndef $(CSM_ENABLE)
 -  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
-+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
 !endif
 -  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
-+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   #
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 876f2374a2..49b914c29f 100644
+index d1474b0155..2a4829d26e 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -937,9 +937,15 @@
+@@ -929,9 +929,15 @@
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
 !ifndef $(CSM_ENABLE)
 -  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
-+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
 !endif
 -  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
-+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   #
 -- 
-2.39.1
+2.39.3
--- a/0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch
+++ b/0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch
@ -1,4 +1,4 @@
-From 7421895c5b3fbff08180ccacd6e6fd528d1ea291 Mon Sep 17 00:00:00 2001
+From 6e76f73b1ea3bac22d248499b9c2062ca5ed020d Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Wed, 27 Jan 2016 03:05:18 +0100
 Subject: ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in QemuRamfbDxe (RH
@ -61,23 +61,23 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 2 files changed, 8 insertions(+), 2 deletions(-)
 diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
-index 7a3be7e859..865172c5d5 100644
+index b6b9a7f192..176246d683 100644
 --- a/ArmVirtPkg/ArmVirtQemu.dsc
 +++ b/ArmVirtPkg/ArmVirtQemu.dsc
-@@ -546,7 +546,10 @@
+@@ -544,7 +544,10 @@
   #
   # Video support
   #
 -  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
-+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF
-+  }
+  }
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   OvmfPkg/PlatformDxe/Platform.inf
 diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
-index 3cb9120e4e..02877284bf 100644
+index 3cb9120e4e..18d59c2414 100644
 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
 +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -444,7 +444,10 @@
@ -85,13 +85,13 @@ index 3cb9120e4e..02877284bf 100644
   # Video support
   #
 -  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
-+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF
-+  }
+  }
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   OvmfPkg/PlatformDxe/Platform.inf
 -- 
-2.39.1
+2.39.3
--- a/0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch
+++ b/0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch
@ -1,4 +1,4 @@
-From 3f92cf84a81b94586a40a7668a6216bc0feb5701 Mon Sep 17 00:00:00 2001
+From fe859725d7da9d4452d79b65aad4b4cb3589e873 Mon Sep 17 00:00:00 2001
 From: Philippe Mathieu-Daude <philmd@redhat.com>
 Date: Thu, 1 Aug 2019 20:43:48 +0200
 Subject: OvmfPkg: QemuRamfbDxe: Do not report DXE failure on Aarch64 silent
@ -47,14 +47,14 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 2 files changed, 15 insertions(+)
 diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c
-index f5113fbc78..0015c4fc9c 100644
+index 5a1044f0dc..83c6d26c74 100644
 --- a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c
 +++ b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c
@@ -13,6 +13,7 @@
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
-+#include <Library/DebugPrintErrorLevelLib.h>
+#include <Library/DebugPrintErrorLevelLib.h>
 #include <Library/DevicePathLib.h>
 #include <Library/FrameBufferBltLib.h>
 #include <Library/MemoryAllocationLib.h>
@ -62,34 +62,34 @@ index f5113fbc78..0015c4fc9c 100644
   Status = QemuFwCfgFindFile ("etc/ramfb", &mRamfbFwCfgItem, &FwCfgSize);
   if (EFI_ERROR (Status)) {
-+#if defined (MDE_CPU_AARCH64)
+#if defined (MDE_CPU_AARCH64)
-+    //
+    //
-+    // RHBZ#1714446
+    // RHBZ#1714446
-+    // If no ramfb device was configured, this platform DXE driver should
+    // If no ramfb device was configured, this platform DXE driver should
-+    // returns EFI_NOT_FOUND, so the DXE Core can unload it. However, even
+    // returns EFI_NOT_FOUND, so the DXE Core can unload it. However, even
-+    // using a silent build, an error message is issued to the guest console.
+    // using a silent build, an error message is issued to the guest console.
-+    // Since this confuse users, return success and stay resident. The wasted
+    // Since this confuse users, return success and stay resident. The wasted
-+    // guest RAM still gets freed later after ExitBootServices().
+    // guest RAM still gets freed later after ExitBootServices().
-+    //
+    //
-+    if (GetDebugPrintErrorLevel () == DEBUG_ERROR) {
+    if (GetDebugPrintErrorLevel () == DEBUG_ERROR) {
-+      return EFI_SUCCESS;
+      return EFI_SUCCESS;
-+    }
+    }
-+#endif
+#endif
     return EFI_NOT_FOUND;
   }
 diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
-index e3890b8c20..6ffee5acb2 100644
+index e3890b8c20..f79a4bc987 100644
 --- a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
 +++ b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
@@ -29,6 +29,7 @@
   BaseLib
   BaseMemoryLib
   DebugLib
-+  DebugPrintErrorLevelLib
+  DebugPrintErrorLevelLib
   DevicePathLib
   FrameBufferBltLib
   MemoryAllocationLib
 -- 
-2.39.1
+2.39.3
--- a/0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch
+++ b/0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch
@ -1,4 +1,4 @@
-From e879769b4709eb71bb1ec96054e2c6c8a845f94c Mon Sep 17 00:00:00 2001
+From 4939fadb84796923b287becaecd568d5d77fe20b Mon Sep 17 00:00:00 2001
 From: Paolo Bonzini <pbonzini@redhat.com>
 Date: Tue, 21 Nov 2017 00:57:47 +0100
 Subject: OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe (RH
@ -63,69 +63,69 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 4 files changed, 16 insertions(+), 4 deletions(-)
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index c7d7add60d..2ea6fad201 100644
+index 70f154b477..0d30ee9526 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
 +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -676,7 +676,10 @@
+@@ -678,7 +678,10 @@
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
 -  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
-+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index 30b843d228..db1cde0a3b 100644
+index b05e010069..ef6362aac5 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -844,7 +844,10 @@
+@@ -834,7 +834,10 @@
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
 -  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
-+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 2327c5c296..938eaba74a 100644
+index 78f97ff17e..1793cc96fc 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -857,7 +857,10 @@
+@@ -848,7 +848,10 @@
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
 -  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
-+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 49b914c29f..91fbe83bfa 100644
+index 2a4829d26e..c32a36b513 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -930,7 +930,10 @@
+@@ -922,7 +922,10 @@
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
 -  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
-+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {
-+    <PcdsFixedAtBuild>
+    <PcdsFixedAtBuild>
-+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-+  }
+  }
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
 -- 
-2.39.1
+2.39.3
--- a/0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch
+++ b/0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch
@ -1,4 +1,4 @@
-From 93747e5ac7133df0c537fc0a20ea4227c8222be8 Mon Sep 17 00:00:00 2001
+From b32764469522eb1ac742a34e2ff8b513a329cc41 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Wed, 24 Jun 2020 11:31:36 +0200
 Subject: OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel" in
@ -32,14 +32,14 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 2 files changed, 18 insertions(+)
 diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
-index d4f3cd9225..416be93fb7 100644
+index 3c12085f6c..e192809198 100644
 --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
 +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
@@ -19,6 +19,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BlobVerifierLib.h>
 #include <Library/DebugLib.h>
-+#include <Library/DebugPrintErrorLevelLib.h>
+#include <Library/DebugPrintErrorLevelLib.h>
 #include <Library/DevicePathLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/QemuFwCfgLib.h>
@ -47,37 +47,37 @@ index d4f3cd9225..416be93fb7 100644
   if (KernelBlob->Data == NULL) {
     Status = EFI_NOT_FOUND;
-+#if defined (MDE_CPU_AARCH64)
+#if defined (MDE_CPU_AARCH64)
-+    //
+    //
-+    // RHBZ#1844682
+    // RHBZ#1844682
-+    //
+    //
-+    // If the "-kernel" QEMU option is not being used, this platform DXE driver
+    // If the "-kernel" QEMU option is not being used, this platform DXE driver
-+    // should return EFI_NOT_FOUND, so that the DXE Core can unload it.
+    // should return EFI_NOT_FOUND, so that the DXE Core can unload it.
-+    // However, the associated error message, logged by the DXE Core to the
+    // However, the associated error message, logged by the DXE Core to the
-+    // serial console, is not desired in the silent edk2-aarch64 build, given
+    // serial console, is not desired in the silent edk2-aarch64 build, given
-+    // that the absence of "-kernel" is nothing out of the ordinary. Therefore,
+    // that the absence of "-kernel" is nothing out of the ordinary. Therefore,
-+    // return success and stay resident. The wasted guest RAM still gets freed
+    // return success and stay resident. The wasted guest RAM still gets freed
-+    // after ExitBootServices().
+    // after ExitBootServices().
-+    //
+    //
-+    if (GetDebugPrintErrorLevel () == DEBUG_ERROR) {
+    if (GetDebugPrintErrorLevel () == DEBUG_ERROR) {
-+      Status = EFI_SUCCESS;
+      Status = EFI_SUCCESS;
-+    }
+    }
-+#endif
+#endif
     goto FreeBlobs;
   }
 diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
-index 7b35adb8e0..e0331c6e2c 100644
+index 7b35adb8e0..23d9f5fca1 100644
 --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
 +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
@@ -28,6 +28,7 @@
   BaseLib
   BaseMemoryLib
   DebugLib
-+  DebugPrintErrorLevelLib
+  DebugPrintErrorLevelLib
   DevicePathLib
   MemoryAllocationLib
   QemuFwCfgLib
 -- 
-2.39.1
+2.39.3
--- a/0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch
+++ b/0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch
@ -1,4 +1,4 @@
-From 2cb13b5fe5a3d631a356d5a86da8266922ff2774 Mon Sep 17 00:00:00 2001
+From f38c073fdceec2dac64dc3632ad531f5b73fda8e Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Wed, 24 Jun 2020 11:40:09 +0200
 Subject: SecurityPkg/Tcg2Dxe: suppress error on no swtpm in silent aa64 build
@ -31,14 +31,14 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 2 files changed, 18 insertions(+)
 diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
-index f6ea8b2bbf..681eb7e08b 100644
+index f6ea8b2bbf..1fd5e187fb 100644
 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
 +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -28,6 +28,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Protocol/ResetNotification.h>
 #include <Library/DebugLib.h>
-+#include <Library/DebugPrintErrorLevelLib.h>
+#include <Library/DebugPrintErrorLevelLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/UefiDriverEntryPoint.h>
@ -46,37 +46,37 @@ index f6ea8b2bbf..681eb7e08b 100644
       CompareGuid (PcdGetPtr (PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid))
   {
     DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n"));
-+#if defined (MDE_CPU_AARCH64)
+#if defined (MDE_CPU_AARCH64)
-+    //
+    //
-+    // RHBZ#1844682
+    // RHBZ#1844682
-+    //
+    //
-+    // If swtpm / vTPM2 is not being used, this driver should return
+    // If swtpm / vTPM2 is not being used, this driver should return
-+    // EFI_UNSUPPORTED, so that the DXE Core can unload it. However, the
+    // EFI_UNSUPPORTED, so that the DXE Core can unload it. However, the
-+    // associated error message, logged by the DXE Core to the serial console,
+    // associated error message, logged by the DXE Core to the serial console,
-+    // is not desired in the silent edk2-aarch64 build, given that the absence
+    // is not desired in the silent edk2-aarch64 build, given that the absence
-+    // of swtpm / vTPM2 is nothing out of the ordinary. Therefore, return
+    // of swtpm / vTPM2 is nothing out of the ordinary. Therefore, return
-+    // success and stay resident. The wasted guest RAM still gets freed after
+    // success and stay resident. The wasted guest RAM still gets freed after
-+    // ExitBootServices().
+    // ExitBootServices().
-+    //
+    //
-+    if (GetDebugPrintErrorLevel () == DEBUG_ERROR) {
+    if (GetDebugPrintErrorLevel () == DEBUG_ERROR) {
-+      return EFI_SUCCESS;
+      return EFI_SUCCESS;
-+    }
+    }
-+#endif
+#endif
     return EFI_UNSUPPORTED;
   }
 diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
-index 7dc7a2683d..3bc8833931 100644
+index 7dc7a2683d..ae90070b36 100644
 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
 +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
@@ -55,6 +55,7 @@
   UefiRuntimeServicesTableLib
   BaseMemoryLib
   DebugLib
-+  DebugPrintErrorLevelLib
+  DebugPrintErrorLevelLib
   Tpm2CommandLib
   PrintLib
   UefiLib
 -- 
-2.39.1
+2.39.3
--- a/0013-OvmfPkg-Remove-EbcDxe-RHEL-only.patch
+++ b/0013-OvmfPkg-Remove-EbcDxe-RHEL-only.patch
@ -1,4 +1,4 @@
-From 2947620d87385cdea0212a48f598355399dbfdd7 Mon Sep 17 00:00:00 2001
+From f48037fba5ef28692e1dd1db90d4729a5fa13e84 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:28:49 +0200
 Subject: OvmfPkg: Remove EbcDxe (RHEL only)
@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 8 files changed, 8 deletions(-)
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index 2ea6fad201..b598a15abb 100644
+index 0d30ee9526..2b624582c6 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
 +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -604,7 +604,6 @@
+@@ -603,7 +603,6 @@
 !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
   }
@ -41,7 +41,7 @@ index 2ea6fad201..b598a15abb 100644
   UefiCpuPkg/CpuDxe/CpuDxe.inf
   OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
-index 5fb3b5d276..0c358d8b0f 100644
+index fec08468d3..2c61d5fa0a 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf
 +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -205,7 +205,6 @@ INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@ -53,10 +53,10 @@ index 5fb3b5d276..0c358d8b0f 100644
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf
 INF  OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index db1cde0a3b..c979afd5eb 100644
+index ef6362aac5..36ea20fb93 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -755,7 +755,6 @@
+@@ -744,7 +744,6 @@
 !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
   }
@ -65,7 +65,7 @@ index db1cde0a3b..c979afd5eb 100644
   UefiCpuPkg/CpuDxe/CpuDxe.inf
 !ifdef $(CSM_ENABLE)
 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
-index 5451bfb845..d9a34e46cf 100644
+index c9c9384397..8135a3dc01 100644
 --- a/OvmfPkg/OvmfPkgIa32.fdf
 +++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -216,7 +216,6 @@ INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@ -77,10 +77,10 @@ index 5451bfb845..d9a34e46cf 100644
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf
 !ifdef $(CSM_ENABLE)
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 938eaba74a..c581d73411 100644
+index 1793cc96fc..9638e03578 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -768,7 +768,6 @@
+@@ -758,7 +758,6 @@
 !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
   }
@ -89,7 +89,7 @@ index 938eaba74a..c581d73411 100644
   UefiCpuPkg/CpuDxe/CpuDxe.inf
 !ifdef $(CSM_ENABLE)
 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
-index 4c5bd0dbc3..cf98c24239 100644
+index f52219e0c2..9d6314d56e 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.fdf
 +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -217,7 +217,6 @@ INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@ -101,10 +101,10 @@ index 4c5bd0dbc3..cf98c24239 100644
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf
 !ifdef $(CSM_ENABLE)
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 91fbe83bfa..2da034c2cd 100644
+index c32a36b513..7d702f3d21 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -818,7 +818,6 @@
+@@ -808,7 +808,6 @@
 !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
   }
@ -113,7 +113,7 @@ index 91fbe83bfa..2da034c2cd 100644
   UefiCpuPkg/CpuDxe/CpuDxe.inf {
 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
-index 16666ba244..222fbe14aa 100644
+index 00c7f8849f..474ef5ca7e 100644
 --- a/OvmfPkg/OvmfPkgX64.fdf
 +++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -239,7 +239,6 @@ INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@ -125,5 +125,5 @@ index 16666ba244..222fbe14aa 100644
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf
 -- 
-2.39.1
+2.39.3
--- a/0014-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch
+++ b/0014-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch
@ -1,4 +1,4 @@
-From 0873d04386379fac82d1f6d32220fedf96fad5a2 Mon Sep 17 00:00:00 2001
+From 324341ee7f56c09987c16d9a7513465cb56e0dcf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:28:59 +0200
 Subject: OvmfPkg: Remove VirtioGpu device driver (RHEL only)
@ -29,19 +29,19 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 8 files changed, 8 deletions(-)
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index b598a15abb..1ea5c78565 100644
+index 2b624582c6..dafdc1e67a 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
 +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -692,7 +692,6 @@
+@@ -694,7 +694,6 @@
-     <PcdsFixedAtBuild>
+     <PcdsFixedAtBuild>
-       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-   }
+   }
 -  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   #
   # ISA Support
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
-index 0c358d8b0f..1ca44c3648 100644
+index 2c61d5fa0a..2bedd4bef1 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf
 +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -298,7 +298,6 @@ INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
@ -53,22 +53,22 @@ index 0c358d8b0f..1ca44c3648 100644
 INF  OvmfPkg/AmdSevDxe/AmdSevDxe.inf
 INF  OvmfPkg/IoMmuDxe/IoMmuDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index c979afd5eb..1ae7fed43a 100644
+index 36ea20fb93..daed0cb362 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -862,7 +862,6 @@
+@@ -852,7 +852,6 @@
-     <PcdsFixedAtBuild>
+     <PcdsFixedAtBuild>
-       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-   }
+   }
 -  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   #
   # ISA Support
 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
-index d9a34e46cf..3785c0e405 100644
+index 8135a3dc01..f8d2385b91 100644
 --- a/OvmfPkg/OvmfPkgIa32.fdf
 +++ b/OvmfPkg/OvmfPkgIa32.fdf
-@@ -333,7 +333,6 @@ INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
+@@ -334,7 +334,6 @@ INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
 !endif
 INF  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
@ -77,22 +77,22 @@ index d9a34e46cf..3785c0e405 100644
 INF  OvmfPkg/IoMmuDxe/IoMmuDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index c581d73411..a45f40898c 100644
+index 9638e03578..c284351665 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -875,7 +875,6 @@
+@@ -866,7 +866,6 @@
-     <PcdsFixedAtBuild>
+     <PcdsFixedAtBuild>
-       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-   }
+   }
 -  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   #
   # ISA Support
 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
-index cf98c24239..2ac66d07d6 100644
+index 9d6314d56e..5d49c55d8a 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.fdf
 +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
-@@ -339,7 +339,6 @@ INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
+@@ -340,7 +340,6 @@ INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
 !endif
 INF  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
@ -101,22 +101,22 @@ index cf98c24239..2ac66d07d6 100644
 INF  OvmfPkg/AmdSevDxe/AmdSevDxe.inf
 INF  OvmfPkg/IoMmuDxe/IoMmuDxe.inf
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 2da034c2cd..51b0e6cc85 100644
+index 7d702f3d21..88140034c1 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -948,7 +948,6 @@
+@@ -940,7 +940,6 @@
-     <PcdsFixedAtBuild>
+     <PcdsFixedAtBuild>
-       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
+       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
-   }
+   }
 -  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
   #
   # ISA Support
 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
-index 222fbe14aa..8087d7fcf1 100644
+index 474ef5ca7e..d09bd16e2f 100644
 --- a/OvmfPkg/OvmfPkgX64.fdf
 +++ b/OvmfPkg/OvmfPkgX64.fdf
-@@ -366,7 +366,6 @@ INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
+@@ -367,7 +367,6 @@ INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
 !endif
 INF  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
@ -125,5 +125,5 @@ index 222fbe14aa..8087d7fcf1 100644
 INF  OvmfPkg/AmdSevDxe/AmdSevDxe.inf
 INF  OvmfPkg/IoMmuDxe/IoMmuDxe.inf
 -- 
-2.39.1
+2.39.3
--- a/0015-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch
+++ b/0015-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch
@ -1,4 +1,4 @@
-From 5eacfb342d5efa46ff46964e5c5fd0db0e9257b0 Mon Sep 17 00:00:00 2001
+From 4e165646d809f6ebb0ca0492b00d48ad225db81b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:13 +0200
 Subject: OvmfPkg: Remove VirtioFsDxe filesystem driver (RHEL only)
@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 6 files changed, 6 deletions(-)
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index 1ae7fed43a..fb8ed159b4 100644
+index daed0cb362..bcfd40ce66 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -837,7 +837,6 @@
+@@ -827,7 +827,6 @@
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
   MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
@ -39,46 +39,46 @@ index 1ae7fed43a..fb8ed159b4 100644
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
-index 3785c0e405..c6e1ea4a02 100644
+index f8d2385b91..410bb2893c 100644
 --- a/OvmfPkg/OvmfPkgIa32.fdf
 +++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -295,7 +295,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 -INF  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
 index a45f40898c..8ed12f7cff 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -850,7 +850,6 @@
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
   MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 -  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
 index 2ac66d07d6..ea5ea9a993 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.fdf
 +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -296,7 +296,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 -INF  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
 index c284351665..eced00f16a 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -841,7 +841,6 @@
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
   MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 -  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
 index 5d49c55d8a..cb3ea94514 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.fdf
 +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -297,7 +297,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 -INF  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 51b0e6cc85..1d053aa0d2 100644
+index 88140034c1..9a7325a373 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -923,7 +923,6 @@
+@@ -915,7 +915,6 @@
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
   MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
@ -87,10 +87,10 @@ index 51b0e6cc85..1d053aa0d2 100644
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
-index 8087d7fcf1..5b18c3fe2e 100644
+index d09bd16e2f..765cc46921 100644
 --- a/OvmfPkg/OvmfPkgX64.fdf
 +++ b/OvmfPkg/OvmfPkgX64.fdf
-@@ -321,7 +321,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -322,7 +322,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
@ -99,5 +99,5 @@ index 8087d7fcf1..5b18c3fe2e 100644
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 -- 
-2.39.1
+2.39.3
--- a/0016-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch
+++ b/0016-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch
@ -1,4 +1,4 @@
-From 4a5a56f228601c37aab15921109fa80a72210374 Mon Sep 17 00:00:00 2001
+From 7894ed0cd0583d4b6d39798310bb537d64eb8e34 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:16 +0200
 Subject: ArmVirtPkg: Remove VirtioFsDxe filesystem driver (RHEL only)
@ -24,10 +24,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 3 files changed, 3 deletions(-)
 diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
-index 865172c5d5..9f1d9e22da 100644
+index 176246d683..8fe5926ece 100644
 --- a/ArmVirtPkg/ArmVirtQemu.dsc
 +++ b/ArmVirtPkg/ArmVirtQemu.dsc
-@@ -464,7 +464,6 @@
+@@ -462,7 +462,6 @@
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
   MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
@ -48,7 +48,7 @@ index 8a063bac04..5da1481532 100644
   #
   # Status Code Routing
 diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
-index 02877284bf..c18564a5b1 100644
+index 18d59c2414..c76657d0c4 100644
 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
 +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -362,7 +362,6 @@
@ -60,5 +60,5 @@ index 02877284bf..c18564a5b1 100644
   #
   # Bds
 -- 
-2.39.1
+2.39.3
--- a/0017-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch
+++ b/0017-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch
@ -1,4 +1,4 @@
-From 3fb460c56aa616be4d7a6a698522b3150b9452a5 Mon Sep 17 00:00:00 2001
+From 2b5fd3beae02e9b8cec957804440d4f80cd081b0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:19 +0200
 Subject: OvmfPkg: Remove UdfDxe filesystem driver (RHEL only)
@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 8 files changed, 8 deletions(-)
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index 1ea5c78565..a16c3f8c22 100644
+index dafdc1e67a..5987de6d83 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
 +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -669,7 +669,6 @@
+@@ -671,7 +671,6 @@
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
@ -41,7 +41,7 @@ index 1ea5c78565..a16c3f8c22 100644
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
-index 1ca44c3648..1b36c0ce59 100644
+index 2bedd4bef1..4d2f9c7248 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf
 +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -272,7 +272,6 @@ INF  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
@ -53,10 +53,10 @@ index 1ca44c3648..1b36c0ce59 100644
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
 INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index fb8ed159b4..df44b9d069 100644
+index bcfd40ce66..5762871fee 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -836,7 +836,6 @@
+@@ -826,7 +826,6 @@
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
@ -65,46 +65,46 @@ index fb8ed159b4..df44b9d069 100644
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
-index c6e1ea4a02..36c29712d9 100644
+index 410bb2893c..9df41eae67 100644
 --- a/OvmfPkg/OvmfPkgIa32.fdf
 +++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -294,7 +294,6 @@ INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 -INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
 index 8ed12f7cff..143018ce24 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -849,7 +849,6 @@
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
 -  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
 index ea5ea9a993..adfef2a21f 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.fdf
 +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -295,7 +295,6 @@ INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 -INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
 index eced00f16a..dc5020a632 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -840,7 +840,6 @@
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
 -  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
 index cb3ea94514..e002846515 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.fdf
 +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -296,7 +296,6 @@ INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 -INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 1d053aa0d2..721862affd 100644
+index 9a7325a373..e1e1df4b9d 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -922,7 +922,6 @@
+@@ -914,7 +914,6 @@
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
@ -113,10 +113,10 @@ index 1d053aa0d2..721862affd 100644
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
   OvmfPkg/SataControllerDxe/SataControllerDxe.inf
 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
-index 5b18c3fe2e..eea45e01c1 100644
+index 765cc46921..e586632664 100644
 --- a/OvmfPkg/OvmfPkgX64.fdf
 +++ b/OvmfPkg/OvmfPkgX64.fdf
-@@ -320,7 +320,6 @@ INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
+@@ -321,7 +321,6 @@ INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 INF  FatPkg/EnhancedFatDxe/Fat.inf
@ -125,5 +125,5 @@ index 5b18c3fe2e..eea45e01c1 100644
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 -- 
-2.39.1
+2.39.3
--- a/0018-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch
+++ b/0018-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch
@ -1,4 +1,4 @@
-From 4f3290b7ff5f84eaa27db4ea67dbd6b675fdb467 Mon Sep 17 00:00:00 2001
+From 1078848167171e47d42cfaa0de2ba5dc1bad4639 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:22 +0200
 Subject: ArmVirtPkg: Remove UdfDxe filesystem driver (RHEL only)
@ -24,10 +24,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 3 files changed, 3 deletions(-)
 diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
-index 9f1d9e22da..bd0b2c8ba0 100644
+index 8fe5926ece..b1deefc2fd 100644
 --- a/ArmVirtPkg/ArmVirtQemu.dsc
 +++ b/ArmVirtPkg/ArmVirtQemu.dsc
-@@ -463,7 +463,6 @@
+@@ -461,7 +461,6 @@
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
@ -48,7 +48,7 @@ index 5da1481532..2b17211256 100644
   #
   # Status Code Routing
 diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
-index c18564a5b1..85e49e315f 100644
+index c76657d0c4..afebc46a04 100644
 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
 +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -361,7 +361,6 @@
@ -60,5 +60,5 @@ index c18564a5b1..85e49e315f 100644
   #
   # Bds
 -- 
-2.39.1
+2.39.3
--- a/0019-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch
+++ b/0019-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch
@ -1,4 +1,4 @@
-From 5691bd6976ad8d5b6670432d008f2491754beb50 Mon Sep 17 00:00:00 2001
+From c536b7c67fe45bfa1bc27299ba0a584af572e80d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:25 +0200
 Subject: OvmfPkg: Remove TftpDynamicCommand from shell (RHEL only)
@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 6 files changed, 15 deletions(-)
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index df44b9d069..d20985848d 100644
+index 5762871fee..ed72cbf57e 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -914,10 +914,6 @@
+@@ -904,10 +904,6 @@
 !endif
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -42,10 +42,10 @@ index df44b9d069..d20985848d 100644
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
-index 36c29712d9..ae61cc2920 100644
+index 9df41eae67..1d19e20e8a 100644
 --- a/OvmfPkg/OvmfPkgIa32.fdf
 +++ b/OvmfPkg/OvmfPkgIa32.fdf
-@@ -296,7 +296,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -297,7 +297,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
@ -54,10 +54,10 @@ index 36c29712d9..ae61cc2920 100644
 INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
 !endif
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 143018ce24..48a5058f01 100644
+index dc5020a632..9b97e664d7 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -927,10 +927,6 @@
+@@ -918,10 +918,6 @@
 !endif
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -69,10 +69,10 @@ index 143018ce24..48a5058f01 100644
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
-index adfef2a21f..050f17dbaa 100644
+index e002846515..621772963f 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.fdf
 +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
-@@ -297,7 +297,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -298,7 +298,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
@ -81,10 +81,10 @@ index adfef2a21f..050f17dbaa 100644
 INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
 !endif
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 721862affd..0dfc2b5a23 100644
+index e1e1df4b9d..8bf848c647 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -1000,10 +1000,6 @@
+@@ -992,10 +992,6 @@
 !endif
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -96,10 +96,10 @@ index 721862affd..0dfc2b5a23 100644
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
-index eea45e01c1..40c12c12d1 100644
+index e586632664..b1d6c23a93 100644
 --- a/OvmfPkg/OvmfPkgX64.fdf
 +++ b/OvmfPkg/OvmfPkgX64.fdf
-@@ -322,7 +322,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -323,7 +323,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
@ -108,5 +108,5 @@ index eea45e01c1..40c12c12d1 100644
 INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
 !endif
 -- 
-2.39.1
+2.39.3
--- a/0020-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch
+++ b/0020-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch
@ -1,4 +1,4 @@
-From df2e722f4371e79caf78a8071910708a12d7e0d5 Mon Sep 17 00:00:00 2001
+From 2795327b7185bec84238542ce94801733a41ffe3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:28 +0200
 Subject: ArmVirtPkg: Remove TftpDynamicCommand from shell (RHEL only)
@ -23,10 +23,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 2 files changed, 3 insertions(+), 5 deletions(-)
 diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
-index 74d98e6314..bdf7b52ee5 100644
+index 2443e8351c..9534d6f95a 100644
 --- a/ArmVirtPkg/ArmVirt.dsc.inc
 +++ b/ArmVirtPkg/ArmVirt.dsc.inc
-@@ -369,10 +369,9 @@
+@@ -375,10 +375,9 @@
   #
   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
@ -34,9 +34,9 @@ index 74d98e6314..bdf7b52ee5 100644
 -    <PcdsFixedAtBuild>
 -      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 -  }
-+  #
+  #
-+  # UEFI application (Shell Embedded Boot Loader)
+  # UEFI application (Shell Embedded Boot Loader)
-+  #
+  #
   ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
@ -53,5 +53,5 @@ index 2b17211256..16a073c4a1 100644
   INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
 -- 
-2.39.1
+2.39.3
--- a/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch
+++ b/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch
@ -1,4 +1,4 @@
-From 176aa27812b4ca0d4b3263bb984c2eedd21f4320 Mon Sep 17 00:00:00 2001
+From 8ddd92f068c1f5f5177db1bc381201118bd2816c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:31 +0200
 Subject: OvmfPkg: Remove HttpDynamicCommand from shell (RHEL only)
@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 6 files changed, 15 deletions(-)
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index d20985848d..aa122fc69e 100644
+index ed72cbf57e..078eab1acc 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -914,10 +914,6 @@
+@@ -904,10 +904,6 @@
 !endif
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -42,10 +42,10 @@ index d20985848d..aa122fc69e 100644
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
-index ae61cc2920..002560372a 100644
+index 1d19e20e8a..5b2265c7d1 100644
 --- a/OvmfPkg/OvmfPkgIa32.fdf
 +++ b/OvmfPkg/OvmfPkgIa32.fdf
-@@ -296,7 +296,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -297,7 +297,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
@ -54,10 +54,10 @@ index ae61cc2920..002560372a 100644
 !endif
 !if $(BUILD_SHELL) == TRUE
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 48a5058f01..bdf447e07d 100644
+index 9b97e664d7..6779503e7e 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -927,10 +927,6 @@
+@@ -918,10 +918,6 @@
 !endif
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -69,10 +69,10 @@ index 48a5058f01..bdf447e07d 100644
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
-index 050f17dbaa..eabb69434f 100644
+index 621772963f..da32cf1a2f 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.fdf
 +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
-@@ -297,7 +297,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -298,7 +298,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
@ -81,10 +81,10 @@ index 050f17dbaa..eabb69434f 100644
 !endif
 !if $(BUILD_SHELL) == TRUE
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 0dfc2b5a23..e8779ad5b7 100644
+index 8bf848c647..66f267f731 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -1000,10 +1000,6 @@
+@@ -992,10 +992,6 @@
 !endif
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -96,10 +96,10 @@ index 0dfc2b5a23..e8779ad5b7 100644
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
-index 40c12c12d1..2ca657ed96 100644
+index b1d6c23a93..7bf83e266c 100644
 --- a/OvmfPkg/OvmfPkgX64.fdf
 +++ b/OvmfPkg/OvmfPkgX64.fdf
-@@ -322,7 +322,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -323,7 +323,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
@ -108,5 +108,5 @@ index 40c12c12d1..2ca657ed96 100644
 !endif
 !if $(BUILD_SHELL) == TRUE
 -- 
-2.39.1
+2.39.3
--- a/0022-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch
+++ b/0022-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch
@ -1,4 +1,4 @@
-From bd16f5325312d8dd6649cadccf1e2dc4eae8e1a0 Mon Sep 17 00:00:00 2001
+From a9ad729ef5a9dd474842e2e1e0c8be1166af1afa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:34 +0200
 Subject: ArmVirtPkg: Remove HttpDynamicCommand from shell (RHEL only)
@ -23,13 +23,13 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 2 files changed, 5 deletions(-)
 diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
-index bdf7b52ee5..1b53da56e0 100644
+index 9534d6f95a..d5ebc11ad8 100644
 --- a/ArmVirtPkg/ArmVirt.dsc.inc
 +++ b/ArmVirtPkg/ArmVirt.dsc.inc
-@@ -372,10 +372,6 @@
+@@ -378,10 +378,6 @@
-   #
+   #
-   # UEFI application (Shell Embedded Boot Loader)
+   # UEFI application (Shell Embedded Boot Loader)
-   #
+   #
 -  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
 -    <PcdsFixedAtBuild>
 -      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
@ -50,5 +50,5 @@ index 16a073c4a1..0a01c29722 100644
   #
 -- 
-2.39.1
+2.39.3
--- a/0023-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch
+++ b/0023-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch
@ -1,4 +1,4 @@
-From 0c05cfe99c6ba2579b32d52d0857a8feb2e8c3e4 Mon Sep 17 00:00:00 2001
+From e07788f7cf34a364b770e2b979942bf1a8b659f0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:39 +0200
 Subject: OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only)
@ -34,10 +34,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 8 files changed, 20 deletions(-)
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index a16c3f8c22..d991615faa 100644
+index 5987de6d83..427df673f3 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
 +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -726,10 +726,6 @@
+@@ -728,10 +728,6 @@
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -49,7 +49,7 @@ index a16c3f8c22..d991615faa 100644
   OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf
   OvmfPkg/AmdSev/Grub/Grub.inf
 diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
-index 1b36c0ce59..06d0679be4 100644
+index 4d2f9c7248..a48c93e2a5 100644
 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf
 +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -274,7 +274,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
@ -61,10 +61,10 @@ index 1b36c0ce59..06d0679be4 100644
 INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf
 INF  OvmfPkg/AmdSev/Grub/Grub.inf
 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index aa122fc69e..323495730a 100644
+index 078eab1acc..147774ef58 100644
 --- a/OvmfPkg/OvmfPkgIa32.dsc
 +++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -914,10 +914,6 @@
+@@ -904,10 +904,6 @@
 !endif
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -76,10 +76,10 @@ index aa122fc69e..323495730a 100644
 !if $(BUILD_SHELL) == TRUE
   ShellPkg/Application/Shell/Shell.inf {
 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
-index 002560372a..486f2dc12e 100644
+index 5b2265c7d1..56f2c45795 100644
 --- a/OvmfPkg/OvmfPkgIa32.fdf
 +++ b/OvmfPkg/OvmfPkgIa32.fdf
-@@ -296,7 +296,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -297,7 +297,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
@ -88,10 +88,10 @@ index 002560372a..486f2dc12e 100644
 !if $(BUILD_SHELL) == TRUE
 INF  ShellPkg/Application/Shell/Shell.inf
 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index bdf447e07d..4bf4285f47 100644
+index 6779503e7e..a41bc32454 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.dsc
 +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -927,10 +927,6 @@
+@@ -918,10 +918,6 @@
 !endif
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -103,10 +103,10 @@ index bdf447e07d..4bf4285f47 100644
 !if $(BUILD_SHELL) == TRUE
   ShellPkg/Application/Shell/Shell.inf {
 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
-index eabb69434f..8cbbeecfd4 100644
+index da32cf1a2f..9efbe6a06d 100644
 --- a/OvmfPkg/OvmfPkgIa32X64.fdf
 +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
-@@ -297,7 +297,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -298,7 +298,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
@ -115,10 +115,10 @@ index eabb69434f..8cbbeecfd4 100644
 !if $(BUILD_SHELL) == TRUE
 INF  ShellPkg/Application/Shell/Shell.inf
 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index e8779ad5b7..2204a6aeb0 100644
+index 66f267f731..ce363f748f 100644
 --- a/OvmfPkg/OvmfPkgX64.dsc
 +++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -1000,10 +1000,6 @@
+@@ -992,10 +992,6 @@
 !endif
 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
@ -130,10 +130,10 @@ index e8779ad5b7..2204a6aeb0 100644
 !if $(BUILD_SHELL) == TRUE
   ShellPkg/Application/Shell/Shell.inf {
 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
-index 2ca657ed96..e738b23020 100644
+index 7bf83e266c..404e72dc7d 100644
 --- a/OvmfPkg/OvmfPkgX64.fdf
 +++ b/OvmfPkg/OvmfPkgX64.fdf
-@@ -322,7 +322,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
+@@ -323,7 +323,6 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
@ -142,5 +142,5 @@ index 2ca657ed96..e738b23020 100644
 !if $(BUILD_SHELL) == TRUE
 INF  ShellPkg/Application/Shell/Shell.inf
 -- 
-2.39.1
+2.39.3
--- a/0024-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch
+++ b/0024-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch
@ -1,4 +1,4 @@
-From fb69634acf06769e830452fff1b54419fe3e8c1c Mon Sep 17 00:00:00 2001
+From df6b72f26ffb68a28c45f426ad3225388e5fccff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Thu, 1 Jul 2021 20:29:46 +0200
 Subject: ArmVirtPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only)
@ -24,13 +24,13 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 2 files changed, 5 deletions(-)
 diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
-index 1b53da56e0..7fd6078e13 100644
+index d5ebc11ad8..0b2b64c1cb 100644
 --- a/ArmVirtPkg/ArmVirt.dsc.inc
 +++ b/ArmVirtPkg/ArmVirt.dsc.inc
-@@ -372,10 +372,6 @@
+@@ -378,10 +378,6 @@
-   #
+   #
-   # UEFI application (Shell Embedded Boot Loader)
+   # UEFI application (Shell Embedded Boot Loader)
-   #
+   #
 -  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
 -    <PcdsFixedAtBuild>
 -      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
@ -51,5 +51,5 @@ index 0a01c29722..4dbb77a6ca 100644
   #
   # Bds
 -- 
-2.39.1
+2.39.3
--- a/0025-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch
+++ b/0025-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch
@ -1,101 +0,0 @@
 From dffbc61a54f51fc535c17e90fd0d2ce3a3bd80c4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Pawe=C5=82=20Po=C5=82awski?= <ppolawsk@redhat.com>
 Date: Tue, 15 Nov 2022 01:02:51 +0100
 Subject: MdePkg: Remove Itanium leftover data structure (RH only)
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 RH-Author: Pawel Polawski <ppolawsk@redhat.com>
 RH-MergeRequest: 22: MdePkg: Remove Itanium leftover data structure (RH only)
 RH-Bugzilla: 1983086
 RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
 RH-Acked-by: Oliver Steffen <osteffen@redhat.com>
 RH-Commit: [1/1] d7f46e0657016668a3c00309ed1d95aea7c55c97
 Itanium support has been removed from EDK2 aroun 2019.
 ITANIUM_HANDOFF_STATUS data structure looks to be
 some leftover from that process.
 There is also positive sidefect of this data structure removal.
 Due to HOB allocation type used in PEI stage there is a limit
 how much data about virtual CPU can be hold. This limit result
 in only 1024 vCPU can be used by VM.
 With Itanium related data structure removed more allocated space
 can be used for vCPU data and with current allocation limit
 will change from 1024 to around 8k vCPUs.
 Signed-off-by: Paweł Poławski <ppolawsk@redhat.com>
 patch_name: edk2-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch
 present_in_specfile: true
 location_in_specfile: 35
 ---
 MdePkg/Include/Ppi/SecPlatformInformation.h | 44 ---------------------
 1 file changed, 44 deletions(-)
 diff --git a/MdePkg/Include/Ppi/SecPlatformInformation.h b/MdePkg/Include/Ppi/SecPlatformInformation.h
 index 02b0711f18..fbcd205acd 100644
 --- a/MdePkg/Include/Ppi/SecPlatformInformation.h
 +++ b/MdePkg/Include/Ppi/SecPlatformInformation.h
@@ -84,49 +84,6 @@ typedef union {
 typedef EFI_HEALTH_FLAGS X64_HANDOFF_STATUS;
 typedef EFI_HEALTH_FLAGS IA32_HANDOFF_STATUS;
 -///
 -/// The hand-off status structure for Itanium architecture.
 -///
 -typedef struct {
 -  ///
 -  /// SALE_ENTRY state : 3 = Recovery_Check
 -  /// and 0 = RESET or Normal_Boot phase.
 -  ///
 -  UINT8     BootPhase;
 -  ///
 -  /// Firmware status on entry to SALE.
 -  ///
 -  UINT8     FWStatus;
 -  UINT16    Reserved1;
 -  UINT32    Reserved2;
 -  ///
 -  /// Geographically significant unique processor ID assigned by PAL.
 -  ///
 -  UINT16    ProcId;
 -  UINT16    Reserved3;
 -  UINT8     IdMask;
 -  UINT8     EidMask;
 -  UINT16    Reserved4;
 -  ///
 -  /// Address to make PAL calls.
 -  ///
 -  UINT64    PalCallAddress;
 -  ///
 -  /// If the entry state is RECOVERY_CHECK, this contains the PAL_RESET
 -  /// return address, and if entry state is RESET, this contains
 -  /// address for PAL_authentication call.
 -  ///
 -  UINT64    PalSpecialAddress;
 -  ///
 -  /// GR35 from PALE_EXIT state.
 -  ///
 -  UINT64    SelfTestStatus;
 -  ///
 -  /// GR37 from PALE_EXIT state.
 -  ///
 -  UINT64    SelfTestControl;
 -  UINT64    MemoryBufferRequired;
 -} ITANIUM_HANDOFF_STATUS;
 ///
 /// EFI_SEC_PLATFORM_INFORMATION_RECORD.
@@ -134,7 +91,6 @@ typedef struct {
 typedef union {
   IA32_HANDOFF_STATUS       IA32HealthFlags;
   X64_HANDOFF_STATUS        x64HealthFlags;
 -  ITANIUM_HANDOFF_STATUS    ItaniumHealthFlags;
 } EFI_SEC_PLATFORM_INFORMATION_RECORD;
 /**
 -- 
 2.39.1
--- a/0025-recreate-import-redhat-directory.patch
+++ b/0025-recreate-import-redhat-directory.patch
@ -0,0 +1,164 @@
 From 37e0f9ed6e872224afe70065627de3965689425c Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Wed, 11 Jun 2014 20:45:26 +0200
 Subject: recreate / import "redhat/" directory
 This patch now unites the following downstream commits:
 - 18bd1193e7 .distro: simplify WORKSPACE setup
 - b00f3398c8 fix tpm build options
 - e032ab1675 spec: Centralize non-firmware %install files at the top
 - 8501863acc spec: Don't put build output in the top directory
 - e6ec0363d3 spec: Factor out OVMF_FLAGS and OVMF_SB_FLAGS
 - 596f34c8b6 spec: Use %make_build macro
 - 55169e466d spec: Replace RPM_BUILD_ROOT with %{buildroot}
 - 69c4c60920 spec: Split out build_iso() function
 - ed67da8c85 spec: Add %{qosb_testing} macro
 - 44519f5b94 spec: Move %check to between %install and %files
 - b37b334dc7 spec: Remove extra 'true' at end of %check
 - dd11149c3a spec: Add %{qemu_package} and %{qemu_binary}
 - 0f5d4ae0d5 spec: Move -D TPM_ENABLE to common CC_FLAGS
 - 84b3fd93f9 spec: Replace ifarch+else conditionals with build_XXX variables
 - e97f79e744 spec: Use %autosetup with our required git config options
 - 45a347a759 spec: don't conditionalize %package definitions
 - acfcfaea1e spec: Add BuildRequires: make
 - d917a93f6f spec: remove Group: and %defattr
 - f2d3be3ae3 redhat: build UefiShell.iso with xorriso rather than genisoimage
 - 3fb4a20f30 redhat: narrow the "qemu-kvm" BuildRequires down to "qemu-kvm-core"
 - bfb89c4ae5 redhat: drop Split tool from the edk2-tools subpackage
 - ac8be2e0ef redhat: refresh "Makefile.common" for the 8.5 rebase
 - 2bd2d18864 redhat: filter out jansson submodule removal hunks
 - f13d7899ed recreate / import "redhat/" directory
 Merged patches (edk2-stable202202):
 - 1a7b1c3b72 spec: adapt specfile to build option changes, disable tpm1
 - 96eb388be3 spec: build amdsev variant
 - ea34352d41 redhat: bump OpenSSL dist-git submodule to a75722161d20 / RHEL-8.5
 Merged patches (edk2-stable202208):
 - a60bf3fd10 Adding support for CentOS 9 build
 - d3f25d438c OvmfPkg: Update target machines config
 - d63f783930 openssl: jump to 8.7.0 branch (2022-07-22)
 - 39882ce96d qemu-ovmf-secureboot: Do not use submodule
 - 283ef4a67d ovmf-vars-generator: Use max cpu
 - b6887ef7e1 Update build target to RHEL 9.2.0
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 Merged patches (edk2-stable202305):
 - 5eef16bd65 remove amd-sev feature flag from secure boot builds (rh only)
 - cc9e1b6eaa build script update
 - 046c1f08e6 PcdDxeNxMemoryProtectionPolicy update
 - b9dc1b5365 add aarch64 qcow2 images
 - f4e2d6bf41 update json files
 - be03b42128 add libvirt version conflict
 - dce699b61d add dbx update blob (rh only)
 - d8b2407343 spec: apply dbx update (rh only)
 - a8a5ef95b5 dbx update, 2023-05-09, black lotus edition
 - 310e179053 json descriptors: explicitly set mode = split
 - additionally
  - update frh.py, add new upstream submodules
  - replace egrep with grep -E and fgrep with grep -F in downstream
    scripts
  - remove git commit sha from package version string
 Signed-off-by: Oliver Steffen <osteffen@redhat.com>
 drop  git sha
 Signed-off-by: Oliver Steffen <osteffen@redhat.com>
 ---
 .distro/.gitignore                            |    3 +
 .distro/DBXUpdate-20230314.x64.bin            |  Bin 0 -> 13922 bytes
 .distro/DBXUpdate-20230509.x64.bin            |  Bin 0 -> 21170 bytes
 .distro/Makefile                              |  114 +
 .distro/Makefile.common                       |   31 +
 .distro/README                                |  236 ++
 .distro/RedHatSecureBootPkKek1.pem            |   22 +
 .distro/TargetRelease                         |    4 +
 .distro/edk2-build.py                         |  391 +++
 .distro/edk2-build.rhel-9                     |  119 +
 .distro/edk2.spec.template                    | 1301 +++++++++
 .../30-edk2-ovmf-x64-sb-enrolled.json         |   36 +
 .distro/metafiles/40-edk2-ovmf-x64-sb.json    |   35 +
 .distro/metafiles/50-edk2-aarch64-qcow2.json  |   32 +
 .distro/metafiles/50-edk2-ovmf-x64-nosb.json  |   35 +
 .distro/metafiles/51-edk2-aarch64-raw.json    |   32 +
 .../52-edk2-aarch64-verbose-qcow2.json        |   32 +
 .../53-edk2-aarch64-verbose-raw.json          |   32 +
 .../metafiles/60-edk2-ovmf-x64-amdsev.json    |   31 +
 .../metafiles/60-edk2-ovmf-x64-inteltdx.json  |   29 +
 .distro/openssl-rhel                          |    1 +
 .distro/ovmf-whitepaper-c770f8c.txt           | 2422 +++++++++++++++++
 .distro/qemu-ovmf-secureboot/CONTRIBUTING     |   45 +
 .distro/qemu-ovmf-secureboot/LICENSE          |   21 +
 .distro/qemu-ovmf-secureboot/README.md        |   66 +
 .../qemu-ovmf-secureboot/ovmf-vars-generator  |  296 ++
 .distro/rpmbuild/BUILD/.gitignore             |    2 +
 .distro/rpmbuild/RPMS/.gitignore              |    2 +
 .distro/rpmbuild/SOURCES/.gitignore           |    2 +
 .distro/rpmbuild/SPECS/.gitignore             |    2 +
 .distro/rpmbuild/SRPMS/.gitignore             |    2 +
 .distro/scripts/edk2-guids                    |   85 +
 .distro/scripts/frh.py                        |   51 +
 .distro/scripts/git-backport-diff             |  327 +++
 .distro/scripts/git-compile-check             |  215 ++
 .distro/scripts/openssl-update                |   79 +
 .distro/scripts/process-patches.sh            |   75 +
 .distro/scripts/tarball_checksum.sh           |    3 +
 .gitattributes                                |   15 +
 .gitignore                                    |   16 +-
 .gitmodules                                   |    4 +
 sources                                       |    1 +
 42 files changed, 6240 insertions(+), 7 deletions(-)
 create mode 100644 .distro/.gitignore
 create mode 100644 .distro/DBXUpdate-20230314.x64.bin
 create mode 100644 .distro/DBXUpdate-20230509.x64.bin
 create mode 100644 .distro/Makefile
 create mode 100644 .distro/Makefile.common
 create mode 100644 .distro/README
 create mode 100644 .distro/RedHatSecureBootPkKek1.pem
 create mode 100644 .distro/TargetRelease
 create mode 100755 .distro/edk2-build.py
 create mode 100644 .distro/edk2-build.rhel-9
 create mode 100644 .distro/edk2.spec.template
 create mode 100644 .distro/metafiles/30-edk2-ovmf-x64-sb-enrolled.json
 create mode 100644 .distro/metafiles/40-edk2-ovmf-x64-sb.json
 create mode 100644 .distro/metafiles/50-edk2-aarch64-qcow2.json
 create mode 100644 .distro/metafiles/50-edk2-ovmf-x64-nosb.json
 create mode 100644 .distro/metafiles/51-edk2-aarch64-raw.json
 create mode 100644 .distro/metafiles/52-edk2-aarch64-verbose-qcow2.json
 create mode 100644 .distro/metafiles/53-edk2-aarch64-verbose-raw.json
 create mode 100644 .distro/metafiles/60-edk2-ovmf-x64-amdsev.json
 create mode 100644 .distro/metafiles/60-edk2-ovmf-x64-inteltdx.json
 create mode 160000 .distro/openssl-rhel
 create mode 100644 .distro/ovmf-whitepaper-c770f8c.txt
 create mode 100644 .distro/qemu-ovmf-secureboot/CONTRIBUTING
 create mode 100644 .distro/qemu-ovmf-secureboot/LICENSE
 create mode 100644 .distro/qemu-ovmf-secureboot/README.md
 create mode 100755 .distro/qemu-ovmf-secureboot/ovmf-vars-generator
 create mode 100644 .distro/rpmbuild/BUILD/.gitignore
 create mode 100644 .distro/rpmbuild/RPMS/.gitignore
 create mode 100644 .distro/rpmbuild/SOURCES/.gitignore
 create mode 100644 .distro/rpmbuild/SPECS/.gitignore
 create mode 100644 .distro/rpmbuild/SRPMS/.gitignore
 create mode 100755 .distro/scripts/edk2-guids
 create mode 100644 .distro/scripts/frh.py
 create mode 100755 .distro/scripts/git-backport-diff
 create mode 100755 .distro/scripts/git-compile-check
 create mode 100755 .distro/scripts/openssl-update
 create mode 100755 .distro/scripts/process-patches.sh
 create mode 100755 .distro/scripts/tarball_checksum.sh
 create mode 100644 .gitattributes
 create mode 100644 sources
 diff --git a/sources b/sources
 new file mode 100644
 index 0000000000..ea8c8ad50b
 --- /dev/null
 +++ b/sources
@@ -0,0 +1 @@
 +SHA512 (edk2-ba91d0292e.tar.xz) = 3b21cc39671d28bfeb059da3683751cc5277c63a894b2a05bdfbd2bbe53545c34f04c229becf44f1563f89a738f37ae8f2333076d126a7e94d234bc4bb25454c
 -- 
 2.39.3
--- a/0026-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch
+++ b/0026-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch
@ -1,4 +1,4 @@
-From bd2ea121c38e5b6c5b3ddbfdfb571653ea6ef44f Mon Sep 17 00:00:00 2001
+From fb3719378d7ce646c684fc2c8b52806aca0c576a Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Sat, 16 Nov 2019 17:11:27 +0100
 Subject: CryptoPkg/OpensslLib: list RHEL8-specific OpenSSL files in the INFs
@ -131,51 +131,51 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 2 files changed, 24 insertions(+)
 diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
-index 60c6c24b0a..7e78255467 100644
+index 0f64c9fa7e..1641754e4d 100644
 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
 +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
-@@ -575,6 +575,18 @@
+@@ -576,6 +576,18 @@
   $(OPENSSL_PATH)/ssl/statem/statem.h
   $(OPENSSL_PATH)/ssl/statem/statem_local.h
 # Autogenerated files list ends here
-+# RHEL8-specific OpenSSL file list starts here
+# RHEL8-specific OpenSSL file list starts here
-+  $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c
+  $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c
-+  $(OPENSSL_PATH)/crypto/evp/kdf_lib.c
+  $(OPENSSL_PATH)/crypto/evp/kdf_lib.c
-+  $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c
+  $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c
-+  $(OPENSSL_PATH)/crypto/kdf/kbkdf.c
+  $(OPENSSL_PATH)/crypto/kdf/kbkdf.c
-+  $(OPENSSL_PATH)/crypto/kdf/kdf_local.h
+  $(OPENSSL_PATH)/crypto/kdf/kdf_local.h
-+  $(OPENSSL_PATH)/crypto/kdf/kdf_util.c
+  $(OPENSSL_PATH)/crypto/kdf/kdf_util.c
-+  $(OPENSSL_PATH)/crypto/kdf/krb5kdf.c
+  $(OPENSSL_PATH)/crypto/kdf/krb5kdf.c
-+  $(OPENSSL_PATH)/crypto/kdf/pbkdf2.c
+  $(OPENSSL_PATH)/crypto/kdf/pbkdf2.c
-+  $(OPENSSL_PATH)/crypto/kdf/sshkdf.c
+  $(OPENSSL_PATH)/crypto/kdf/sshkdf.c
-+  $(OPENSSL_PATH)/crypto/kdf/sskdf.c
+  $(OPENSSL_PATH)/crypto/kdf/sskdf.c
-+# RHEL8-specific OpenSSL file list ends here
+# RHEL8-specific OpenSSL file list ends here
   buildinf.h
   ossl_store.c
   rand_pool.c
 diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
-index c4eaea888c..1c551cb099 100644
+index 311cd1e605..7e980a7d03 100644
 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
 +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
-@@ -525,6 +525,18 @@
+@@ -526,6 +526,18 @@
   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h
   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h
 # Autogenerated files list ends here
-+# RHEL8-specific OpenSSL file list starts here
+# RHEL8-specific OpenSSL file list starts here
-+  $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c
+  $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c
-+  $(OPENSSL_PATH)/crypto/evp/kdf_lib.c
+  $(OPENSSL_PATH)/crypto/evp/kdf_lib.c
-+  $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c
+  $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c
-+  $(OPENSSL_PATH)/crypto/kdf/kbkdf.c
+  $(OPENSSL_PATH)/crypto/kdf/kbkdf.c
-+  $(OPENSSL_PATH)/crypto/kdf/kdf_local.h
+  $(OPENSSL_PATH)/crypto/kdf/kdf_local.h
-+  $(OPENSSL_PATH)/crypto/kdf/kdf_util.c
+  $(OPENSSL_PATH)/crypto/kdf/kdf_util.c
-+  $(OPENSSL_PATH)/crypto/kdf/krb5kdf.c
+  $(OPENSSL_PATH)/crypto/kdf/krb5kdf.c
-+  $(OPENSSL_PATH)/crypto/kdf/pbkdf2.c
+  $(OPENSSL_PATH)/crypto/kdf/pbkdf2.c
-+  $(OPENSSL_PATH)/crypto/kdf/sshkdf.c
+  $(OPENSSL_PATH)/crypto/kdf/sshkdf.c
-+  $(OPENSSL_PATH)/crypto/kdf/sskdf.c
+  $(OPENSSL_PATH)/crypto/kdf/sskdf.c
-+# RHEL8-specific OpenSSL file list ends here
+# RHEL8-specific OpenSSL file list ends here
   buildinf.h
   ossl_store.c
   rand_pool.c
 -- 
-2.39.1
+2.39.3
--- a/0027-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch
+++ b/0027-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch
@ -1,4 +1,4 @@
-From 2faeedfbd415d0b76ba4b21bb22b7577aee17243 Mon Sep 17 00:00:00 2001
+From 218d3b32592bffe5ec7317c4838d29e92b4b86f0 Mon Sep 17 00:00:00 2001
 From: Gerd Hoffmann <kraxel@redhat.com>
 Date: Thu, 2 Mar 2023 12:01:36 +0100
 Subject: OvmfPkg: disable dynamic mmio window (rhel only)
@ -9,19 +9,19 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
-index 38cece9173..19b8c470a8 100644
+index acf90b4e93..86700fc028 100644
 --- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c
 +++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c
-@@ -690,7 +690,8 @@ PlatformDynamicMmioWindow (
+@@ -679,7 +679,8 @@ PlatformDynamicMmioWindow (
   AddrSpace = LShiftU64 (1, PlatformInfoHob->PhysMemAddressWidth);
   MmioSpace = LShiftU64 (1, PlatformInfoHob->PhysMemAddressWidth - 3);
 -  if ((PlatformInfoHob->PcdPciMmio64Size < MmioSpace) &&
-+  if (FALSE /* disable for RHEL-9.2, libvirt is not ready yet */ &&
+  if (FALSE /* disable for RHEL-9.2, libvirt is not ready yet */ &&
-+      (PlatformInfoHob->PcdPciMmio64Size < MmioSpace) &&
+      (PlatformInfoHob->PcdPciMmio64Size < MmioSpace) &&
       (PlatformInfoHob->PcdPciMmio64Base + MmioSpace < AddrSpace))
   {
     DEBUG ((DEBUG_INFO, "%a: using dynamic mmio window\n", __func__));
 -- 
-2.39.1
+2.39.3
--- a/0028-ArmPkg-Disable-EFI_MEMORY_ATTRIBUTE_PROTOCOL-RH-only.patch
+++ b/0028-ArmPkg-Disable-EFI_MEMORY_ATTRIBUTE_PROTOCOL-RH-only.patch
@ -0,0 +1,76 @@
 From 5c2e46b64824e5432181507ec0706f7fe74c3fe2 Mon Sep 17 00:00:00 2001
 From: Oliver Steffen <osteffen@redhat.com>
 Date: Mon, 19 Jun 2023 11:21:52 +0200
 Subject: ArmPkg: Disable EFI_MEMORY_ATTRIBUTE_PROTOCOL (RH only)
 Recent versions of shim (15.6 and 15.7) crash when the newly added
 EFI_MEMORY_ATTRIBUTE_PROTOCOL is provided by the firmware.  To allow
 existing installations to boot, provide a workaround in form of a Pcd
 that allows tuning it off at build time (defaults to 'enabled').
 Additionally, check the return code of the protocol installation calls.
 Disable the EFI_MEMORY_ATTRIBUTE_PROTOCOL protocol out builds.
 Signed-off-by: Oliver Steffen <osteffen@redhat.com>
 ---
 .distro/edk2-build.rhel-9        |  2 ++
 ArmPkg/ArmPkg.dec                |  3 +++
 ArmPkg/Drivers/CpuDxe/CpuDxe.c   | 13 +++++++++++--
 ArmPkg/Drivers/CpuDxe/CpuDxe.inf |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)
 diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
 index 2444457ae5..d9e579b5fa 100644
 --- a/ArmPkg/ArmPkg.dec
 +++ b/ArmPkg/ArmPkg.dec
@@ -167,6 +167,9 @@
   gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0xffff0000|UINT64|0x00000004
   gArmTokenSpaceGuid.PcdCpuResetAddress|0x00000000|UINT32|0x00000005
 +  # Enable/Disable EFI_MEMORY_ATTRIBUTE_PROTOCOL
 +  gArmTokenSpaceGuid.PcdEnableEfiMemoryAttributeProtocol|TRUE|BOOLEAN|0x000000EE
 +
   #
   # ARM Secure Firmware PCDs
   #
 diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.c b/ArmPkg/Drivers/CpuDxe/CpuDxe.c
 index d04958e79e..ff7d735b2b 100644
 --- a/ArmPkg/Drivers/CpuDxe/CpuDxe.c
 +++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.c
@@ -244,10 +244,19 @@ CpuDxeInitialize (
                   &mCpuHandle,
                   &gEfiCpuArchProtocolGuid,
                   &mCpu,
 -                  &gEfiMemoryAttributeProtocolGuid,
 -                  &mMemoryAttribute,
                   NULL
                   );
 +  ASSERT_EFI_ERROR (Status);
 +
 +  if (PcdGetBool (PcdEnableEfiMemoryAttributeProtocol)) {
 +    Status = gBS->InstallMultipleProtocolInterfaces (
 +                    &mCpuHandle,
 +                    &gEfiMemoryAttributeProtocolGuid,
 +                    &mMemoryAttribute,
 +                    NULL
 +                    );
 +    ASSERT_EFI_ERROR (Status);
 +  }
   //
   // Make sure GCD and MMU settings match. This API calls gDS->SetMemorySpaceAttributes ()
 diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
 index e732e21cb9..1bad4ae160 100644
 --- a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
 +++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
@@ -64,6 +64,7 @@
 [Pcd.common]
   gArmTokenSpaceGuid.PcdVFPEnabled
 +  gArmTokenSpaceGuid.PcdEnableEfiMemoryAttributeProtocol
 [FeaturePcd.common]
   gArmTokenSpaceGuid.PcdDebuggerExceptionSupport
 -- 
 2.39.3
--- a/0028-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch
+++ b/0028-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch
@ -1,67 +0,0 @@
 From 6794db451b25dbd81ad52e7c6d4b36db1cafe400 Mon Sep 17 00:00:00 2001
 From: Gerd Hoffmann <kraxel@redhat.com>
 Date: Mon, 6 Mar 2023 08:03:50 +0100
 Subject: Revert "ArmVirtPkg/ArmVirtQemu: enable initial ID map at early boot"
 This reverts commit 07be1d34d95460a238fcd0f6693efb747c28b329.
 ---
 ArmVirtPkg/ArmVirtQemu.dsc | 15 +++------------
 ArmVirtPkg/ArmVirtQemu.fdf |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)
 diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
 index bd0b2c8ba0..e3f8842829 100644
 --- a/ArmVirtPkg/ArmVirtQemu.dsc
 +++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -65,6 +65,8 @@
   QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf
   QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
 +  ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
 +
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
   VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
@@ -92,12 +94,6 @@
   TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf
 !endif
 -[LibraryClasses.AARCH64]
 -  ArmPlatformLib|ArmVirtPkg/Library/ArmPlatformLibQemu/ArmPlatformLibQemu.inf
 -
 -[LibraryClasses.ARM]
 -  ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
 -
 [LibraryClasses.common.PEIM]
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
@@ -335,12 +331,7 @@
   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
   MdeModulePkg/Core/Pei/PeiMain.inf
   ArmPlatformPkg/PlatformPei/PlatformPeim.inf
 -  ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf {
 -    <LibraryClasses>
 -!if $(ARCH) == AARCH64
 -      ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf
 -!endif
 -  }
 +  ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
   ArmPkg/Drivers/CpuPei/CpuPei.inf
 !if $(TPM2_ENABLE) == TRUE
 diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
 index 764f652afd..c61ed36d89 100644
 --- a/ArmVirtPkg/ArmVirtQemu.fdf
 +++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -107,7 +107,7 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
   INF MdeModulePkg/Core/Pei/PeiMain.inf
   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
 -  INF ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf
 +  INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
   INF ArmPkg/Drivers/CpuPei/CpuPei.inf
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
 -- 
 2.39.1
--- a/0029-OvmfPkg-PciHotPlugInitDxe-Do-not-reserve-IO-ports-by.patch
+++ b/0029-OvmfPkg-PciHotPlugInitDxe-Do-not-reserve-IO-ports-by.patch
@ -0,0 +1,46 @@
 From 8f924bd2691789f6b0d9deae9ddb046677a0610b Mon Sep 17 00:00:00 2001
 From: Gerd Hoffmann <kraxel@redhat.com>
 Date: Tue, 16 May 2023 11:47:58 +0200
 Subject: OvmfPkg/PciHotPlugInitDxe: Do not reserve IO ports by default.
 Flip the default for IO address space reservations for PCI(e) bridges
 and root ports with hotplug support from TRUE to FALSE.
 PCI(e) bridges will still get IO address space assigned in case:
  (a) Downstream devices actually need IO address space, or
  (b) Explicit configuration, using "qemu -device
      pcie-root-port,io-reserve=<size>".
 In case IO address space is exhausted edk2 will stop assigning resources
 to PCI(e) bridges.  This is not limited to IO resources, the affected
 bridges will not get any memory resources assigned either.
 This patch solves this issue by not handing out the scarce IO address
 space, which is not needed in most cases anyway.  Result is a more
 consistent PCI configuration in virtual machine configurations with many
 PCie root ports.
 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
 Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
 (cherry picked from commit 27727338b2c0e3f50eb0176a1044e903fcb3c3b1)
 ---
 OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
 index 6b2b6797b3..69903a6009 100644
 --- a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
 +++ b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
@@ -589,7 +589,7 @@ GetResourcePadding (
     return EFI_INVALID_PARAMETER;
   }
 -  DefaultIo       = TRUE;
 +  DefaultIo       = FALSE;
   DefaultMmio     = TRUE;
   DefaultPrefMmio = TRUE;
 -- 
 2.39.3
--- a/edk2-OvmfPkg-Clarify-invariants-for-NestedInterruptTplLib.patch
+++ b/edk2-OvmfPkg-Clarify-invariants-for-NestedInterruptTplLib.patch
@ -1,72 +0,0 @@
 From d259d959bab00b76e7187e79731201c9a3628d7c Mon Sep 17 00:00:00 2001
 From: Michael Brown <mcb30@ipxe.org>
 Date: Tue, 9 May 2023 12:09:30 +0000
 Subject: [PATCH 1/2] OvmfPkg: Clarify invariants for NestedInterruptTplLib
 RH-Author: Gerd Hoffmann <kraxel@redhat.com>
 RH-MergeRequest: 35: OvmfPkg: backport NestedInterruptTplLib updates
 RH-Bugzilla: 2189136
 RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
 RH-Commit: [1/2] 3f4c655bd43f38f43769c01eadbf96ce578818d0 (kraxel/centos-edk2)
 NestedInterruptTplLib relies on CPU interrupts being disabled to
 guarantee exclusive (and hence atomic) access to the shared state in
 IsrState.  Nothing in the calling interrupt handler should have
 re-enabled interrupts before calling NestedInterruptRestoreTPL(), and
 the loop in NestedInterruptRestoreTPL() itself maintains the invariant
 that interrupts are disabled at the start of each iteration.
 Add assertions to clarify this invariant, and expand the comments
 around the calls to RestoreTPL() and DisableInterrupts() to clarify
 the expectations around enabling and disabling interrupts.
 Signed-off-by: Michael Brown <mcb30@ipxe.org>
 Acked-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit ae0be176a83efebe9a8c13d2124151f7dd13443a)
 ---
 OvmfPkg/Library/NestedInterruptTplLib/Tpl.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 diff --git a/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c b/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c
 index e19d98878e..e921a09c55 100644
 --- a/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c
 +++ b/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c
@@ -104,6 +104,7 @@ NestedInterruptRestoreTPL (
   // defer our call to RestoreTPL() to the in-progress outer instance
   // of the same interrupt handler.
   //
 +  ASSERT (GetInterruptState () == FALSE);
   if (InterruptedTPL == IsrState->InProgressRestoreTPL) {
     //
     // Trigger outer instance of this interrupt handler to perform the
@@ -153,6 +154,7 @@ NestedInterruptRestoreTPL (
     //
     // Check shared state loop invariants.
     //
 +    ASSERT (GetInterruptState () == FALSE);
     ASSERT (IsrState->InProgressRestoreTPL < InterruptedTPL);
     ASSERT (IsrState->DeferredRestoreTPL == FALSE);
@@ -167,13 +169,17 @@ NestedInterruptRestoreTPL (
     //
     // Call RestoreTPL() to allow event notifications to be
 -    // dispatched.  This will implicitly re-enable interrupts.
 +    // dispatched.  This will implicitly re-enable interrupts (if
 +    // InterruptedTPL is below TPL_HIGH_LEVEL), even though we are
 +    // still inside the interrupt handler.
     //
     gBS->RestoreTPL (InterruptedTPL);
     //
     // Re-disable interrupts after the call to RestoreTPL() to ensure
 -    // that we have exclusive access to the shared state.
 +    // that we have exclusive access to the shared state.  Interrupts
 +    // will be re-enabled by the IRET or equivalent instruction when
 +    // we subsequently return from the interrupt handler.
     //
     DisableInterrupts ();
 -- 
 2.39.1
--- a/edk2-OvmfPkg-Relax-assertion-that-interrupts-do-not-occur.patch
+++ b/edk2-OvmfPkg-Relax-assertion-that-interrupts-do-not-occur.patch
@ -1,81 +0,0 @@
 From 28c2cf5f8fa5021ff3a6b83fe07dc519084143c0 Mon Sep 17 00:00:00 2001
 From: Michael Brown <mcb30@ipxe.org>
 Date: Tue, 9 May 2023 12:09:33 +0000
 Subject: [PATCH 2/2] OvmfPkg: Relax assertion that interrupts do not occur at
 TPL_HIGH_LEVEL
 RH-Author: Gerd Hoffmann <kraxel@redhat.com>
 RH-MergeRequest: 35: OvmfPkg: backport NestedInterruptTplLib updates
 RH-Bugzilla: 2189136
 RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
 RH-Commit: [2/2] ffb3cf6132b774295a49d16d4ef35164b61c0de3 (kraxel/centos-edk2)
 At TPL_HIGH_LEVEL, CPU interrupts are disabled (as per the UEFI
 specification) and so we should never encounter a situation in which
 an interrupt occurs at TPL_HIGH_LEVEL.  The specification also
 restricts usage of TPL_HIGH_LEVEL to the firmware itself.
 However, nothing actually prevents a UEFI application from calling
 gBS->RaiseTPL(TPL_HIGH_LEVEL) and then violating the invariant by
 enabling interrupts via the STI or equivalent instruction.  Some
 versions of the Microsoft Windows bootloader are known to do this.
 NestedInterruptTplLib maintains the invariant that interrupts are
 disabled at TPL_HIGH_LEVEL (even when performing the dark art of
 deliberately manipulating the stack so that IRET will return with
 interrupts still disabled), but does not itself rely on external code
 maintaining this invariant.
 Relax the assertion that the interrupted TPL is below TPL_HIGH_LEVEL
 to an error message, to allow UEFI applications such as these versions
 of the Microsoft Windows bootloader to continue to function.
 Debugged-by: Gerd Hoffmann <kraxel@redhat.com>
 Debugged-by: Laszlo Ersek <lersek@redhat.com>
 Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2189136
 Signed-off-by: Michael Brown <mcb30@ipxe.org>
 Acked-by: Laszlo Ersek <lersek@redhat.com>
 Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
 (cherry picked from commit bee67e0c142af6599a85aa7640094816b8a24c4f)
 ---
 OvmfPkg/Library/NestedInterruptTplLib/Tpl.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
 diff --git a/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c b/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c
 index e921a09c55..d56c12a445 100644
 --- a/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c
 +++ b/OvmfPkg/Library/NestedInterruptTplLib/Tpl.c
@@ -34,12 +34,27 @@ NestedInterruptRaiseTPL (
   //
   // Raise TPL and assert that we were called from within an interrupt
 -  // handler (i.e. with TPL below TPL_HIGH_LEVEL but with interrupts
 -  // disabled).
 +  // handler (i.e. with interrupts already disabled before raising the
 +  // TPL).
   //
   ASSERT (GetInterruptState () == FALSE);
   InterruptedTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);
 -  ASSERT (InterruptedTPL < TPL_HIGH_LEVEL);
 +
 +  //
 +  // At TPL_HIGH_LEVEL, CPU interrupts are disabled (as per the UEFI
 +  // specification) and so we should never encounter a situation in
 +  // which InterruptedTPL==TPL_HIGH_LEVEL.  The specification also
 +  // restricts usage of TPL_HIGH_LEVEL to the firmware itself.
 +  //
 +  // However, nothing actually prevents a UEFI application from
 +  // invalidly calling gBS->RaiseTPL(TPL_HIGH_LEVEL) and then
 +  // violating the invariant by enabling interrupts via the STI or
 +  // equivalent instruction.  Some versions of the Microsoft Windows
 +  // bootloader are known to do this.
 +  //
 +  if (InterruptedTPL >= TPL_HIGH_LEVEL) {
 +    DEBUG ((DEBUG_ERROR, "ERROR: Interrupts enabled at TPL_HIGH_LEVEL!\n"));
 +  }
   return InterruptedTPL;
 }
 -- 
 2.39.1
--- a/edk2-build.rhel-9
+++ b/edk2-build.rhel-9
@ -33,6 +33,8 @@ PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5
 [pcds.nx.broken.grub]
 # grub.efi uses EfiLoaderData for code
 PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
 # shim can't work with EFI_MEMORY_ATTRIBUTE_PROTOCOL
 gArmTokenSpaceGuid.PcdEnableEfiMemoryAttributeProtocol = FALSE
 #####################################################################
 # stateful ovmf builds (with vars in flash)
--- a/edk2.spec
+++ b/edk2.spec
@ -1,7 +1,7 @@
 ExclusiveArch: x86_64 aarch64
-%define GITDATE        20230301
+%define GITDATE        20230524
-%define GITCOMMIT      f80f052277c8
+%define GITCOMMIT      ba91d0292e
 %define TOOLCHAIN      GCC5
 %define OPENSSL_VER    1.1.1k
@ -17,14 +17,14 @@ ExclusiveArch: x86_64 aarch64
 %endif
 Name:       edk2
-Version:    %{GITDATE}git%{GITCOMMIT}
+Version:    %{GITDATE}
-Release:    5%{?dist}
+Release:    1%{?dist}
 Summary:    UEFI firmware for 64-bit virtual machines
 License:    BSD-2-Clause-Patent and OpenSSL and MIT
 URL:        http://www.tianocore.org
 # The source tarball is created using following commands:
-# COMMIT=f80f052277c8
+# COMMIT=ba91d0292e
 # git archive --format=tar --prefix=edk2-$COMMIT/ $COMMIT \
 # | xz -9ev >/tmp/edk2-$COMMIT.tar.xz
 Source0:edk2-%{GITCOMMIT}.tar.xz
@ -72,14 +72,11 @@ Patch0021: 0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch
 Patch0022: 0022-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch
 Patch0023: 0023-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch
 Patch0024: 0024-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch
-Patch0025: 0025-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch
+Patch0025: 0025-recreate-import-redhat-directory.patch
-Patch0027: 0027-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch
+Patch0026: 0026-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch
-Patch0028: 0028-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch
+Patch0027: 0027-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch
-Patch0029: 0029-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch
+Patch0028: 0028-ArmPkg-Disable-EFI_MEMORY_ATTRIBUTE_PROTOCOL-RH-only.patch
-# For bz#2189136 - windows 11 installation broken with edk2-20230301gitf80f052277c8-1.el9
+Patch0029: 0029-OvmfPkg-PciHotPlugInitDxe-Do-not-reserve-IO-ports-by.patch
 Patch30: edk2-OvmfPkg-Clarify-invariants-for-NestedInterruptTplLib.patch
 # For bz#2189136 - windows 11 installation broken with edk2-20230301gitf80f052277c8-1.el9
 Patch31: edk2-OvmfPkg-Relax-assertion-that-interrupts-do-not-occur.patch
 # python3-devel and libuuid-devel are required for building tools.
@ -399,6 +396,11 @@ install -m 0644 \
 %changelog
 * Tue Jun 27 2023 Oliver Steffen <osteffen@redhat.com> - 20230524-1
 - Rebase to edk2-stable202305 tag [RHEL-585]
  Resolves: RHEL-585
  ([rhel-9.3] rebase EDK2 to edk2-stable202305)
 * Mon May 22 2023 Miroslav Rezanina <mrezanin@redhat.com> - 20230301gitf80f052277c8-5
 - edk2-dbx-update-2023-05-09-black-lotus-edition.patch [RHEL-470]
 - edk2-json-descriptors-explicitly-set-mode-split.patch [RHEL-469]
@ -432,7 +434,7 @@ install -m 0644 \
 * Wed Mar 22 2023 Miroslav Rezanina <mrezanin@redaht.com> - 20230301gitf80f052277c8-1
 - Rebase to edk2-stable202302 [RHEL-266]
-  Resolves: RHEL-266
+- Resolves: RHEL-266
  (rebase edk2 to 2023-02 stable tag)
 * Fri Mar 17 2023 Miroslav Rezanina <mrezanin@redhat.com> - 20221207gitfff6d81270b5-9
--- a/4
+++ b/4
@ -1,3 +1,3 @@
 SHA512 (edk2-f80f052277c8.tar.xz) = af802257f010b63d973dc909b57ee845b7734e8d494b081050ba1f197349663b081e1f2edc5244726e2479ff6d16d79d0a6fceb00f4840b59982f10b79facf66
 SHA512 (openssl-rhel-d00c3c5b8a9d6d3ea3dabfcafdf36afd61ba8bcc.tar.xz) = 6842e767f767fe79edcb9ba8e32ce2956e8b56f0b265f79a5b4dbd4bba51b63d9733841badee7f2ffdcca803baf82b3e9e132fd465c22027539dcfd02608e99a
 SHA512 (DBXUpdate-20230509.x64.bin) = 71fb6e8cd6918126b3acd78b95651913336df372e13fdfdfdd20d5d23f0e509050c6c88c8a2c43f8ac44f987df86bd45174bb3065d5a7a8c7e3b8772fd06d624
 SHA512 (edk2-ba91d0292e.tar.xz) = 3b21cc39671d28bfeb059da3683751cc5277c63a894b2a05bdfbd2bbe53545c34f04c229becf44f1563f89a738f37ae8f2333076d126a7e94d234bc4bb25454c
 SHA512 (openssl-rhel-d00c3c5b8a9d6d3ea3dabfcafdf36afd61ba8bcc.tar.xz) = 6842e767f767fe79edcb9ba8e32ce2956e8b56f0b265f79a5b4dbd4bba51b63d9733841badee7f2ffdcca803baf82b3e9e132fd465c22027539dcfd02608e99a