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

Timestamp:

Aug 31, 2012 11:34:49 AM (13 years ago)

Author:

vboxsync

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

80500

Message:

EFI: permanent NVRAM storage.

File:

• trunk/src/VBox/Devices/EFI/DevOVMF.cpp (modified) (8 diffs)

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

@@ -28 +28 @@
 #include <VBox/param.h>
 #include <VBox/vmm/dbgf.h>
+#include <VBox/vmm/pdmnvram.h>
 
 #include <iprt/asm.h>
@@ -147 +148 @@
     RTLISTANCHOR    NVRAMVariableList;
     PEFIVAR         pCurrentVarOp;
+    struct {
+        PPDMIBASE    pDrvBase;
+        PDMIBASE     IBase;
+        PPDMINVRAM   pNvramDown;
+    } Lun0;
 } DEVEFI;
 typedef DEVEFI *PDEVEFI;
@@ -186 +192 @@
     return rc;
 }
+
+static int nvramLoad(PDEVEFI pThis)
+{
+    int rc = VINF_SUCCESS;
+    PEFIVAR pEfiVar = NULL;
+    int idxValue = 0;
+    while(idxValue < 100)
+    {
+        pEfiVar = (PEFIVAR)RTMemAllocZ(sizeof(EFIVAR));
+        if (!pEfiVar)
+        {
+            LogRel(("EFI: Can't allocate space for stored EFI variable\n"));
+            return VERR_NO_MEMORY;
+        }
+        pEfiVar->cbVariableName = 512;
+        pEfiVar->cbValue = 1024;
+        rc = pThis->Lun0.pNvramDown->pfnLoadNvramValue(pThis->Lun0.pNvramDown,
+                                                       idxValue,
+                                                       &pEfiVar->uuid,
+                                                       pEfiVar->szVariableName,
+                                                       (size_t *)&pEfiVar->cbVariableName,
+                                                       pEfiVar->au8Value,
+                                                       (size_t *)&pEfiVar->cbValue);
+        idxValue++;
+        if (RT_FAILURE(rc))
+        {
+            RTMemFree(pEfiVar);
+            break;
+        }
+        RTListAppend((PRTLISTNODE)&pThis->NVRAMVariableList, &pEfiVar->List);
+    }
+    if (   RT_FAILURE(rc)
+        && rc == VERR_NOT_FOUND)
+        rc  = VINF_SUCCESS;
+    AssertRCReturn(rc, rc);
+    return rc;
+}
+
+static int nvramStore(PDEVEFI pThis)
+{
+    int rc = VINF_SUCCESS;
+    PEFIVAR pEfiVar = NULL;
+    int idxVar = 0;
+    pThis->Lun0.pNvramDown->pfnFlushNvramStorage(pThis->Lun0.pNvramDown);
+
+    RTListForEach((PRTLISTNODE)&pThis->NVRAMVariableList, pEfiVar, EFIVAR, List)
+    {
+        pThis->Lun0.pNvramDown->pfnStoreNvramValue(pThis->Lun0.pNvramDown,
+                                                   idxVar,
+                                                   &pEfiVar->uuid,
+                                                   pEfiVar->szVariableName,
+                                                   pEfiVar->cbVariableName,
+                                                   pEfiVar->au8Value,
+                                                   pEfiVar->cbValue);
+        idxVar++;
+    }
+    return VINF_SUCCESS;
+}
+
 static uint32_t efiInfoSize(PDEVEFI pThis)
 {
@@ -758 +823 @@
 {
     PDEVEFI  pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
+    nvramStore(pThis);
+    PEFIVAR pEfiVar = NULL;
+    while (!RTListIsEmpty(&pThis->NVRAMVariableList))
+    {
+        pEfiVar = RTListNodeGetNext(&pThis->NVRAMVariableList, EFIVAR, List);
+        RTListNodeRemove(&pEfiVar->List);
+        RTMemFree(pEfiVar);
+    }
 
     /*
@@ -990 +1063 @@
 
 /**
+ * @copydoc(PDMIBASE::pfnQueryInterface)
+ */
+static DECLCALLBACK(void *) devEfi_pfnQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+{
+    LogFlowFunc(("ENTER: pIBase: %p, pszIID:%p\n", __FUNCTION__, pInterface, pszIID));
+    PDEVEFI  pThis = RT_FROM_MEMBER(pInterface, DEVEFI, Lun0.IBase);
+
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->Lun0.IBase);
+    return NULL;
+}
+
+/**
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
@@ -1041 +1126 @@
                               "GopMode\0"
                               "UgaHorizontalResolution\0"
-                              "UgaVerticalResolution\0"
-                              ))
+                              "UgaVerticalResolution\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("Configuration error: Invalid config value(s) for the EFI device"));
@@ -1073 +1157 @@
     memcpy(&pThis->aUuid, &uuid, sizeof pThis->aUuid);
     RTListInit((PRTLISTNODE)&pThis->NVRAMVariableList);
-    //pThis->pCurrentVarOp = RTListGetFirst((PRTLISTNODE)&pThis->NVRAMVariableList, List);
 
 
@@ -1109 +1192 @@
         pThis->pszEfiRomFile = NULL;
     }
+
+    /* NVRAM processing */
+    pThis->Lun0.IBase.pfnQueryInterface = devEfi_pfnQueryInterface;
+    rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThis->Lun0.IBase, &pThis->Lun0.pDrvBase, "NvramStorage");
+    if (RT_FAILURE(rc))
+        return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS, N_("Can't attach Nvram Storage driver"));
+
+    pThis->Lun0.pNvramDown = (PPDMINVRAM)pThis->Lun0.pDrvBase->pfnQueryInterface(pThis->Lun0.pDrvBase, PDMINVRAM_IID);
+    AssertPtrReturn(pThis->Lun0.pNvramDown, VERR_PDM_MISSING_INTERFACE_BELOW);
 
     /*