Blame SOURCES/0021-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch

b6c182
From 4b2a35ab1d659068d47baaf1dd5b2918ba8a2573 Mon Sep 17 00:00:00 2001
7fdf80
From: Paolo Bonzini <pbonzini@redhat.com>
7fdf80
Date: Tue, 21 Nov 2017 00:57:46 +0100
7fdf80
Subject: OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in
7fdf80
 QemuVideoDxe/QemuRamfbDxe (RH)
7fdf80
b6c182
Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->
b6c182
RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:
b6c182
b6c182
- Extend the DSC change to the new OvmfPkg/AmdSev platform, which has been
b6c182
  introduced upstream in commit 30d277ed7a82 ("OvmfPkg/Amdsev: Base commit
b6c182
  to build encrypted boot specific OVMF", 2020-12-14), for TianoCore#3077.
b6c182
b6c182
- Remove obsolete commit message tags related to downstream patch
b6c182
  management: Message-id, Patchwork-id, O-Subject, Acked-by, From
b6c182
  (RHBZ#1846481).
b6c182
1d2c45
Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->
1d2c45
RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:
1d2c45
1d2c45
- no change
1d2c45
1dc609
Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] ->
1dc609
RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase:
1dc609
1dc609
- Due to upstream commit 4b04d9d73604 ("OvmfPkg: Don't build in
1dc609
  QemuVideoDxe when we have CSM", 2019-06-26), the contexts of
1dc609
  "QemuVideoDxe.inf" / "QemuRamfbDxe.inf" have changed in the DSC files.
1dc609
  Resolve the conflict manually.
1dc609
7fdf80
Notes about the RHEL-8.0/20180508-ee3198e672e2 ->
7fdf80
RHEL-8.1/20190308-89910a39dcfd rebase:
7fdf80
7fdf80
- Upstream commit 1d25ff51af5c ("OvmfPkg: add QemuRamfbDxe", 2018-06-14)
7fdf80
  introduced another GOP driver that consumes FrameBufferBltLib, and
7fdf80
  thereby produces a large number of (mostly useless) debug messages at
7fdf80
  the DEBUG_VERBOSE level. Extend the patch to suppress those messages in
7fdf80
  both QemuVideoDxe and QemuRamfbDxe; update the subject accordingly.
7fdf80
  QemuRamfbDxe itself doesn't log anything at the VERBOSE level (see also
7fdf80
  the original commit message at the bottom of this downstream patch).
7fdf80
7fdf80
Notes about the RHEL-7.6/ovmf-20180508-2.gitee3198e672e2.el7 ->
7fdf80
RHEL-8.0/20180508-ee3198e672e2 rebase:
7fdf80
7fdf80
- reorder the rebase changelog in the commit message so that it reads like
7fdf80
  a blog: place more recent entries near the top
7fdf80
- no changes to the patch body
7fdf80
7fdf80
Notes about the 20171011-92d07e48907f -> 20180508-ee3198e672e2 rebase:
7fdf80
7fdf80
- no changes
7fdf80
7fdf80
Bugzilla: 1488247
7fdf80
7fdf80
In commit 5b2291f9567a ("OvmfPkg: QemuVideoDxe uses
7fdf80
MdeModulePkg/FrameBufferLib"), QemuVideoDxe was rebased to
7fdf80
FrameBufferBltLib.
7fdf80
7fdf80
The FrameBufferBltLib instance added in commit b1ca386074bd
7fdf80
("MdeModulePkg: Add FrameBufferBltLib library instance") logs many
7fdf80
messages on the VERBOSE level; for example, a normal boot with OVMF can
7fdf80
produce 500+ "VideoFill" messages, dependent on the progress bar, when the
7fdf80
VERBOSE bit is set in PcdDebugPrintErrorLevel.
7fdf80
7fdf80
QemuVideoDxe itself doesn't log anything at the VERBOSE level, so we lose
7fdf80
none of its messages this way.
7fdf80
7fdf80
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
7fdf80
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
7fdf80
(this patch was previously applied as commit 9b0d031dee7e823f6717bab73e422fbc6f0a6c52)
7fdf80
(cherry picked from commit 9122d5f2e8d8d289064d1e1700cb61964d9931f3)
7fdf80
(cherry picked from commit 7eb3be1d4ccafc26c11fe5afb95cc12b250ce6f0)
7fdf80
(cherry picked from commit bd650684712fb840dbcda5d6eaee065bd9e91fa1)
1dc609
(cherry picked from commit b06b87f8ffd4fed4ef7eacb13689a9b6d111f850)
1d2c45
(cherry picked from commit c8c3f893e7c3710afe45c46839e97954871536e4)
b6c182
(cherry picked from commit 1355849ad97c1e4a5c430597a377165a5cc118f7)
7fdf80
---
b6c182
 OvmfPkg/AmdSev/AmdSevX64.dsc | 10 ++++++++--
b6c182
 OvmfPkg/OvmfPkgIa32.dsc      | 10 ++++++++--
b6c182
 OvmfPkg/OvmfPkgIa32X64.dsc   | 10 ++++++++--
b6c182
 OvmfPkg/OvmfPkgX64.dsc       | 10 ++++++++--
b6c182
 4 files changed, 32 insertions(+), 8 deletions(-)
b6c182
b6c182
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
b6c182
index 6e8defe5c7..568ca369e6 100644
b6c182
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
b6c182
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
b6c182
@@ -747,8 +747,14 @@
b6c182
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
b6c182
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
b6c182
 
b6c182
-  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
b6c182
-  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
b6c182
+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
b6c182
+    <PcdsFixedAtBuild>
b6c182
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
b6c182
+  }
b6c182
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
b6c182
+    <PcdsFixedAtBuild>
b6c182
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
b6c182
+  }
b6c182
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
b6c182
 
