Changeset 44619 in vbox

Timestamp:

Feb 10, 2013 8:26:28 PM (12 years ago)

Author:

vboxsync

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

83706

Message:

Nvram.cpp: Some refinements and fixes.

File:

• trunk/src/VBox/Main/src-client/Nvram.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/Nvram.cpp

@@ -68 +68 @@
 
 
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** The default NVRAM attribute value (non-volatile, boot servier access,
+  runtime access). */
+#define NVRAM_DEFAULT_ATTRIB        UINT32_C(0x7)
+/** The CFGM overlay path of the NVRAM variables. */
+#define NVRAM_CFGM_OVERLAY_PATH     "VBoxInternal/Devices/efi/0/LUN#0/Config/Vars"
+
 /**
  * Constructor/destructor
@@ -111 +120 @@
     {
         memcpy(pszStr, s_szPrefix, sizeof(s_szPrefix) - 1);
-        int rc = RTBase64Encode(pvBuf, cbBuf, &pszStr[sizeof(s_szPrefix) - 1], cbBuf - sizeof(s_szPrefix) + 1, NULL);
+        int rc = RTBase64Encode(pvBuf, cbBuf, &pszStr[sizeof(s_szPrefix) - 1], cbStr - sizeof(s_szPrefix) + 1, NULL);
         if (RT_FAILURE(rc))
         {
@@ -135 +144 @@
         char    szExtraName[256];
         size_t  offValueNm = RTStrPrintf(szExtraName, sizeof(szExtraName) - 16,
-                                         "VBoxInternal/Devices/efi/0/LUN#0/Config/Vars/%4u/", idxVariable);
-
-        char    szAttribs[32];
-        RTStrPrintf(szAttribs, sizeof(szAttribs), "%#x", fAttributes);
+                                         NVRAM_CFGM_OVERLAY_PATH "/%04u/", idxVariable);
 
         char    szUuid[RTUUID_STR_LENGTH];
         int rc2 = RTUuidToStr(pVendorUuid, szUuid, sizeof(szUuid)); AssertRC(rc2);
+
+        char    szAttribs[32];
+        if (fAttributes != NVRAM_DEFAULT_ATTRIB)
+            RTStrPrintf(szAttribs, sizeof(szAttribs), "%#x", fAttributes);
+        else
+            szAttribs[0] = '\0';
 
         char   *pszValue = drvNvram_binaryToCfgmString(pbValue, cbValue);
@@ -150 +162 @@
                 "Name",     pszName,
                 "Uuid",     szUuid,
+                "Value",    pszValue,
                 "Attribs",  szAttribs,
-                "Value",    pszValue,
             };
             for (unsigned i = 0; i < RT_ELEMENTS(apszTodo); i += 2)
             {
+                if (!apszTodo[i + 1][0])
+                    continue;
+
                 Assert(strlen(apszTodo[i]) < 16);
                 strcpy(szExtraName + offValueNm, apszTodo[i]);
@@ -193 +208 @@
 {
     char   szExtraName[256];
-    size_t offValue = RTStrPrintf(szExtraName, sizeof(szExtraName) - 16,
-                                  "VBoxInternal/Devices/efi/0/LUN#0/Config/Vars/%s/", pszVarNodeNm);
-    static const char *s_apszValueNames[] = { "Name", "Attribs", "Value" };
+    size_t offValue = RTStrPrintf(szExtraName, sizeof(szExtraName) - 16, NVRAM_CFGM_OVERLAY_PATH "/%s/", pszVarNodeNm);
+    static const char *s_apszValueNames[] = { "Name", "Uuid", "Value", "Attribs" };
     for (unsigned i = 0; i < RT_ELEMENTS(s_apszValueNames); i++)
     {
@@ -257 +271 @@
     else
     {
-        pVarNode = CFGMR3GetFirstChild(pThis->pLastVarNode);
+        pVarNode = CFGMR3GetFirstChild(pThis->pCfgVarRoot);
         for (uint32_t i = 0; i < idxVariable && pVarNode; i++)
             pVarNode = CFGMR3GetNextChild(pVarNode);
@@ -281 +295 @@
     AssertRCReturn(rc, rc);
 
-    rc = CFGMR3QueryU32(pVarNode, "Attribs", pfAttributes);
+    rc = CFGMR3QueryU32Def(pVarNode, "Attribs", pfAttributes, NVRAM_DEFAULT_ATTRIB);
     AssertRCReturn(rc, rc);
 
@@ -290 +304 @@
     rc = CFGMR3QueryBytes(pVarNode, "Value", pbValue, cbValue);
     AssertRCReturn(rc, rc);
+    *pcbValue = cbValue;
 
     return VINF_SUCCESS;