Changeset 6322

Timestamp:

01/10/08 12:03:56 (11 months ago)

Author:

vboxsync

Message:

Added code to optionally load system and/or network ROM from external file (selected via setextradata).

Files:

• trunk/src/VBox/Devices/PC/DevPcBios.cpp (modified) (14 diffs)

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -84 +84 @@
-    /** The name of the logo file. */
-    char           *pszLogoFile;
+    /** The system BIOS ROM data. */
+    uint8_t        *pu8PcBios;
+    /** The size of the system BIOS ROM. */
+    uint64_t        cbPcBios;
+    /** The name of the BIOS ROM file. */
+    char           *pszPcBiosFile;
-    /** The LAN boot ROM data. */
-    uint8_t        *pu8LanBoot;
@@ -1022 +1028 @@
-     */
-    uint8_t abBuf[PAGE_SIZE];
+    const uint8_t *pu8PcBiosBinary;
+    uint64_t cbPcBiosBinary;
+
+    /* Work with either built-in ROM image or one loaded from file.
+     */
+    if (pData->pu8PcBios == NULL)
+    {
+        pu8PcBiosBinary = g_abPcBiosBinary;
+        cbPcBiosBinary  = g_cbPcBiosBinary;
+    } 
+    else 
+    {
+        pu8PcBiosBinary = pData->pu8PcBios;
+        cbPcBiosBinary  = pData->cbPcBios;
+    }
+    Assert(pu8PcBiosBinary);
+    Assert(cbPcBiosBinary);
-
-    /* the low ROM mapping. */
-g_
+
-    RTGCPHYS GCPhys = 0x00100000 - cb;
-g_abPcBiosBinary[g_
+pu8PcBiosBinary[
-    while (GCPhys < 0x00100000)
-    {
@@ -1045 +1068 @@
-
-    /* the high ROM mapping. */
-g_
-g_ab
-g_abPcBiosBinary[g_
+
+pu8
+pu8PcBiosBinary[
-    {
-        PDMDevHlpPhysRead(pDevIns, GCPhys, abBuf, PAGE_SIZE);
@@ -1086 +1109 @@
-     * Free MM heap pointers.
-     */
+    if (pData->pu8PcBios)
+    {
+        MMR3HeapFree(pData->pu8PcBios);
+        pData->pu8PcBios = NULL;
+    }
+
+    if (pData->pszPcBiosFile)
+    {
+        MMR3HeapFree(pData->pszPcBiosFile);
+        pData->pszPcBiosFile = NULL;
+    }
+
-    if (pData->pu8LanBoot)
-    {
@@ -1190 +1225 @@
-                              "ShowBootMenu\0"
-                              "DelayBoot\0"
+                              "BiosRom\0"
-                              "LanBootRom\0"
-                              "PXEDebug\0"
@@ -1276 +1312 @@
-
-    /*
+     * Get the system BIOS ROM file name.
+     */
+    rc = CFGMR3QueryStringAlloc(pCfgHandle, "BiosRom", &pData->pszPcBiosFile);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+    {
+        pData->pszPcBiosFile = NULL;
+        rc = VINF_SUCCESS;
+    }
+    else if (VBOX_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"BiosRom\" as a string failed"));
+    else if (!*pData->pszPcBiosFile)
+    {
+        MMR3HeapFree(pData->pszPcBiosFile);
+        pData->pszPcBiosFile = NULL;
+    }
+
+    const uint8_t *pu8PcBiosBinary = NULL;
+    uint64_t cbPcBiosBinary;
+    /*
+     * Determine the system BIOS ROM size, open specified ROM file in the process.
+     */
+    RTFILE FilePcBios = NIL_RTFILE;
+    if (pData->pszPcBiosFile)
+    {
+        rc = RTFileOpen(&FilePcBios, pData->pszPcBiosFile,
+                        RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+        if (VBOX_SUCCESS(rc))
+        {
+            rc = RTFileGetSize(FilePcBios, &pData->cbPcBios);
+            if (VBOX_SUCCESS(rc))
+            {
+                /* The following checks should be in sync the AssertReleaseMsg's below. */
+                if (    RT_ALIGN(pData->cbPcBios, _64K) != pData->cbPcBios
+                    ||  pData->cbPcBios > 32 * _64K
+                    ||  pData->cbPcBios < _64K)
+                    rc = VERR_TOO_MUCH_DATA;
+            }
+        }
+        if (VBOX_FAILURE(rc))
+        {
+            /*
+             * In case of failure simply fall back to the built-in BIOS ROM.
+             */
+            Log(("pcbiosConstruct: Failed to open system BIOS ROM file '%s', rc=%Vrc!\n", pData->pszPcBiosFile, rc));
+            RTFileClose(FilePcBios);
+            FilePcBios = NIL_RTFILE;
+            MMR3HeapFree(pData->pszPcBiosFile);
+            pData->pszPcBiosFile = NULL;
+        }
+    }
+
+    /*
+     * Attempt to get the system BIOS ROM data from file.
+     */
+    if (pData->pszPcBiosFile)
+    {
+        /*
+         * Allocate buffer for the system BIOS ROM data.
+         */
+        pData->pu8PcBios = (uint8_t *)PDMDevHlpMMHeapAlloc(pDevIns, pData->cbPcBios);
+        if (pData->pu8PcBios)
+        {
+            rc = RTFileRead(FilePcBios, pData->pu8PcBios, pData->cbPcBios, NULL);
+            if (VBOX_FAILURE(rc))
+            {
+                AssertMsgFailed(("RTFileRead(,,%d,NULL) -> %Vrc\n", pData->cbPcBios, rc));
+                MMR3HeapFree(pData->pu8PcBios);
+                pData->pu8PcBios = NULL;
+            }
+            rc = VINF_SUCCESS;
+        }
+        else
+            rc = VERR_NO_MEMORY;
+    }
+    else
+        pData->pu8PcBios = NULL;
+
+    /* cleanup */
+    if (FilePcBios != NIL_RTFILE)
+        RTFileClose(FilePcBios);
+
+    /* If we were unable to get the data from file for whatever reason, fall
+     * back to the built-in ROM image.
+     */
+    if (pData->pu8PcBios == NULL)
+    {
+        pu8PcBiosBinary = g_abPcBiosBinary;
+        cbPcBiosBinary  = g_cbPcBiosBinary;
+    } 
+    else 
+    {
+        pu8PcBiosBinary = pData->pu8PcBios;
+        cbPcBiosBinary  = pData->cbPcBios;
+    }
+
+    /*
-     * Map the BIOS into memory.
-     * There are two mappings:
@@ -1282 +1415 @@
-     *      2. 0xfffxxxxx to 0xffffffff contains the entire bios.
-     */
-g_cbPcBiosBinary >= _64K, ("g_cbPcBiosBinary=%#x\n", g_
-g_cbPcBiosBinary, _64K) == g_
-g_cbPcBiosBinary=%#x\n", g_
-g_cbPcBiosBinary, 128 * _1K);
-g_abPcBiosBinary[g_cbPcBiosBinary - cb],
+cbPcBiosBinary >= _64K, ("cbPcBiosBinary=%#x\n", 
+cbPcBiosBinary, _64K) == 
+cbPcBiosBinary=%#x\n", 
+cbPcBiosBinary, 128 * _1K); /* Effectively either 64 or 128K. */
+pu8PcBiosBinary[cbPcBiosBinary - cb], 
-                              false /* fShadow */, "PC BIOS - 0xfffff");
-    if (VBOX_FAILURE(rc))
-        return rc;
-g_cbPcBiosBinary, g_cbPcBiosBinary, &g_abPcBiosBinary[0],
+(int32_t)cbPcBiosBinary, cbPcBiosBinary, pu8PcBiosBinary, 
-                              false /* fShadow */, "PC BIOS - 0xffffffff");
-    if (VBOX_FAILURE(rc))
@@ -1446 +1579 @@
-    }
-
-    const uint8_t *pu8LanBoot = NULL;
-    uint64_t cbFileLanBoot;
-
+
+
+
-    /*
-     * Determine the LAN boot ROM size, open specified ROM file in the process.
@@ -1463 +1597 @@
-            {
-                if (    RT_ALIGN(cbFileLanBoot, _4K) != cbFileLanBoot
-32
+64
-                    rc = VERR_TOO_MUCH_DATA;
-            }
@@ -1470 +1604 @@
-        {
-            /*
-no
+the built-in
-             */
-            Log(("pcbiosConstruct: Failed to open LAN boot ROM file '%s', rc=%Vrc!\n", pData->pszLanBootFile, rc));
@@ -1488 +1622 @@
-         * Allocate buffer for the LAN boot ROM data.
-         */
-
-
-
+
+
-        {
-            rc = RTFileRead(FileLanBoot, pData->pu8LanBoot, cbFileLanBoot, NULL);
@@ -1496 +1629 @@
-            {
-                AssertMsgFailed(("RTFileRead(,,%d,NULL) -> %Vrc\n", cbFileLanBoot, rc));
-
-
+
-                pData->pu8LanBoot = NULL;
-            }
@@ -1512 +1644 @@
-        RTFileClose(FileLanBoot);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /*
@@ -1523 +1663 @@
-     * the (up to) 32 kb ROM image.
-     */
-
-FileLanBoot, pu8LanBoot,
+Binary
+LanBootBinary, pu8LanBootBinary, 
-                                  true /* fShadow */, "Net Boot ROM");
-