Changeset 43209 in vbox

Timestamp:

Sep 5, 2012 6:04:59 PM (12 years ago)

Author:

vboxsync

Message:

EFI: nits.

File:

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

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

@@ -79 +79 @@
     uint32_t        idxOpBuffer;
     EFIVAR          OperationVarOp;
-    int             cNvramVaraibles;
+    int             cNvramVariables;
     int             iNvramLastIndex;
-    RTLISTANCHOR    NvramVariableList;
+    EFIVAR          NvramVariableList;
     int             idxCurrentVar;
     PEFIVAR         pCurrentVarOp;
@@ -170 +170 @@
         SSMFIELD_ENTRY          (NVRAMDESC, u32Status),
         SSMFIELD_ENTRY          (NVRAMDESC, idxOpBuffer),
-        SSMFIELD_ENTRY          (NVRAMDESC, OperationVarOp),
-        SSMFIELD_ENTRY          (NVRAMDESC, cNvramVaraibles),
+        SSMFIELD_ENTRY_IGNORE   (NVRAMDESC, OperationVarOp),
+        SSMFIELD_ENTRY          (NVRAMDESC, cNvramVariables),
         SSMFIELD_ENTRY          (NVRAMDESC, iNvramLastIndex),
         SSMFIELD_ENTRY_IGNORE   (NVRAMDESC, NvramVariableList),
