Changeset 91329 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Sep 22, 2021 3:16:12 PM (3 years ago)

Author:

vboxsync

Message:

Devices/DevEFI: Use the new NVRAM storage interface if it is available, bugref:10098

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (5 diffs)
• FlashCore.cpp (modified) (2 diffs)
• FlashCore.h (modified) (2 diffs)

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

@@ -209 +209 @@
         /** The NVRAM driver base interface. */
         PPDMIBASE           pDrvBase;
+        /** The VFS interface of the driver below for NVRAM state loading and storing. */
+        PPDMIVFSCONNECTOR   pDrvVfs;
     } Lun0;
 } DEVEFIR3;
@@ -1009 +1011 @@
 static DECLCALLBACK(void) efiPowerOff(PPDMDEVINS pDevIns)
 {
-    PDEVEFIR3  pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
-    RT_NOREF(pThisCC);
+    PDEVEFI   pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
+    PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
+
+    if (pThisCC->Lun0.pDrvVfs)
+    {
+        int rc = flashR3SaveToVfs(&pThis->Flash, pDevIns, pThisCC->Lun0.pDrvVfs,
+                                  pDevIns->pReg->szName, "nvram");
+        if (RT_FAILURE(rc))
+            LogRel(("EFI: Failed to save flash file to NVRAM store: %Rrc\n", rc));
+    }
+    else if (pThisCC->pszNvramFile)
+    {
+        int rc = flashR3SaveToFile(&pThis->Flash, pDevIns, pThisCC->pszNvramFile);
+        if (RT_FAILURE(rc))
+            LogRel(("EFI: Failed to save flash file to '%s': %Rrc\n", pThisCC->pszNvramFile, rc));
+    }
 }
 
@@ -1028 +1044 @@
     PDEVEFI   pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
     PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
-
-    if (pThisCC->pszNvramFile)
-    {
-        int rc = flashR3SaveToFile(&pThis->Flash, pDevIns, pThisCC->pszNvramFile);
-        if (RT_FAILURE(rc))
-            LogRel(("EFI: Failed to save flash file to '%s': %Rrc\n", pThisCC->pszNvramFile, rc));
-    }
 
     flashR3Destruct(&pThis->Flash, pDevIns);
@@ -1156 +1165 @@
         return rc;
 
-    /* If the file does not exist we initialize the NVRAM from the loaded ROM file. */
-    if (!pThisCC->pszNvramFile || !RTPathExists(pThisCC->pszNvramFile))
-        rc = flashR3LoadFromBuf(&pThis->Flash, pThisCC->pu8EfiRom, pThisCC->cbNvram);
+    if (pThisCC->Lun0.pDrvVfs)
+    {
+        rc = flashR3LoadFromVfs(&pThis->Flash, pDevIns, pThisCC->Lun0.pDrvVfs,
+                                pDevIns->pReg->szName, "nvram");
+        if (rc == VERR_NOT_FOUND)
+        {
+            /* Initialize the NVRAM content from the loaded ROM file as the NVRAM wasn't initialized yet. */
+            rc = flashR3LoadFromBuf(&pThis->Flash, pThisCC->pu8EfiRom, pThisCC->cbNvram);
+        }
+        else if (RT_FAILURE(rc))
+            return rc;
+    }
     else
-        rc = flashR3LoadFromFile(&pThis->Flash, pDevIns, pThisCC->pszNvramFile);
-    if (RT_FAILURE(rc))
-        return rc;
+    {
+        /* If the file does not exist we initialize the NVRAM from the loaded ROM file. */
+        if (!pThisCC->pszNvramFile || !RTPathExists(pThisCC->pszNvramFile))
+            rc = flashR3LoadFromBuf(&pThis->Flash, pThisCC->pu8EfiRom, pThisCC->cbNvram);
+        else
+            rc = flashR3LoadFromFile(&pThis->Flash, pDevIns, pThisCC->pszNvramFile);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
 
     pThisCC->GCLoadAddress = pThisCC->GCPhysNvram + pThisCC->cbNvram;
@@ -1571 +1595 @@
     if (RT_SUCCESS(rc))
     {
-        /** @todo */
+        pThisCC->Lun0.pDrvVfs = PDMIBASE_QUERY_INTERFACE(pThisCC->Lun0.pDrvBase, PDMIVFSCONNECTOR);
+        if (!pThisCC->Lun0.pDrvVfs)
+            return PDMDevHlpVMSetError(pDevIns, VERR_PDM_MISSING_INTERFACE_BELOW, RT_SRC_POS, N_("NVRAM storage driver is missing VFS interface below"));
     }
     else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)

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

