Changeset 72630 in vbox

Timestamp:

Jun 20, 2018 2:10:41 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123132

Message:

Flash: Fixed initial state when file did not exist.

File:

• trunk/src/VBox/Devices/EFI/DevFlash.cpp (modified) (2 diffs)

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

@@ -413 +413 @@
 
 /** @todo this does not really belong here; workaround for EFI failing to init empty flash. */
-uint8_t aHdrBegin[] = {
+static const uint8_t aHdrBegin[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C, 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,
@@ -487 +487 @@
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to allocate heap memory"));
 
-    memset(pThis->pbFlash, 0xff, pThis->cbFlashSize);
-    memcpy(pThis->pbFlash, aHdrBegin, sizeof(aHdrBegin));
-
     size_t cbRead = 0;
     rc = RTFileRead(pThis->hFlashFile, pThis->pbFlash, pThis->cbFlashSize, &cbRead);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to read flash file"));
-    Log(("Read %zu bytes from file (asked for %u).", cbRead, pThis->cbFlashSize));
+    Log(("Read %zu bytes from file (asked for %u)\n.", cbRead, pThis->cbFlashSize));
+
+    /* If the file didn't exist, or someone truncated it, we'll initialize
+     * the storage with default contents.
+     */
     if (cbRead != pThis->cbFlashSize)
-        return PDMDEV_SET_ERROR(pDevIns, VERR_READ_ERROR, N_("Failed to read flash file"));
+    {
+        memset(pThis->pbFlash, 0xff, pThis->cbFlashSize);
+        memcpy(pThis->pbFlash, aHdrBegin, sizeof(aHdrBegin));
+        LogRel(("Only read %zu bytes from flash file (asked for %u). Initializing with defaults.\n", cbRead, pThis->cbFlashSize));
+    }
 
     /* Reset the dynamic state.*/