301cae1641
- Rebase to edk2-stable202311 [RHEL-12323] - Switch to OpenSSL 3.0 [RHEL-49] - Resolves: RHEL-12323 (Rebase EDK2 for RHEL 9.4) - Resolves: RHEL-49 (consume / bundle RHEL-9 OpenSSL (version 3.0.x) in RHEL-9 edk2)
127 lines
4.2 KiB
Diff
127 lines
4.2 KiB
Diff
From 536709a91fe5d9bf5bb41bc0ae56cb3e3fa0cf5a 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: [PATCH] OvmfPkg: Remove VirtioGpu device driver (RHEL only)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
RH-MergeRequest: 3: Disable features for RHEL9
|
|
RH-Commit: [4/19] f0a41317291f2e9e3b5bd3125149c3866f23ab08
|
|
RH-Bugzilla: 1967747
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
QemuVideoDxe binds virtio-vga, so VirtioGpu is not needed.
|
|
|
|
Suggested-by: Laszlo Ersek <lersek@redhat.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
OvmfPkg/AmdSev/AmdSevX64.dsc | 1 -
|
|
OvmfPkg/AmdSev/AmdSevX64.fdf | 1 -
|
|
OvmfPkg/OvmfPkgIa32.dsc | 1 -
|
|
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 1 -
|
|
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
|
OvmfPkg/OvmfPkgX64.dsc | 1 -
|
|
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
|
8 files changed, 8 deletions(-)
|
|
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
index 906c1a4332..52b0d1062c 100644
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
@@ -704,7 +704,6 @@
|
|
<PcdsFixedAtBuild>
|
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
}
|
|
- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
|
|
#
|
|
# ISA Support
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
index 20d31d0e2d..48cc3b00c1 100644
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
@@ -300,7 +300,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
|
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
|
|
INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
-INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
INF OvmfPkg/PlatformDxe/Platform.inf
|
|
INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf
|
|
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
index d664b42c67..d39d9e8c27 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
@@ -861,7 +861,6 @@
|
|
<PcdsFixedAtBuild>
|
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
}
|
|
- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
|
|
#
|
|
# ISA Support
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
|
index 236680dec2..381735165d 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
|
@@ -334,7 +334,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
!endif
|
|
|
|
INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
-INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
INF OvmfPkg/PlatformDxe/Platform.inf
|
|
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
index 2e0af7698a..0e3de2ec5e 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
@@ -879,7 +879,6 @@
|
|
<PcdsFixedAtBuild>
|
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
}
|
|
- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
|
|
#
|
|
# ISA Support
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
index 3ad2fe5eee..2ca10f7c5e 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
@@ -340,7 +340,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
!endif
|
|
|
|
INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
-INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
INF OvmfPkg/PlatformDxe/Platform.inf
|
|
INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf
|
|
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
index 55f6760f4c..c266686361 100644
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
@@ -947,7 +947,6 @@
|
|
<PcdsFixedAtBuild>
|
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
}
|
|
- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
|
|
#
|
|
# ISA Support
|
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
|
index da4541d747..00b3f9d0d8 100644
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
|
@@ -367,7 +367,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
!endif
|
|
|
|
INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
-INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
|
|
INF OvmfPkg/PlatformDxe/Platform.inf
|
|
INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf
|
|
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|