|
 |
6009e6 |
From c8c3f893e7c3710afe45c46839e97954871536e4 Mon Sep 17 00:00:00 2001
|
|
|
6009e6 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
6009e6 |
Date: Tue, 21 Nov 2017 00:57:46 +0100
|
|
|
6009e6 |
Subject: OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in
|
|
|
6009e6 |
QemuVideoDxe/QemuRamfbDxe (RH)
|
|
|
6009e6 |
|
|
|
6009e6 |
Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] ->
|
|
|
6009e6 |
RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase:
|
|
|
6009e6 |
|
|
|
6009e6 |
- Due to upstream commit 4b04d9d73604 ("OvmfPkg: Don't build in
|
|
|
6009e6 |
QemuVideoDxe when we have CSM", 2019-06-26), the contexts of
|
|
|
6009e6 |
"QemuVideoDxe.inf" / "QemuRamfbDxe.inf" have changed in the DSC files.
|
|
|
6009e6 |
Resolve the conflict manually.
|
|
|
6009e6 |
|
|
|
6009e6 |
Notes about the RHEL-8.0/20180508-ee3198e672e2 ->
|
|
|
6009e6 |
RHEL-8.1/20190308-89910a39dcfd rebase:
|
|
|
6009e6 |
|
|
|
6009e6 |
- Upstream commit 1d25ff51af5c ("OvmfPkg: add QemuRamfbDxe", 2018-06-14)
|
|
|
6009e6 |
introduced another GOP driver that consumes FrameBufferBltLib, and
|
|
|
6009e6 |
thereby produces a large number of (mostly useless) debug messages at
|
|
|
6009e6 |
the DEBUG_VERBOSE level. Extend the patch to suppress those messages in
|
|
|
6009e6 |
both QemuVideoDxe and QemuRamfbDxe; update the subject accordingly.
|
|
|
6009e6 |
QemuRamfbDxe itself doesn't log anything at the VERBOSE level (see also
|
|
|
6009e6 |
the original commit message at the bottom of this downstream patch).
|
|
|
6009e6 |
|
|
|
6009e6 |
Notes about the RHEL-7.6/ovmf-20180508-2.gitee3198e672e2.el7 ->
|
|
|
6009e6 |
RHEL-8.0/20180508-ee3198e672e2 rebase:
|
|
|
6009e6 |
|
|
|
6009e6 |
- reorder the rebase changelog in the commit message so that it reads like
|
|
|
6009e6 |
a blog: place more recent entries near the top
|
|
|
6009e6 |
- no changes to the patch body
|
|
|
6009e6 |
|
|
|
6009e6 |
Notes about the 20171011-92d07e48907f -> 20180508-ee3198e672e2 rebase:
|
|
|
6009e6 |
|
|
|
6009e6 |
- no changes
|
|
|
6009e6 |
|
|
|
6009e6 |
Message-id: <20171120235748.29669-6-pbonzini@redhat.com>
|
|
|
6009e6 |
Patchwork-id: 77761
|
|
|
6009e6 |
O-Subject: [PATCH 5/7] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in
|
|
|
6009e6 |
QemuVideoDxe (RH only)
|
|
|
6009e6 |
Bugzilla: 1488247
|
|
|
6009e6 |
Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
6009e6 |
Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
6009e6 |
|
|
|
6009e6 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
6009e6 |
|
|
|
6009e6 |
In commit 5b2291f9567a ("OvmfPkg: QemuVideoDxe uses
|
|
|
6009e6 |
MdeModulePkg/FrameBufferLib"), QemuVideoDxe was rebased to
|
|
|
6009e6 |
FrameBufferBltLib.
|
|
|
6009e6 |
|
|
|
6009e6 |
The FrameBufferBltLib instance added in commit b1ca386074bd
|
|
|
6009e6 |
("MdeModulePkg: Add FrameBufferBltLib library instance") logs many
|
|
|
6009e6 |
messages on the VERBOSE level; for example, a normal boot with OVMF can
|
|
|
6009e6 |
produce 500+ "VideoFill" messages, dependent on the progress bar, when the
|
|
|
6009e6 |
VERBOSE bit is set in PcdDebugPrintErrorLevel.
|
|
|
6009e6 |
|
|
|
6009e6 |
QemuVideoDxe itself doesn't log anything at the VERBOSE level, so we lose
|
|
|
6009e6 |
none of its messages this way.
|
|
|
6009e6 |
|
|
|
6009e6 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
6009e6 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
6009e6 |
(this patch was previously applied as commit 9b0d031dee7e823f6717bab73e422fbc6f0a6c52)
|
|
|
6009e6 |
(cherry picked from commit 9122d5f2e8d8d289064d1e1700cb61964d9931f3)
|
|
|
6009e6 |
(cherry picked from commit 7eb3be1d4ccafc26c11fe5afb95cc12b250ce6f0)
|
|
|
6009e6 |
(cherry picked from commit bd650684712fb840dbcda5d6eaee065bd9e91fa1)
|
|
|
6009e6 |
(cherry picked from commit b06b87f8ffd4fed4ef7eacb13689a9b6d111f850)
|
|
|
6009e6 |
---
|
|
|
6009e6 |
OvmfPkg/OvmfPkgIa32.dsc | 10 ++++++++--
|
|
|
6009e6 |
OvmfPkg/OvmfPkgIa32X64.dsc | 10 ++++++++--
|
|
|
6009e6 |
OvmfPkg/OvmfPkgX64.dsc | 10 ++++++++--
|
|
|
6009e6 |
3 files changed, 24 insertions(+), 6 deletions(-)
|
|
|
6009e6 |
|
|
|
6009e6 |
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
6009e6 |
index 759075a815..6a07a6af81 100644
|
|
|
6009e6 |
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
6009e6 |
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
6009e6 |
@@ -742,9 +742,15 @@
|
|
|
6009e6 |
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
|
|
|
6009e6 |
|
|
|
6009e6 |
!ifndef $(CSM_ENABLE)
|
|
|
6009e6 |
- OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
|
6009e6 |
+ OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
|
|
|
6009e6 |
+ <PcdsFixedAtBuild>
|
|
|
6009e6 |
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
|
6009e6 |
+ }
|
|
|
6009e6 |
!endif
|
|
|
6009e6 |
- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
|
6009e6 |
+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
|
|
|
6009e6 |
+ <PcdsFixedAtBuild>
|
|
|
6009e6 |
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
|
6009e6 |
+ }
|
|
|
6009e6 |
OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
|
6009e6 |
|
|
|
6009e6 |
#
|
|
|
6009e6 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
6009e6 |
index 634e20f09c..c7f52992e9 100644
|
|
|
6009e6 |
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
6009e6 |
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
6009e6 |
@@ -755,9 +755,15 @@
|
|
|
6009e6 |
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
|
|
|
6009e6 |
|
|
|
6009e6 |
!ifndef $(CSM_ENABLE)
|
|
|
6009e6 |
- OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
|
6009e6 |
+ OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
|
|
|
6009e6 |
+ <PcdsFixedAtBuild>
|
|
|
6009e6 |
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
|
6009e6 |
+ }
|
|
|
6009e6 |
!endif
|
|
|
6009e6 |
- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
|
6009e6 |
+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
|
|
|
6009e6 |
+ <PcdsFixedAtBuild>
|
|
|
6009e6 |
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
|
6009e6 |
+ }
|
|
|
6009e6 |
OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
|
6009e6 |
|
|
|
6009e6 |
#
|
|
|
6009e6 |
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
6009e6 |
index bc5a345a37..594ecb5362 100644
|
|
|
6009e6 |
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
6009e6 |
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
6009e6 |
@@ -753,9 +753,15 @@
|
|
|
6009e6 |
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
|
|
|
6009e6 |
|
|
|
6009e6 |
!ifndef $(CSM_ENABLE)
|
|
|
6009e6 |
- OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
|
6009e6 |
+ OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
|
|
|
6009e6 |
+ <PcdsFixedAtBuild>
|
|
|
6009e6 |
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
|
6009e6 |
+ }
|
|
|
6009e6 |
!endif
|
|
|
6009e6 |
- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
|
6009e6 |
+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
|
|
|
6009e6 |
+ <PcdsFixedAtBuild>
|
|
|
6009e6 |
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
|
6009e6 |
+ }
|
|
|
6009e6 |
OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
|
6009e6 |
|
|
|
6009e6 |
#
|
|
|
6009e6 |
--
|
|
|
6009e6 |
2.18.1
|
|
|
6009e6 |
|