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

Timestamp:

Feb 8, 2013 12:27:08 PM (12 years ago)

Author:

vboxsync

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

83682

Message:

Added EFI_VARIABLE_OP_QUERY_REWIND for getting to the first variable.

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (2 diffs)
• Firmware2/VBoxPkg/Include/DevEFI.h (modified) (1 diff)
• Firmware2/VBoxPkg/VBoxVariable/InitVariable.c (modified) (1 diff)

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

@@ -460 +460 @@
     if (pEfiVar)
         pEfiVar = RTListGetNext(&pThis->NVRAM.VarList, pEfiVar, EFIVAR, ListNode);
+    else
+        pEfiVar = RTListGetFirst(&pThis->NVRAM.VarList, EFIVAR, ListNode);
     nvramWriteVariableOpQueryCopyResult(pThis, pEfiVar);
     return VINF_SUCCESS;
@@ -601 +603 @@
                 case EFI_VARIABLE_OP_QUERY_NEXT:
                     rc = nvramWriteVariableOpQueryNext(pThis);
+                    break;
+
+                case EFI_VARIABLE_OP_QUERY_REWIND:
+                    Log2(("EFI_VARIABLE_OP_QUERY_REWIND\n"));
+                    pThis->NVRAM.pCurVar = NULL;
                     break;
 

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

@@ -112 +112 @@
 #define EFI_VARIABLE_OP_QUERY        0xdead0001
 #define EFI_VARIABLE_OP_QUERY_NEXT   0xdead0002
+#define EFI_VARIABLE_OP_QUERY_REWIND 0xdead0003
 #define EFI_VARIABLE_OP_ADD          0xdead0010
 

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxVariable/InitVariable.c

@@ -235 +235 @@
      * Tell DevEFI which the current variable is, then ask for the next one.
      */
-    VBoxWriteNVRAMGuidParam(VendorGuid);
-    VBoxWriteNVRAMNameParam(VariableName);
-
-    u32Rc = VBoxWriteNVRAMDoOp(EFI_VARIABLE_OP_QUERY);
+    if (!VariableName[0])
+        u32Rc = VBoxWriteNVRAMDoOp(EFI_VARIABLE_OP_QUERY_REWIND);
+    else
+    {
+        VBoxWriteNVRAMGuidParam(VendorGuid);
+        VBoxWriteNVRAMNameParam(VariableName);
+        u32Rc = VBoxWriteNVRAMDoOp(EFI_VARIABLE_OP_QUERY);
+    }
     //if (u32Rc == EFI_VARIABLE_OP_STATUS_OK) - debug
         u32Rc = VBoxWriteNVRAMDoOp(EFI_VARIABLE_OP_QUERY_NEXT);