Changeset 43146 in vbox for trunk/src/VBox

Timestamp:

Sep 3, 2012 1:41:48 AM (12 years ago)

Author:

vboxsync

Message:

EFI: counter + code enhancement.

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevOVMF.cpp (modified) (13 diffs)
• Firmware2/VBoxPkg/Include/DevEFI.h (modified) (1 diff)

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

@@ -62 +62 @@
         RTLISTNODE List;
         RTUUID   uuid;
-        char     szVariableName[1024];
+        char     szVariableName[EFI_VARIABLE_NAME_MAX];
         uint32_t cbVariableName;
-        uint8_t  au8Value[1024];
+        uint8_t  au8Value[EFI_VARIABLE_VALUE_MAX];
         uint32_t cbValue;
         uint32_t u32Attribute;
@@ -142 +142 @@
     uint32_t        u32UgaVertical;
     struct {
-        uint32_t        idxVariableName;
         EFIVAROP        enmOp;
         uint32_t        u32Status;
-        uint32_t idxOpBuffer;
+        uint32_t        idxOpBuffer;
         EFIVAR          OperationVarOp;
-        RTLISTANCHOR    NVRAMVariableList;
+        int             cNvramVaraibles;
+        RTLISTANCHOR    NvramVariableList;
         PEFIVAR         pCurrentVarOp;
     } NVRAM;
@@ -179 +179 @@
     PEFIVAR pEfiVar = NULL;
     LogFlowFunc(("pszVariableName:%s, pUuid:%RTuuid\n", pszVariableName, pUuid));
-    RTListForEach((PRTLISTNODE)&pThis->NVRAM.NVRAMVariableList, pEfiVar, EFIVAR, List)
+    RTListForEach((PRTLISTNODE)&pThis->NVRAM.NvramVariableList, pEfiVar, EFIVAR, List)
     {
         LogFlowFunc(("pEfiVar:%p\n", pEfiVar));
@@ -208 +208 @@
             return VERR_NO_MEMORY;
         }
-        pEfiVar->cbVariableName = 512;
-        pEfiVar->cbValue = 1024;
+        pEfiVar->cbVariableName = EFI_VARIABLE_NAME_MAX;
+        pEfiVar->cbValue = EFI_VARIABLE_VALUE_MAX;
         rc = pThis->Lun0.pNvramDown->pfnLoadNvramValue(pThis->Lun0.pNvramDown,
                                                        idxValue,
@@ -223 +223 @@
             break;
         }
-        RTListAppend((PRTLISTNODE)&pThis->NVRAM.NVRAMVariableList, &pEfiVar->List);
+        RTListAppend((PRTLISTNODE)&pThis->NVRAM.NvramVariableList, &pEfiVar->List);
     }
     if (   RT_FAILURE(rc)
@@ -239 +239 @@
     pThis->Lun0.pNvramDown->pfnFlushNvramStorage(pThis->Lun0.pNvramDown);
 
-    RTListForEach((PRTLISTNODE)&pThis->NVRAM.NVRAMVariableList, pEfiVar, EFIVAR, List)
+    RTListForEach((PRTLISTNODE)&pThis->NVRAM.NvramVariableList, pEfiVar, EFIVAR, List)
     {
         pThis->Lun0.pNvramDown->pfnStoreNvramValue(pThis->Lun0.pNvramDown,
@@ -583 +583 @@
                             pThis->NVRAM.u32Status = EFI_VARIABLE_OP_STATUS_BSY;
                             PEFIVAR pEfiVar = NULL;
-                            memset(pThis->NVRAM.OperationVarOp.au8Value, 0, 1024);
+                            memset(pThis->NVRAM.OperationVarOp.au8Value, 0, EFI_VARIABLE_NAME_MAX);
                             int nvramRc = nvramLookupVariableByUuidAndName(
                                                 pThis,
@@ -631 +631 @@
                                     RTMemFree(pEfiVar);
                                     pThis->NVRAM.u32Status = EFI_VARIABLE_OP_STATUS_OK;
+                                    pThis->NVRAM.cNvramVaraibles--;
                                 }
                                 else
@@ -659 +660 @@
                                 memcpy(pEfiVar, &pThis->NVRAM.OperationVarOp, sizeof(EFIVAR));
                                 RTListInit(&pEfiVar->List);
-                                RTListAppend(&pThis->NVRAM.NVRAMVariableList, &pEfiVar->List);
+                                RTListAppend(&pThis->NVRAM.NvramVariableList, &pEfiVar->List);
                                 pThis->NVRAM.u32Status = EFI_VARIABLE_OP_STATUS_OK;
+                                pThis->NVRAM.cNvramVaraibles++;
                             }
                         }
@@ -698 +700 @@
                 case EFI_VM_VARIABLE_OP_NAME_LENGTH:
                     pThis->NVRAM.OperationVarOp.cbVariableName = u32;
-                    memset(pThis->NVRAM.OperationVarOp.szVariableName, 0, 1024);
+                    memset(pThis->NVRAM.OperationVarOp.szVariableName, 0, EFI_VARIABLE_NAME_MAX);
                 break;
                 case EFI_VM_VARIABLE_OP_VALUE:
@@ -706 +708 @@
                 case EFI_VM_VARIABLE_OP_VALUE_LENGTH:
                     pThis->NVRAM.OperationVarOp.cbValue = u32;
-                    memset(pThis->NVRAM.OperationVarOp.au8Value, 0, 1024);
+                    memset(pThis->NVRAM.OperationVarOp.au8Value, 0, EFI_VARIABLE_VALUE_MAX);
                 break;
                 default:
@@ -824 +826 @@
     nvramStore(pThis);
     PEFIVAR pEfiVar = NULL;
-    while (!RTListIsEmpty(&pThis->NVRAM.NVRAMVariableList))
-    {
-        pEfiVar = RTListNodeGetNext(&pThis->NVRAM.NVRAMVariableList, EFIVAR, List);
+    while (!RTListIsEmpty(&pThis->NVRAM.NvramVariableList))
+    {
+        pEfiVar = RTListNodeGetNext(&pThis->NVRAM.NvramVariableList, EFIVAR, List);
         RTListNodeRemove(&pEfiVar->List);
         RTMemFree(pEfiVar);
@@ -1155 +1157 @@
     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);
 
 

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h

@@ -122 +122 @@
 #define EFI_VARIABLE_OP_STATUS_BSY        0xcafe0010
 
+#define EFI_VARIABLE_NAME_MAX   1024
+#define EFI_VARIABLE_VALUE_MAX   1024
+
 typedef enum {
     EFI_VM_VARIABLE_OP_START = 0,