b6c182
   #
7fdf80
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
b6c182
index 52cd87f698..52fd057c90 100644
7fdf80
--- a/OvmfPkg/OvmfPkgIa32.dsc
7fdf80
+++ b/OvmfPkg/OvmfPkgIa32.dsc
b6c182
@@ -842,9 +842,15 @@
7fdf80
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
7fdf80
 
1dc609
 !ifndef $(CSM_ENABLE)
7fdf80
-  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
7fdf80
+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
7fdf80
+    <PcdsFixedAtBuild>
7fdf80
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
7fdf80
+  }
1dc609
 !endif
1dc609
-  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
7fdf80
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
7fdf80
+    <PcdsFixedAtBuild>
7fdf80
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
7fdf80
+  }
7fdf80
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
7fdf80
 
7fdf80
   #
7fdf80
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
b6c182
index 214195a594..653849cc7a 100644
7fdf80
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
7fdf80
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
b6c182
@@ -856,9 +856,15 @@
7fdf80
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
7fdf80
 
1dc609
 !ifndef $(CSM_ENABLE)
7fdf80
-  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
7fdf80
+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
7fdf80
+    <PcdsFixedAtBuild>
7fdf80
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
7fdf80
+  }
1dc609
 !endif
1dc609
-  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
7fdf80
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
7fdf80
+    <PcdsFixedAtBuild>
7fdf80
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
7fdf80
+  }
7fdf80
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
7fdf80
 
7fdf80
   #
7fdf80
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
b6c182
index 02aad65b00..5275f2502b 100644
7fdf80
--- a/OvmfPkg/OvmfPkgX64.dsc
7fdf80
+++ b/OvmfPkg/OvmfPkgX64.dsc
b6c182
@@ -854,9 +854,15 @@
7fdf80
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
7fdf80
 
1dc609
 !ifndef $(CSM_ENABLE)
7fdf80
-  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
7fdf80
+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
7fdf80
+    <PcdsFixedAtBuild>
7fdf80
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
7fdf80
+  }
1dc609
 !endif
1dc609
-  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
7fdf80
+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
7fdf80
+    <PcdsFixedAtBuild>
7fdf80
+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
7fdf80
+  }
7fdf80
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
7fdf80
 
7fdf80
   #
7fdf80
-- 
b6c182
2.27.0
7fdf80