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

Timestamp:

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

Author:

vboxsync

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

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -470 +470 @@
 };
 
+
+/**
+ * VirtualBox firmware descriptor.
+ */
+typedef struct VBOXFWDESC
+{
+    FirmwareType_T  enmType;
+    bool            fBuiltIn;
+    const char     *pszFileName;
+    const char     *pszUrl;
+} VBoxFwDesc;
+typedef const VBOXFWDESC *PVBOXFWDESC;
+
+
 // constructor / destructor
 /////////////////////////////////////////////////////////////////////////////
@@ -1885 +1899 @@
 }
 
-HRESULT VirtualBox::checkFirmwarePresent(FirmwareType_T aFirmwareType,
+HRESULT VirtualBox::checkFirmwarePresent(PlatformArchitecture_T aPlatformArchitecture,
+                                         FirmwareType_T aFirmwareType,
                                          const com::Utf8Str &aVersion,
                                          com::Utf8Str &aUrl,
@@ -1893 +1908 @@
     NOREF(aVersion);
 
-    static const struct
-    {
-        FirmwareType_T  enmType;
-        bool            fBuiltIn;
-        const char     *pszFileName;
-        const char     *pszUrl;
-    }
-    firmwareDesc[] =
+    static const VBOXFWDESC s_FwDescX86[] =
     {
         {   FirmwareType_BIOS,    true,  NULL,             NULL },
@@ -1914 +1922 @@
     };
 
-    for (size_t i = 0; i < sizeof(firmwareDesc) / sizeof(firmwareDesc[0]); i++)
-    {
-        if (aFirmwareType != firmwareDesc[i].enmType)
+    static const VBOXFWDESC s_FwDescArm[] =
+    {
+#ifdef VBOX_WITH_EFI_IN_DD2
+        {   FirmwareType_EFI32,   true,  "VBoxEFIAArch32.fd",   NULL },
+        {   FirmwareType_EFI64,   true,  "VBoxEFIAArch64.fd",   NULL },
+#else
+        {   FirmwareType_EFI32,   false, "VBoxEFIAArch32.fd",   "http://virtualbox.org/firmware/VBoxEFIAArch32.fd" },
+        {   FirmwareType_EFI64,   false, "VBoxEFIAArch64.fd",   "http://virtualbox.org/firmware/VBoxEFIAArch64.fd" },
+#endif
+    };
+
+    PVBOXFWDESC pFwDesc = NULL;
+    uint32_t cFwDesc = 0;
+    if (aPlatformArchitecture == PlatformArchitecture_x86)
+    {
+        pFwDesc = &s_FwDescX86[0];
+        cFwDesc = RT_ELEMENTS(s_FwDescX86);
+    }
+    else if (aPlatformArchitecture == PlatformArchitecture_ARM)
+    {
+        pFwDesc = &s_FwDescArm[0];
+        cFwDesc = RT_ELEMENTS(s_FwDescArm);
+    }
+    else
+        return E_INVALIDARG;
+
+    for (size_t i = 0; i < cFwDesc; i++)
+    {
+        if (aFirmwareType != pFwDesc->enmType)
+        {
+            pFwDesc++;
             continue;
+        }
 
         /* compiled-in firmware */
-        if (firmwareDesc[i].fBuiltIn)
-        {
-            aFile = firmwareDesc[i].pszFileName;
+        if (pFwDesc->fBuiltIn)
+        {
+            aFile = pFwDesc->pszFileName;
             *aResult = TRUE;
             break;
@@ -1928 +1965 @@
 
         Utf8Str    fullName;
-        Utf8StrFmt shortName("Firmware%c%s", RTPATH_DELIMITER, firmwareDesc[i].pszFileName);
+        Utf8StrFmt shortName("Firmware%c%s", RTPATH_DELIMITER, pFwDesc->pszFileName);
         int vrc = i_calculateFullPath(shortName, fullName);
         AssertRCReturn(vrc, VBOX_E_IPRT_ERROR);
@@ -1941 +1978 @@
         vrc = RTPathExecDir(szVBoxPath, RTPATH_MAX);
         AssertRCReturn(vrc, VBOX_E_IPRT_ERROR);
-        vrc = RTPathAppend(szVBoxPath, sizeof(szVBoxPath), firmwareDesc[i].pszFileName);
+        vrc = RTPathAppend(szVBoxPath, sizeof(szVBoxPath), pFwDesc->pszFileName);
         AssertRCReturn(vrc, VBOX_E_IPRT_ERROR);
         if (RTFileExists(szVBoxPath))
@@ -1951 +1988 @@
 
         /** @todo account for version in the URL */
-        aUrl = firmwareDesc[i].pszUrl;
+        aUrl = pFwDesc->pszUrl;
         *aResult = FALSE;