Changeset 81299 in vbox for trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

Timestamp:

Oct 16, 2019 7:32:48 PM (5 years ago)

Author:

vboxsync

Message:

Main/Machine+BIOSSettings: simplify NVRAM handling, do everything in backwards c
ompatible way
Frontends/VBoxManage: adapt to API change

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)

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

@@ -1750 +1750 @@
             GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiDeviceProps", &deviceProps);
 
+            /* Get NVRAM file name */
+            Bstr bstrNVRAM;
+            hrc = biosSettings->COMGETTER(NonVolatileStorageFile)(bstrNVRAM.asOutParam());  H();
+
             /* Get graphics mode settings */
             uint32_t u32GraphicsMode = UINT32_MAX;
@@ -1813 +1817 @@
             InsertConfigBytes(pCfg,    "UUID", &HardwareUuid,sizeof(HardwareUuid));
             InsertConfigInteger(pCfg,  "64BitEntry",  f64BitEntry); /* boolean */
+            InsertConfigString(pCfg,   "NvramFile",   bstrNVRAM);
             if (u32GraphicsMode != UINT32_MAX)
                 InsertConfigInteger(pCfg,  "GraphicsMode",  u32GraphicsMode);
@@ -1831 +1836 @@
             InsertConfigInteger(pCfg,  "PermanentSave", 1);
 #endif
-
-            BOOL fNVRAM = FALSE;
-            hrc = biosSettings->COMGETTER(NonVolatileStorageEnabled)(&fNVRAM);              H();
-            if (fNVRAM)
-            {
-                hrc = biosSettings->COMGETTER(NonVolatileStorageFile)(bstr.asOutParam());   H();
-
-                /*
-                 * NVRAM device subtree.
-                 */
-                InsertConfigNode(pDevices, "flash", &pDev);
-                InsertConfigNode(pDev,     "0", &pInst);
-                InsertConfigNode(pInst,    "Config", &pCfg);
-                InsertConfigString(pCfg,   "FlashFile", bstr);
-            }
         }