Changeset 101318 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Sep 29, 2023 3:13:07 PM (17 months ago)

Author:

vboxsync

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

159318

Message:

Main: Move findEfiRom to the common code and add a PlatformArchitecture_T parameter to IVirtualBox::CheckFirmwarePresent to differentiate between x86 and ARM, bugref:10528

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImplConfigCommon.cpp (modified) (1 diff)
• ConsoleImplConfigX86.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImplConfigCommon.cpp

@@ -3421 +3421 @@
 }
 
+
+#ifndef VBOX_WITH_EFI_IN_DD2
+DECLHIDDEN(int) findEfiRom(IVirtualBox* vbox, PlatformArchitecture_T aPlatformArchitecture, FirmwareType_T aFirmwareType, Utf8Str *pEfiRomFile)
+{
+    Bstr aFilePath, empty;
+    BOOL fPresent = FALSE;
+    HRESULT hrc = vbox->CheckFirmwarePresent(aPlatformArchitecture, aFirmwareType, empty.raw(),
+                                             empty.asOutParam(), aFilePath.asOutParam(), &fPresent);
+    AssertComRCReturn(hrc, Global::vboxStatusCodeFromCOM(hrc));
+
+    if (!fPresent)
+    {
+        LogRel(("Failed to find an EFI ROM file.\n"));
+        return VERR_FILE_NOT_FOUND;
+    }
+
+    *pEfiRomFile = Utf8Str(aFilePath);
+
+    return VINF_SUCCESS;
+}
+#endif

trunk/src/VBox/Main/src-client/ConsoleImplConfigX86.cpp

@@ -194 +194 @@
     }
 };
-
-#ifndef VBOX_WITH_EFI_IN_DD2
-static int findEfiRom(IVirtualBox* vbox, FirmwareType_T aFirmwareType, Utf8Str *pEfiRomFile)
-{
-    Bstr aFilePath, empty;
-    BOOL fPresent = FALSE;
-    HRESULT hrc = vbox->CheckFirmwarePresent(aFirmwareType, empty.raw(),
-                                             empty.asOutParam(), aFilePath.asOutParam(), &fPresent);
-    AssertComRCReturn(hrc, Global::vboxStatusCodeFromCOM(hrc));
-
-    if (!fPresent)
-    {
-        LogRel(("Failed to find an EFI ROM file.\n"));
-        return VERR_FILE_NOT_FOUND;
-    }
-
-    *pEfiRomFile = Utf8Str(aFilePath);
-
-    return VINF_SUCCESS;
-}
-#endif
 
 /**
@@ -1676 +1655 @@
 #else
             Utf8Str efiRomFile;
-            vrc = findEfiRom(virtualBox, eFwType, &efiRomFile);
+            vrc = findEfiRom(virtualBox, PlatformArchitecture_x86, eFwType, &efiRomFile);
             AssertRCReturn(vrc, vrc);
             const char *pszEfiRomFile = efiRomFile.c_str();