Changeset 81458 in vbox

Timestamp:

Oct 22, 2019 4:50:13 PM (5 years ago)

Author:

vboxsync

Message:

DevEFI,VBoxDD2: More preps for baking the EFI firmware images into VBoxDD2.

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevEFI.cpp (modified) (7 diffs)
• EFI/FlashCore.cpp (modified) (1 diff)
• EFI/FlashCore.h (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• build/VBoxDD2.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -173 +173 @@
 
     /** The system EFI ROM data. */
-    uint8_t                *pu8EfiRom;
+    uint8_t const          *pu8EfiRom;
+    /** The system EFI ROM data pointer to be passed to RTFileReadAllFree. */
+    uint8_t                *pu8EfiRomFree;
     /** The size of the system EFI ROM. */
     uint64_t                cbEfiRom;
@@ -314 +316 @@
 /** The EfiSystemNvDataFv GUID for NVRAM storage. */
 static const RTUUID g_UuidNvDataFv = { { 0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c, 0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50} };
+
+#ifdef VBOX_WITH_EFI_IN_DD2
+/** Special file name value for indicating the 32-bit built-in EFI firmware. */
+static const char g_szEfiBuiltin32[] = "VBoxEFI32.fd";
+/** Special file name value for indicating the 64-bit built-in EFI firmware. */
+static const char g_szEfiBuiltin64[] = "VBoxEFI64.fd";
+#endif
+
 
 
@@ -1942 +1952 @@
     }
 
-    if (pThis->pu8EfiRom)
-    {
-        RTFileReadAllFree(pThis->pu8EfiRom, (size_t)pThis->cbEfiRom + pThis->offEfiRom);
-        pThis->pu8EfiRom = NULL;
+    if (pThis->pu8EfiRomFree)
+    {
+        RTFileReadAllFree(pThis->pu8EfiRomFree, (size_t)pThis->cbEfiRom + pThis->offEfiRom);
+        pThis->pu8EfiRomFree = NULL;
     }
 
@@ -2079 +2089 @@
      * Read the entire firmware volume into memory.
      */
-    void   *pvFile;
-    size_t  cbFile;
-    int rc = RTFileReadAllEx(pThis->pszEfiRomFile,
+    int     rc;
+#ifdef VBOX_WITH_EFI_IN_DD2
+    if (RTStrCmp(pThis->pszEfiRomFile, g_szEfiBuiltin32) == 0)
+    {
+        pThis->pu8EfiRomFree = NULL;
+        pThis->pu8EfiRom = g_abEfiFirmware32;
+        pThis->cbEfiRom  = g_cbEfiFirmware32;
+    }
+    else if (RTStrCmp(pThis->pszEfiRomFile, g_szEfiBuiltin64) == 0)
+    {
+        pThis->pu8EfiRomFree = NULL;
+        pThis->pu8EfiRom = g_abEfiFirmware64;
+        pThis->cbEfiRom  = g_cbEfiFirmware64;
+    }
+    else
+#endif
+    {
+        void   *pvFile;
+        size_t  cbFile;
+        rc = RTFileReadAllEx(pThis->pszEfiRomFile,
                              0 /*off*/,
                              RTFOFF_MAX /*cbMax*/,
@@ -2087 +2114 @@
                              &pvFile,
                              &cbFile);
-    if (RT_FAILURE(rc))
-        return PDMDevHlpVMSetError(pThis->pDevIns, rc, RT_SRC_POS,
-                                   N_("Loading the EFI firmware volume '%s' failed with rc=%Rrc"),
-                                   pThis->pszEfiRomFile, rc);
-    pThis->pu8EfiRom = (uint8_t *)pvFile;
-    pThis->cbEfiRom  = cbFile;
+        if (RT_FAILURE(rc))
+            return PDMDevHlpVMSetError(pThis->pDevIns, rc, RT_SRC_POS,
+                                       N_("Loading the EFI firmware volume '%s' failed with rc=%Rrc"),
+                                       pThis->pszEfiRomFile, rc);
+        pThis->pu8EfiRomFree = (uint8_t *)pvFile;
+        pThis->pu8EfiRom = (uint8_t *)pvFile;
+        pThis->cbEfiRom  = cbFile;
+    }
 
     /*
@@ -2403 +2432 @@
      * Get the system EFI ROM file name.
      */
+#ifdef VBOX_WITH_EFI_IN_DD2
+    rc = CFGMR3QueryStringAllocDef(pCfg, "EfiRom", &pThis->pszEfiRomFile, g_szEfiBuiltin32);
+    if (RT_FAILURE(rc))
+#else
     rc = CFGMR3QueryStringAlloc(pCfg, "EfiRom", &pThis->pszEfiRomFile);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
         pThis->pszEfiRomFile = (char *)PDMDevHlpMMHeapAlloc(pDevIns, RTPATH_MAX);
-        if (!pThis->pszEfiRomFile)
-            return VERR_NO_MEMORY;
-
+        AssertReturn(pThis->pszEfiRomFile, VERR_NO_MEMORY);
         rc = RTPathAppPrivateArchTop(pThis->pszEfiRomFile, RTPATH_MAX);
         AssertRCReturn(rc, rc);
@@ -2416 +2447 @@
     }
     else if (RT_FAILURE(rc))
+#endif
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                    N_("Configuration error: Querying \"EfiRom\" as a string failed"));
-    else if (!*pThis->pszEfiRomFile)
-    {
-        MMR3HeapFree(pThis->pszEfiRomFile);
-        pThis->pszEfiRomFile = NULL;
-    }
-
 
     /*

trunk/src/VBox/Devices/EFI/FlashCore.cpp

@@ -284 +284 @@
 }
 
-DECLHIDDEN(int) flashR3LoadFromBuf(PFLASHCORE pThis, void *pvBuf, size_t cbBuf)
+DECLHIDDEN(int) flashR3LoadFromBuf(PFLASHCORE pThis, void const *pvBuf, size_t cbBuf)
 {
     AssertReturn(pThis->cbFlashSize >= cbBuf, VERR_BUFFER_OVERFLOW);

trunk/src/VBox/Devices/EFI/FlashCore.h

@@ -148 +148 @@
  * @param   cbBuf               Size of the buffer in bytes.
  */
