Changeset 44620 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 10, 2013 8:42:53 PM (12 years ago)

Author:

vboxsync

Message:

DevEFI.cpp: Don't save volatile variables.

File:

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

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

@@ -225 +225 @@
 #define EFI_SSM_VERSION_4_2 1
 
+/** Non-volatile EFI variable. */
+#define VBOX_EFI_VARIABLE_NON_VOLATILE  UINT32_C(0x00000001)
+/** Non-volatile EFI variable. */
+#define VBOX_EFI_VARIABLE_READ_ONLY     UINT32_C(0x00000008)
+
 
 /*******************************************************************************
@@ -389 +394 @@
         RTListForEach(&pThis->NVRAM.VarList, pEfiVar, EFIVAR, ListNode)
         {
+            /* Skip volatile variables. */
+            if (!(pEfiVar->fAttributes & VBOX_EFI_VARIABLE_NON_VOLATILE))
+                continue;
+
             int rc2 = pThis->Lun0.pNvramDrv->pfnVarStoreSeqPut(pThis->Lun0.pNvramDrv, idxVar,
                                                                &pEfiVar->uuid, pEfiVar->szName,  pEfiVar->cchName,
@@ -1336 +1345 @@
 static DECLCALLBACK(int) efiInitComplete(PPDMDEVINS pDevIns)
 {
-    /* PC Bios */
     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
+
+    /*
+     * Memory sizes.
+     */
+    uint64_t const offRamHole = _4G - pThis->cbRamHole;
     uint32_t u32;
-
-    /*
-     * Memory sizes.
-     */
-    uint64_t const offRamHole = _4G - pThis->cbRamHole;
     if (pThis->cbRam > 16 * _1M)
         u32 = (uint32_t)( (RT_MIN(RT_MIN(pThis->cbRam, offRamHole), UINT32_C(0xffe00000)) - 16U * _1M) / _64K );