5b6a4a1f9e
- Include fixes to build in RHEL 9 environment (bz#1906468) - Resolves: bz#1906468 ([RHEL9][FTBFS] edk2 FTBFS on Red Hat Enterprise Linux 9.0.0 Alpha)
86 lines
3.3 KiB
Diff
86 lines
3.3 KiB
Diff
From 9adcdf493ebbd11efb74e2905ab5f6c8996e096d 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
|
|
silent aa64 build (RH)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
Message-id: <20200615080105.11859-2-lersek@redhat.com>
|
|
Patchwork-id: 97532
|
|
O-Subject: [RHEL-8.3.0 edk2 PATCH 1/3] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel" in silent aa64 build (RH)
|
|
Bugzilla: 1844682
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
|
If the "-kernel" QEMU option is not used, then QemuKernelLoaderFsDxe
|
|
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 serial
|
|
console, is not desired in the silent edk2-aarch64 build, given that the
|
|
absence of "-kernel" is nothing out of the ordinary. Therefore, return
|
|
success and stay resident. The wasted guest RAM still gets freed after
|
|
ExitBootServices().
|
|
|
|
(Inspired by RHEL-8.1.0 commit aaaedc1e2cfd.)
|
|
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
.../QemuKernelLoaderFsDxe.c | 17 +++++++++++++++++
|
|
.../QemuKernelLoaderFsDxe.inf | 1 +
|
|
2 files changed, 18 insertions(+)
|
|
|
|
diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
|
index b09ff6a359..ec0244d61b 100644
|
|
--- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
|
+++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
|
@@ -18,6 +18,7 @@
|
|
#include <Library/BaseLib.h>
|
|
#include <Library/BaseMemoryLib.h>
|
|
#include <Library/DebugLib.h>
|
|
+#include <Library/DebugPrintErrorLevelLib.h>
|
|
#include <Library/DevicePathLib.h>
|
|
#include <Library/MemoryAllocationLib.h>
|
|
#include <Library/QemuFwCfgLib.h>
|
|
@@ -1039,6 +1040,22 @@ QemuKernelLoaderFsDxeEntrypoint (
|
|
|
|
if (KernelBlob->Data == NULL) {
|
|
Status = EFI_NOT_FOUND;
|
|
+#if defined (MDE_CPU_AARCH64)
|
|
+ //
|
|
+ // RHBZ#1844682
|
|
+ //
|
|
+ // 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.
|
|
+ // However, the 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 of "-kernel" is nothing out of the ordinary. Therefore,
|
|
+ // return success and stay resident. The wasted guest RAM still gets freed
|
|
+ // after ExitBootServices().
|
|
+ //
|
|
+ if (GetDebugPrintErrorLevel () == DEBUG_ERROR) {
|
|
+ Status = EFI_SUCCESS;
|
|
+ }
|
|
+#endif
|
|
goto FreeBlobs;
|
|
}
|
|
|
|
diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
|
|
index 7b35adb8e0..e0331c6e2c 100644
|
|
--- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
|
|
+++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
|
|
@@ -28,6 +28,7 @@
|
|
BaseLib
|
|
BaseMemoryLib
|
|
DebugLib
|
|
+ DebugPrintErrorLevelLib
|
|
DevicePathLib
|
|
MemoryAllocationLib
|
|
QemuFwCfgLib
|
|
--
|
|
2.18.4
|
|
|