@@ -208 +208 @@
 {
     PEFIVAR pEfiVar = NULL;
-    while (!RTListIsEmpty(&pThis->NVRAM.NvramVariableList))
-    {
-        pEfiVar = RTListNodeGetNext(&pThis->NVRAM.NvramVariableList, EFIVAR, List);
+    while (!RTListIsEmpty(&pThis->NVRAM.NvramVariableList.List))
+    {
+        pEfiVar = RTListNodeGetNext(&pThis->NVRAM.NvramVariableList.List, EFIVAR, List);
         RTListNodeRemove(&pEfiVar->List);
         RTMemFree(pEfiVar);
@@ -224 +224 @@
     PEFIVAR pEfiVar = NULL;
     LogFlowFunc(("pszVariableName:%s, pUuid:%RTuuid\n", pszVariableName, pUuid));
-    RTListForEach((PRTLISTNODE)&pThis->NVRAM.NvramVariableList, pEfiVar, EFIVAR, List)
+    int idxVar = 0;
+    RTListForEach((PRTLISTNODE)&pThis->NVRAM.NvramVariableList.List, pEfiVar, EFIVAR, List)
     {
         LogFlowFunc(("pEfiVar:%p\n", pEfiVar));
+        idxVar++;
         if (   pEfiVar
             && RTUuidCompare(pUuid, &pEfiVar->uuid) == 0
@@ -236 +238 @@
         }
     }
+    Assert(pThis->NVRAM.cNvramVariables >= idxVar);
     LogFlowFuncLeaveRC(rc);
     return rc;
@@ -268 +271 @@
             break;
         }
-        RTListAppend((PRTLISTNODE)&pThis->NVRAM.NvramVariableList, &pEfiVar->List);
+        pThis->NVRAM.cNvramVariables++;
+        RTListAppend((PRTLISTNODE)&pThis->NVRAM.NvramVariableList.List, &pEfiVar->List);
     }
     if (   RT_FAILURE(rc)
@@ -284 +288 @@
     pThis->Lun0.pNvramDown->pfnFlushNvramStorage(pThis->Lun0.pNvramDown);
 
-    RTListForEach((PRTLISTNODE)&pThis->NVRAM.NvramVariableList, pEfiVar, EFIVAR, List)
+    RTListForEach((PRTLISTNODE)&pThis->NVRAM.NvramVariableList.List, pEfiVar, EFIVAR, List)
     {
         pThis->Lun0.pNvramDown->pfnStoreNvramValue(pThis->Lun0.pNvramDown,
@@ -295 +299 @@
         idxVar++;
     }
+    Assert((pThis->NVRAM.cNvramVariables == idxVar));
     return VINF_SUCCESS;
 }
@@ -392 +397 @@
     LogFlowFuncEnter();
     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
-    SSMR3PutStructEx(pSSM, &pThis->NVRAM, sizeof(NVRAMDESC), 0, g_aEfiNvramDescField, NULL);
-    SSMR3PutStructEx(pSSM, &pThis->NVRAM.OperationVarOp, sizeof(EFIVAR), 0, g_aEfiVariableDescFields, NULL);
-    RTListForEach((PRTLISTNODE)&pThis->NVRAM.NvramVariableList, pEfiVar, EFIVAR, List)
-    {
-        SSMR3PutStructEx(pSSM, pEfiVar, sizeof(EFIVAR), 0, g_aEfiVariableDescFields, NULL);
-    }
+    rc = SSMR3PutStructEx(pSSM, &pThis->NVRAM, sizeof(NVRAMDESC), 0, g_aEfiNvramDescField, NULL);
+    AssertRCReturn(rc, rc);
+    rc = SSMR3PutStructEx(pSSM, &pThis->NVRAM.OperationVarOp, sizeof(EFIVAR), 0, g_aEfiVariableDescFields, NULL);
+    AssertRCReturn(rc, rc);
+    int idxV = 0;
+    RTListForEach(&pThis->NVRAM.NvramVariableList.List, pEfiVar, EFIVAR, List)
+    {
+        rc = SSMR3PutStructEx(pSSM, pEfiVar, sizeof(EFIVAR), 0, g_aEfiVariableDescFields, NULL);
+        AssertRCReturn(rc, rc);
+        idxV++;
+    }
+    Assert((pThis->NVRAM.cNvramVariables == idxV));
+    Log2(("idxV: %d\n", idxV));
     LogFlowFuncLeaveRC(rc);
     return rc;
@@ -414 +426 @@
     if (uVersion == 1)
     {
-        SSMR3GetStructEx(pSSM, &pThis->NVRAM, sizeof(NVRAMDESC), 0, g_aEfiNvramDescField, NULL);
-        SSMR3GetStructEx(pSSM, &pThis->NVRAM.OperationVarOp, sizeof(EFIVAR), 0, g_aEfiVariableDescFields, NULL);
+        rc = SSMR3GetStructEx(pSSM, &pThis->NVRAM, sizeof(NVRAMDESC), 0, g_aEfiNvramDescField, NULL);
+        AssertRCReturn(rc, rc);
+        rc = SSMR3GetStructEx(pSSM, &pThis->NVRAM.OperationVarOp, sizeof(EFIVAR), 0, g_aEfiVariableDescFields, NULL);
+        AssertRCReturn(rc, rc);
         int idxVariable = 0;
-        Assert(RTListIsEmpty(&pThis->NVRAM.NvramVariableList));
-        RTListInit(&pThis->NVRAM.NvramVariableList);
-        for (idxVariable = 0; idxVariable < pThis->NVRAM.cNvramVaraibles; ++idxVariable)
+        Assert(RTListIsEmpty(&pThis->NVRAM.NvramVariableList.List));
+        RTListInit(&pThis->NVRAM.NvramVariableList.List);
+        for (idxVariable = 0; idxVariable < pThis->NVRAM.cNvramVariables; ++idxVariable)
         {
             PEFIVAR pEfiVar = (PEFIVAR)RTMemAllocZ(sizeof(EFIVAR));
             AssertPtrReturn(pEfiVar, VERR_NO_MEMORY);
-            SSMR3GetStructEx(pSSM, pEfiVar, sizeof(EFIVAR), 0, g_aEfiVariableDescFields, NULL);
+
+            rc = SSMR3GetStructEx(pSSM, pEfiVar, sizeof(EFIVAR), 0, g_aEfiVariableDescFields, NULL);
+            AssertRCReturn(rc, rc);
+
             RTListInit(&pEfiVar->List);
-            RTListAppend(&pThis->NVRAM.NvramVariableList, &pEfiVar->List);
+            RTListAppend(&pThis->NVRAM.NvramVariableList.List, &pEfiVar->List);
+
             if (pThis->NVRAM.idxCurrentVar == pEfiVar->idxVariable)
                 pThis->NVRAM.pCurrentVarOp = pEfiVar;
@@ -440 +458 @@
     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
     LogFlowFuncEnter();
-    if (RTListIsEmpty(&pThis->NVRAM.NvramVariableList))
+    if (RTListIsEmpty(&pThis->NVRAM.NvramVariableList.List))
         nvramLoad(pThis);
     LogFlowFuncLeaveRC(rc);
@@ -738 +756 @@
                                     RTMemFree(pEfiVar);
                                     pThis->NVRAM.u32Status = EFI_VARIABLE_OP_STATUS_OK;
-                                    pThis->NVRAM.cNvramVaraibles--;
+                                    pThis->NVRAM.cNvramVariables--;
                                 }
                                 else
@@ -767 +785 @@
                                 memcpy(pEfiVar, &pThis->NVRAM.OperationVarOp, sizeof(EFIVAR));
                                 RTListInit(&pEfiVar->List);
-                                RTListAppend(&pThis->NVRAM.NvramVariableList, &pEfiVar->List);
+                                RTListAppend(&pThis->NVRAM.NvramVariableList.List, &pEfiVar->List);
                                 pThis->NVRAM.u32Status = EFI_VARIABLE_OP_STATUS_OK;
-                                pThis->NVRAM.cNvramVaraibles++;
+                                pThis->NVRAM.cNvramVariables++;
                                 pEfiVar->idxVariable = pThis->NVRAM.iNvramLastIndex;
                                 pThis->NVRAM.iNvramLastIndex++;
                             }
                         }
+                        LogFunc(("cNvramVariables:%d, iNvramLastIndex:%d\n", pThis->NVRAM.cNvramVariables, pThis->NVRAM.iNvramLastIndex));
                         break;
                         case EFI_VARIABLE_OP_QUERY_NEXT:
@@ -1260 +1279 @@
     uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
     memcpy(&pThis->aUuid, &uuid, sizeof pThis->aUuid);
-    RTListInit((PRTLISTNODE)&pThis->NVRAM.NvramVariableList);
+    RTListInit((PRTLISTNODE)&pThis->NVRAM.NvramVariableList.List);