OvmfPkg/Bhyve: add USB support

An USB driver is required to use a keyboard or mouse while installing
an OS or while in a bootloader menu like grub when using GPU + USB
Passthrough.

Reviewed-by: Peter Grehan <grehan@freebsd.org>
Acked-by: Rebecca Cran <rebecca@bsdio.com>
Signed-off-by: Corvin Köhne <c.koehne@beckhoff.com>
Message-Id: <20210705110842.14088-1-c.koehne@beckhoff.com>

diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
index cbf896e89bd25f3e4d184e8705f5db6ba33a2456..bb79d99dab4e42147b78007a624e664a76ea76e0 100644 (file)
--- a/OvmfPkg/Bhyve/BhyveX64.dsc
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
@@ -161,6 +161,7 @@
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf\r
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf\r
+  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf\r
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibNull.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf\r
@@ -733,6 +734,14 @@
 !endif\r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
+  #\r
+  # Usb Support\r
+  #\r
+  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
+  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
+  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
+\r
 !ifdef $(CSM_ENABLE)\r
   IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf {\r
     <LibraryClasses>\r

diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf
index fbd63a395a0ad813f869773ca266b8a3ac9ba75f..b3b4d44cef34c661c27662598c18ecbe2aff6440 100644 (file)
--- a/OvmfPkg/Bhyve/BhyveX64.fdf
+++ b/OvmfPkg/Bhyve/BhyveX64.fdf
@@ -286,6 +286,14 @@ INF MdeModulePkg/Logo/LogoDxe.inf
 !include NetworkPkg/Network.fdf.inc\r
   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
+#\r
+# Usb Support\r
+#\r
+INF  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
+INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
+INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
+\r
 !ifdef $(CSM_ENABLE)\r
 INF  IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf\r
 !endif\r