Changeset 24603 in vbox

Timestamp:

Nov 12, 2009 6:39:20 AM (15 years ago)

Author:

vboxsync

Message:

Main: remaining firmware selection bits

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (6 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -45 +45 @@
 # include <iprt/env.h>
 #endif
+#include <iprt/file.h>
 
 #include <VBox/vmapi.h>
@@ -63 +64 @@
 #include <VBox/intnet.h>
 
+#include <VBox/com/com.h>
 #include <VBox/com/string.h>
 #include <VBox/com/array.h>
@@ -130 +132 @@
 # pragma optimize("g", off)
 #endif
+
+static int findEfiRom(FirmwareType_T aFirmwareType, Utf8Str& aEfiRomFile)
+{
+    /** @todo: combine with similar table in VirtualBox::CheckFirmwarePresent */
+    static const struct {
+        FirmwareType_T type;
+        const char*    fileName;
+    } firmwareDesc[] = {
+        {
+            /* compiled-in firmware */
+            FirmwareType_BIOS,    NULL,
+        },
+        {
+            FirmwareType_EFI,     "vboxefi.fv"
+        },
+        {
+            FirmwareType_EFI64,   "vboxefi64.fv"
+        },
+        {
+            FirmwareType_EFIDUAL, "vboxefidual.fv"
+        }
+    };
+
+
+     for (size_t i = 0; i < sizeof(firmwareDesc) / sizeof(firmwareDesc[0]); i++)
+    {
+        if (aFirmwareType != firmwareDesc[i].type)
+            continue;
+
+        AssertRCReturn(firmwareDesc[i].fileName != NULL, E_INVALIDARG);
+
+        /* Search in ~/.VirtualBox/Firmware and RTPathAppPrivateArch() */
+        char pszVBoxPath[RTPATH_MAX];
+        int rc;
+
+        rc = com::GetVBoxUserHomeDirectory(pszVBoxPath, sizeof(pszVBoxPath)); AssertRCReturn(rc, rc);
+        aEfiRomFile = Utf8StrFmt("%s%cFirmware%c%s",
+                                 pszVBoxPath,
+                                 RTPATH_DELIMITER,
+                                 RTPATH_DELIMITER,
+                                 firmwareDesc[i].fileName);
+        if (RTFileExists(aEfiRomFile.raw()))
+            return S_OK;
+
+        rc = RTPathExecDir(pszVBoxPath, RTPATH_MAX); AssertRCReturn(rc, rc);
+        aEfiRomFile = Utf8StrFmt("%s%c%s",
+                              pszVBoxPath,
+                              RTPATH_DELIMITER,
+                              firmwareDesc[i].fileName);
+
+        if (RTFileExists(aEfiRomFile.raw()))
+            return S_OK;
+
+        aEfiRomFile = "";
+        return VERR_FILE_NOT_FOUND;
+    }
+
+     return E_INVALIDARG;
+}
 
 /**
@@ -695 +756 @@
      * Firmware.
      */
+    FirmwareType_T eFwType =  FirmwareType_BIOS;
+    hrc = pMachine->COMGETTER(FirmwareType)(&eFwType);                                H();
+
 #ifdef VBOX_WITH_EFI
-    Bstr tmpStr1;
-    hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/UseEFI"), tmpStr1.asOutParam());    H();
-    BOOL fEfiEnabled = !tmpStr1.isEmpty();
-
-    /**
-     * @todo: VBoxInternal2/UseEFI extradata will go away soon, and we'll
-     *        just use this code
-     */
-    if (!fEfiEnabled)
-    {
-      FirmwareType_T eType =  FirmwareType_BIOS;
-      hrc = pMachine->COMGETTER(FirmwareType)(&eType);                                H();
-      fEfiEnabled = (eType == FirmwareType_EFI);
-    }
+    BOOL fEfiEnabled = (eFwType >= FirmwareType_EFI) && (eFwType <= FirmwareType_EFIDUAL);
 #else
     BOOL fEfiEnabled = false;
@@ -774 +825 @@
     else
     {
+        Utf8Str efiRomFile;
+
+        rc = findEfiRom(eFwType, efiRomFile);                                       RC_CHECK();
         /*
          * EFI.
@@ -784 +838 @@
         rc = CFGMR3InsertInteger(pCfg,  "RamHoleSize",      cbRamHole);             RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,  "NumCPUs",          cCpus);                 RC_CHECK();
+        rc = CFGMR3InsertString(pCfg,   "EfiRom",           efiRomFile.raw());      RC_CHECK();
     }