OvmfPkg: remove the Xen drivers from the IA32, IA32X64, and X64 platforms

Remove the three Xen drivers as the first step for removing Xen support
from the historical OvmfPkg* platforms. Xen (HVM and PVH) guests are
supported by the dedicated OvmfXen platform.

No module remains dependent on XenHypercallLib, so remove the
XenHypercallLib class resolutions too, from the DSC files.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210526201446.12554-2-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 33fbd767903e07e92bcc0ad6920caf5a7203765a..472cdd4d8a46aa806c87515f63dd201b86b82681 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -226,7 +226,6 @@
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf\r
   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf\r
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf\r
-  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf\r
   XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf\r
 \r
 !if $(TPM_ENABLE) == TRUE\r
@@ -794,9 +793,6 @@
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
-  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
-  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
-  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
 !if $(PVSCSI_ENABLE) == TRUE\r
   OvmfPkg/PvScsiDxe/PvScsiDxe.inf\r
 !endif\r

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index b3c8b56f3b60e896a75c5e0754c4e027ef791f3a..eb7f04a28257037544ab60e6ee88361cbd4d4a3f 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -228,9 +228,6 @@ INF  OvmfPkg/Virtio10Dxe/Virtio10.inf
 INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
 INF  OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
-INF  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
-INF  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
-INF  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
 !if $(PVSCSI_ENABLE) == TRUE\r
 INF  OvmfPkg/PvScsiDxe/PvScsiDxe.inf\r
 !endif\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index b13e5cfd9047f604ff761a74512a1418d305ee31..af7d66455fb507e6c57e9ddc3f2b9e6265989660 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -230,7 +230,6 @@
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf\r
   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf\r
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf\r
-  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf\r
   XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf\r
 \r
 !if $(TPM_ENABLE) == TRUE\r
@@ -808,9 +807,6 @@
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
-  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
-  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
-  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
 !if $(PVSCSI_ENABLE) == TRUE\r
   OvmfPkg/PvScsiDxe/PvScsiDxe.inf\r
 !endif\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 86592c2364a357c0470ee582f6a604aeb5513023..f10108d7ee6242f53cbe24e8a7a8b94308d56325 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -229,9 +229,6 @@ INF  OvmfPkg/Virtio10Dxe/Virtio10.inf
 INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
 INF  OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
-INF  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
-INF  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
-INF  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
 !if $(PVSCSI_ENABLE) == TRUE\r
 INF  OvmfPkg/PvScsiDxe/PvScsiDxe.inf\r
 !endif\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 999738dc39cd479e115ae89a7b06543fa757a80a..fc236cecfdf078a3a79db12e25c61acc62649ab9 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -230,7 +230,6 @@
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf\r
   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf\r
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf\r
-  XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf\r
   XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf\r
 \r
 !if $(TPM_ENABLE) == TRUE\r
@@ -806,9 +805,6 @@
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
-  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
-  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
-  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
 !if $(PVSCSI_ENABLE) == TRUE\r
   OvmfPkg/PvScsiDxe/PvScsiDxe.inf\r
 !endif\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index d6be798fcadd9d153debdb3fced759680dfa30aa..eb19a9e415025fe2f04f4f2092069c90806cf1fa 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -241,9 +241,6 @@ INF  OvmfPkg/Virtio10Dxe/Virtio10.inf
 INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
 INF  OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
-INF  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
-INF  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
-INF  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
 !if $(PVSCSI_ENABLE) == TRUE\r
 INF  OvmfPkg/PvScsiDxe/PvScsiDxe.inf\r
 !endif\r