@@ -470 +470 @@
 
 /**
+ * Loads the flash content using the PDM VFS interface.
+ *
+ * @returns VBox status code.
+ * @param   pThis               The flash device core instance.
+ * @param   pDevIns             The owning device instance.
+ * @param   pDrvVfs             Pointer to the VFS interface.
+ * @param   pszNamespace        The namespace to load from.
+ * @param   pszPath             The path to the flash content to load.
+ */
+DECLHIDDEN(int) flashR3LoadFromVfs(PFLASHCORE pThis, PPDMDEVINS pDevIns, PPDMIVFSCONNECTOR pDrvVfs,
+                                   const char *pszNamespace, const char *pszPath)
+{
+    uint64_t cbFlash = 0;
+    int rc = pDrvVfs->pfnQuerySize(pDrvVfs, pszNamespace, pszPath, &cbFlash);
+    if (RT_SUCCESS(rc))
+    {
+        if (cbFlash == pThis->cbFlashSize)
+            rc = pDrvVfs->pfnReadAll(pDrvVfs, pszNamespace, pszPath, pThis->pbFlash, pThis->cbFlashSize);
+        else
+            return PDMDEV_SET_ERROR(pDevIns, VERR_MISMATCH, N_("Size of the flash device and the content to load doesn't match"));
+    }
+
+    return rc;
+}
+
+/**
  * Saves the flash content to the given file.
  *
@@ -507 +533 @@
     memcpy(pvBuf, pThis->pbFlash, RT_MIN(cbBuf, pThis->cbFlashSize));
     return VINF_SUCCESS;
+}
+
+/**
+ * Saves the flash content using the given PDM VFS interface.
+ *
+ * @returns VBox status code.
+ * @param   pThis               The flash device core instance.
+ * @param   pDevIns             The owning device instance.
+ * @param   pDrvVfs             Pointer to the VFS interface.
+ * @param   pszNamespace        The namespace to store to.
+ * @param   pszPath             The path to store the flash content under.
+ */
+DECLHIDDEN(int) flashR3SaveToVfs(PFLASHCORE pThis, PPDMDEVINS pDevIns, PPDMIVFSCONNECTOR pDrvVfs,
+                                 const char *pszNamespace, const char *pszPath)
+{
+    RT_NOREF(pDevIns);
+    return pDrvVfs->pfnWriteAll(pDrvVfs, pszNamespace, pszPath, pThis->pbFlash, pThis->cbFlashSize);
 }
 

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

@@ -32 +32 @@
 *********************************************************************************************************************************/
 #include <VBox/vmm/pdmdev.h>
+#include <VBox/vmm/pdmifs.h>
 #include <VBox/log.h>
 #include <VBox/err.h>
@@ -115 +116 @@
 DECLHIDDEN(int) flashR3LoadFromFile(PFLASHCORE pThis, PPDMDEVINS pDevIns, const char *pszFilename);
 DECLHIDDEN(int) flashR3LoadFromBuf(PFLASHCORE pThis, void const *pvBuf, size_t cbBuf);
+DECLHIDDEN(int) flashR3LoadFromVfs(PFLASHCORE pThis, PPDMDEVINS pDevIns, PPDMIVFSCONNECTOR pDrvVfs,
+                                   const char *pszNamespace, const char *pszPath);
 DECLHIDDEN(int) flashR3SaveToFile(PFLASHCORE pThis, PPDMDEVINS pDevIns, const char *pszFilename);
 DECLHIDDEN(int) flashR3SaveToBuf(PFLASHCORE pThis, void *pvBuf, size_t cbBuf);
+DECLHIDDEN(int) flashR3SaveToVfs(PFLASHCORE pThis, PPDMDEVINS pDevIns, PPDMIVFSCONNECTOR pDrvVfs,
+                                 const char *pszNamespace, const char *pszPath);
 DECLHIDDEN(void) flashR3Reset(PFLASHCORE pThis);
 DECLHIDDEN(int) flashR3SaveExec(PFLASHCORE pThis, PPDMDEVINS pDevIns, PSSMHANDLE pSSM);