Changeset 44621 in vbox

Timestamp:

Feb 11, 2013 10:10:51 AM (12 years ago)

Author:

vboxsync

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

83708

Message:

DevEFI.cpp: Fixed assertion in nvramStore (forgot it yesterday).

File:

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

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

@@ -387 +387 @@
 static int nvramStore(PDEVEFI pThis)
 {
-    int rc = pThis->Lun0.pNvramDrv->pfnVarStoreSeqBegin(pThis->Lun0.pNvramDrv, pThis->NVRAM.cVariables);
+    /*
+     * Count the non-volatile variables and issue the begin call.
+     */
+    PEFIVAR  pEfiVar;
+    uint32_t cNonVolatile = 0;
+    RTListForEach(&pThis->NVRAM.VarList, pEfiVar, EFIVAR, ListNode)
+        if (pEfiVar->fAttributes & VBOX_EFI_VARIABLE_NON_VOLATILE)
+            cNonVolatile++;
+    int rc = pThis->Lun0.pNvramDrv->pfnVarStoreSeqBegin(pThis->Lun0.pNvramDrv, cNonVolatile);
     if (RT_SUCCESS(rc))
     {
+        /*
+         * Store each non-volatile variable.
+         */
         uint32_t    idxVar  = 0;
-        PEFIVAR     pEfiVar;
         RTListForEach(&pThis->NVRAM.VarList, pEfiVar, EFIVAR, ListNode)
         {
@@ -408 +418 @@
             idxVar++;
         }
-        Assert((pThis->NVRAM.cVariables == idxVar));
+        Assert(idxVar == cNonVolatile);
+
+        /*
+         * Done.
+         */
         rc = pThis->Lun0.pNvramDrv->pfnVarStoreSeqEnd(pThis->Lun0.pNvramDrv, rc);
     }