Changeset 98131 in vbox for trunk/src/VBox/Devices/EFI/Firmware

Timestamp:

Jan 19, 2023 9:20:54 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155301

Message:

Devices/EFI: Make EFI produce a VMBootFail event if no guest could be booted, disables the EFI Shell as a default boot option (can still be selected from the boot manager), bugref:7249

File:

• trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c

@@ -13 +13 @@
 #include <Library/Tcg2PhysicalPresenceLib.h>
 #include <Library/XenPlatformLib.h>
+#ifdef VBOX
+# include <Library/IoLib.h>
+# include "../../../../DevEFI.h"
+#endif
 
 
@@ -1541 +1545 @@
   // Register UEFI Shell
   //
+#ifndef VBOX
   PlatformRegisterFvBootOption (
     &gUefiShellFileGuid, L"EFI Internal Shell", LOAD_OPTION_ACTIVE
     );
+#else
+  /*
+   * Don't start the shell automatically (can still be selected from the boot manager)
+   * so we get into the error path when none of the boot options worked.
+   */
+  PlatformRegisterFvBootOption (
+    &gUefiShellFileGuid, L"EFI Internal Shell", 0
+    );
+#endif
 
   RemoveStaleFvFileOptions ();
@@ -1710 +1724 @@
   UINTN                        Index;
 
+#ifdef VBOX
+  IoWrite16(EFI_PORT_EVENT, EFI_EVENT_TYPE_BOOT_FAILED);
+#endif
+
   //
   // BootManagerMenu doesn't contain the correct information when return status