-DECLHIDDEN(int) flashR3LoadFromBuf(PFLASHCORE pThis, void *pvBuf, size_t cbBuf);
+DECLHIDDEN(int) flashR3LoadFromBuf(PFLASHCORE pThis, void const *pvBuf, size_t cbBuf);
 
 /**

trunk/src/VBox/Devices/Makefile.kmk

@@ -1064 +1064 @@
  VBoxDD2_LDFLAGS.darwin  = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDD2.dylib
  VBoxDD2_LDFLAGS.linux   = $(VBOX_GCC_NO_UNDEFINED)
- if 0
+ if defined(VBOX_WITH_EFI) && 0 ## @todo need to update installers.
+  VBoxDD_DEFS           += VBOX_WITH_EFI_IN_DD2
+  VBoxDD2_DEFS          += VBOX_WITH_EFI
   VBoxDD2_SOURCES       += \
         EFI/DevEFI-binaries.asm

trunk/src/VBox/Devices/build/VBoxDD2.h

@@ -45 +45 @@
 extern DECLEXPORT(const unsigned)       g_cbNetBiosBinary;
 # endif
+# ifdef VBOX_WITH_EFI_IN_DD2
+extern DECLEXPORT(const unsigned char)  g_abEfiFirmware32[];
+extern DECLEXPORT(const unsigned)       g_cbEfiFirmware32;
+extern DECLEXPORT(const unsigned char)  g_abEfiFirmware64[];
+extern DECLEXPORT(const unsigned)       g_cbEfiFirmware64;
+# endif
 #else  /* !IN_VBOXDD2 */
 extern DECLIMPORT(const unsigned char)  g_abPcBiosBinary386[];
@@ -62 +68 @@
 extern DECLIMPORT(const unsigned)       g_cbNetBiosBinary;
 # endif
+# ifdef VBOX_WITH_EFI_IN_DD2
+extern DECLIMPORT(const unsigned char)  g_abEfiFirmware32[];
+extern DECLIMPORT(const unsigned)       g_cbEfiFirmware32;
+extern DECLIMPORT(const unsigned char)  g_abEfiFirmware64[];
+extern DECLIMPORT(const unsigned)       g_cbEfiFirmware64;
+# endif
 #endif /* !IN_VBOXDD2 */