Changeset 24858 in vbox

Timestamp:

Nov 23, 2009 9:56:20 AM (15 years ago)

Author:

vboxsync

Message:

EFI: more bitness work

Location:

trunk

Files:

• Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd (moved) (moved from trunk/src/VBox/Devices/EFI/FirmwareBin/vboxefi.fv )
• src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd (moved) (moved from trunk/src/VBox/Devices/EFI/FirmwareBin/vboxefi64.fv )
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (3 diffs)
• src/VBox/Main/VirtualBoxImpl.cpp (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/VirtualBoxImpl.h (modified) (2 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (2 diffs)

trunk/Makefile.kmk

@@ -299 +299 @@
 buildserver-efifw_MODE = 0644
 buildserver-efifw_SOURCES = \
-        $(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd=>vboxefi.fv \
-        $(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd=>vboxefi64.fv
+        $(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd=>VBoxEFI32.fd \
+        $(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd=>VBoxEFI64.fd
 buildserver-efifw_CLEANS = \
         $(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd \
@@ -338 +338 @@
 local-efifw_MODE = 0644
 local-efifw_SOURCES = \
-        $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/vboxefi.fv=>vboxefi.fv \
-        $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/vboxefi64.fv=>vboxefi64.fv
+        $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd=>VBoxEFI32.fd \
+        $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd=>VBoxEFI64.fd
 endif # VBOX_WITH_EFIFW_FROM_BUILD_SERVER
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -145 +145 @@
                  "                            [--accelerate2dvideo <on|off>]\n"
 #endif
-                 "                            [--firmware bios|efi|efi64]\n"
+                 "                            [--firmware bios|efi|efi32|efi64]\n"
                  "                            [--bioslogofadein on|off]\n"
                  "                            [--bioslogofadeout on|off]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -302 +302 @@
             case MODIFYVM_FIRMWARE:
             {
-                if (!strcmp(ValueUnion.psz, "efi") || !strcmp(ValueUnion.psz, "efi32"))
+                if (!strcmp(ValueUnion.psz, "efi"))
                 {
                     CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_EFI));
+                }
+                else if (!strcmp(ValueUnion.psz, "efi32"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(FirmwareType)(FirmwareType_EFI32));
                 }
                 else if (!strcmp(ValueUnion.psz, "efi64"))

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -133 +133 @@
 #endif
 
-static int findEfiRom(FirmwareType_T aFirmwareType, Utf8Str& aEfiRomFile)
+static int findEfiRom(IVirtualBox* vbox, 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 = "";
+    int rc;
+    BOOL fPresent = FALSE;
+    Bstr aFilePath, empty;
+    
+    rc = vbox->CheckFirmwarePresent(aFirmwareType, empty,
+                                    empty.asOutParam(), aFilePath.asOutParam(), &fPresent);
+    if (RT_FAILURE(rc))
+        AssertComRCReturn (rc, VERR_FILE_NOT_FOUND);
+
+    if (!fPresent)
         return VERR_FILE_NOT_FOUND;
-    }
-
-     return E_INVALIDARG;
+
+    aEfiRomFile = Utf8Str(aFilePath);
+
+    return S_OK;
 }
 
@@ -825 +785 @@
     else
     {
-        Utf8Str efiRomFile;
-        /** @todo: which entry point to use for dual firmware, depend on guest? */
-        bool f64BitEntry = fIs64BitGuest;
-        //eFwType = f64BitEntry? FirmwareType_EFI64: FirmwareType_EFI;
-        rc = findEfiRom(f64BitEntry? FirmwareType_EFI64: FirmwareType_EFI, efiRomFile);                  RC_CHECK();
+        Utf8Str efiRomFile;        
+        
+        /* Autodetect firmware type, basing on guest type */
+        if (eFwType == FirmwareType_EFI)
+        {
+            eFwType =
+                    fIs64BitGuest ?
+                    (FirmwareType_T)FirmwareType_EFI64
+                    :
+                    (FirmwareType_T)FirmwareType_EFI32;
+        }
+
+        rc = findEfiRom(virtualBox, eFwType, efiRomFile);                                                                                                                          RC_CHECK();
+        bool f64BitEntry = eFwType == FirmwareType_EFI64;
         /*
          * EFI.
@@ -835 +804 @@
         rc = CFGMR3InsertNode(pDevices, "efi", &pDev);                              RC_CHECK();
         rc = CFGMR3InsertNode(pDev,     "0", &pInst);                               RC_CHECK();
-        rc = CFGMR3InsertInteger(pInst, "Trusted", 1);              /* boolean */   RC_CHECK();        
+        rc = CFGMR3InsertInteger(pInst, "Trusted", 1);              /* boolean */   RC_CHECK();
         rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                           RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,  "RamSize",          cbRam);                 RC_CHECK();

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -934 +934 @@
                                  IN_BSTR        aVersion,
                                  BSTR           *aUrl,
+                                 BSTR           *aFile,
                                  BOOL           *aResult)
 {
@@ -953 +954 @@
         },
         {
-            FirmwareType_EFI,     "vboxefi.fv",     "http://virtualbox.org/firmware/32/vboxefi.fv"
+            FirmwareType_EFI32,   "VBoxEFI32.fd",   "http://virtualbox.org/firmware/VBoxEFI32.fd"
         },
         {
-            FirmwareType_EFI64,   "vboxefi64.fv",   "http://virtualbox.org/firmware/64/vboxefi.fv"
+            FirmwareType_EFI64,   "VBoxEFI64.fd",   "http://virtualbox.org/firmware/VBoxEFI64.fd"
         },
         {
-            FirmwareType_EFIDUAL, "vboxefidual.fv", "http://virtualbox.org/firmware/dual/vboxefi.fv"
+            FirmwareType_EFIDUAL, "VBoxEFIDual.fd", "http://virtualbox.org/firmware/VBoxEFIDual.fd"
         }
     };
@@ -985 +986 @@
         {
             *aResult = TRUE;
+             if (aFile)
+                Utf8Str(fullName).cloneTo(aFile);
             break;
         }
@@ -997 +1000 @@
         {
             *aResult = TRUE;
+            if (aFile)
+                Utf8Str(fullName).cloneTo(aFile);
             break;
         }
 
+       
         url = firmwareDesc[i].url;
         /** @todo: account for version in the URL */

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1103 +1103 @@
       Firmware type.
     </desc>
-    <const name="BIOS"            value="1">
+    <const name="BIOS"           value="1">
       <desc>BIOS Firmware.</desc>
     </const>
-    <const name="EFI"             value="2">
+    <const name="EFI"            value="2">
+      <desc>EFI Firmware, bitness detetced basing on OS type.</desc>
+    </const>
+    <const name="EFI32"          value="3">
       <desc>Efi firmware, 32-bit.</desc>
     </const>
-    <const name="EFI64"           value="3">
+    <const name="EFI64"          value="4">
       <desc>Efi firmware, 64-bit.</desc>
     </const>
-    <const name="EFIDUAL"         value="4">
+    <const name="EFIDUAL"        value="5">
       <desc>Efi firmware, combined 32 and 64-bit.</desc>
     </const>
@@ -3031 +3034 @@
         </desc>
       </param>
+
+      <param name="file" type="wstring" dir="out">
+        <desc>
+          Filename of firmware, only valid if result == TRUE.
+        </desc>
+      </param>
+
       <param name="result" type="boolean" dir="return">
         <desc>If firmware of this type and version is available.</desc>

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -177 +177 @@
     STDMETHOD(FindDHCPServerByNetworkName) (IN_BSTR aName, IDHCPServer ** aServer);
     STDMETHOD(RemoveDHCPServer) (IDHCPServer * aServer);
-    STDMETHOD(CheckFirmwarePresent)(FirmwareType_T aFirmwareType, IN_BSTR aVersion, 
-                                    BSTR * aUrl, BOOL * aResult);
+    STDMETHOD(CheckFirmwarePresent)(FirmwareType_T aFirmwareType, IN_BSTR aVersion,
+                                    BSTR * aUrl, BSTR * aFile, BOOL * aResult);
 
     /* public methods only for internal purposes */
@@ -311 +311 @@
 
 #endif // ____H_VIRTUALBOXIMPL
-

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1592 +1592 @@
                         )
                     hw.firmwareType = FirmwareType_EFI;
+                else if (    strFirmwareType == "EFI32")
+                    hw.firmwareType = FirmwareType_EFI32;
                 else if (    strFirmwareType == "EFI64")
                     hw.firmwareType = FirmwareType_EFI64;
@@ -2488 +2490 @@
          {
             case FirmwareType_EFI:      pcszFirmware = "EFI";   break;
+            case FirmwareType_EFI32:    pcszFirmware = "EFI32"; break;
             case FirmwareType_EFI64:    pcszFirmware = "EFI64"; break;
             case FirmwareType_EFIDUAL:  pcszFirmware = "EFIDUAL"; break;