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)
50 lines
2.0 KiB
Diff
50 lines
2.0 KiB
Diff
From 135d3d4b4ff12927f7b0c44e067fd42ceae83bb7 Mon Sep 17 00:00:00 2001
|
||
From: Laszlo Ersek <lersek@redhat.com>
|
||
Date: Wed, 24 Jun 2020 11:37:50 +0200
|
||
Subject: OvmfPkg/GenericQemuLoadImageLib: log "Not Found" at INFO level
|
||
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-3-lersek@redhat.com>
|
||
Patchwork-id: 97533
|
||
O-Subject: [RHEL-8.3.0 edk2 PATCH 2/3] OvmfPkg/GenericQemuLoadImageLib: log "Not Found" at INFO level
|
||
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>
|
||
|
||
gBS->LoadImage() returning EFI_NOT_FOUND is an expected condition; it
|
||
means that QEMU wasn't started with "-kernel". Log this status code as
|
||
INFO rather than ERROR.
|
||
|
||
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
|
||
Cc: Jordan Justen <jordan.l.justen@intel.com>
|
||
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||
Message-Id: <20200609105414.12474-1-lersek@redhat.com>
|
||
Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
|
||
(cherry picked from commit 14c7ed8b51f60097ad771277da69f74b22a7a759)
|
||
---
|
||
.../Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c | 3 ++-
|
||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
||
diff --git a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c
|
||
index 14c8417d43..114db7e844 100644
|
||
--- a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c
|
||
+++ b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c
|
||
@@ -106,7 +106,8 @@ QemuLoadKernelImage (
|
||
goto UnloadImage;
|
||
|
||
default:
|
||
- DEBUG ((DEBUG_ERROR, "%a: LoadImage(): %r\n", __FUNCTION__, Status));
|
||
+ DEBUG ((Status == EFI_NOT_FOUND ? DEBUG_INFO : DEBUG_ERROR,
|
||
+ "%a: LoadImage(): %r\n", __FUNCTION__, Status));
|
||
return Status;
|
||
}
|
||
|
||
--
|
||
2.18.4
|
||
|