Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

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

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.c (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.c

@@ -121 +121 @@
                 &Enabled
                 );
-  if (!RETURN_ERROR (RetStatus) && !Enabled) {
+
+  if (RETURN_ERROR (RetStatus)) {
+    Enabled = AsciiStrCmp (FixedPcdGetPtr (PcdEntryPointOverrideDefaultValue), "yes") == 0;
+  }
+
+  DEBUG ((
+    DEBUG_INFO,
+    "EntryPointFwCfgOverride: %a = %a (%a)\n",
+    FixedPcdGetPtr (PcdEntryPointOverrideFwCfgVarName),
+    Enabled ? "enabled" : "disabled",
+    RETURN_ERROR (RetStatus) ? "default" : "fw_cfg"
+    ));
+
+  if (!Enabled) {
     //
     // The QEMU fw_cfg variable tells us not to load this image.  So abort.