Changeset 81087 in vbox for trunk/src/VBox/Main/src-server/BIOSSettingsImpl.cpp

Timestamp:

Sep 30, 2019 6:55:28 PM (6 years ago)

Author:

vboxsync

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

133693

Message:

Main/Machine+BIOSSettings: bare bones NVRAM logic, many parts missing (no snapshot handling, no move VM handling, no remove VM handling).
Main/Settings: adaptions to store NVRAM config in the settings file
Frontends/VBoxManage: support enabling and showing state

File:

• trunk/src/VBox/Main/src-server/BIOSSettingsImpl.cpp (modified) (12 diffs)

trunk/src/VBox/Main/src-server/BIOSSettingsImpl.cpp

@@ -224 +224 @@
 }
 
-
 HRESULT BIOSSettings::setLogoFadeOut(BOOL enable)
 {
@@ -256 +255 @@
 }
 
-
 HRESULT BIOSSettings::setLogoDisplayTime(ULONG displayTime)
 {
@@ -284 +282 @@
 }
 
-
 HRESULT BIOSSettings::setLogoImagePath(const com::Utf8Str &imagePath)
 {
@@ -311 +308 @@
 }
 
-
 HRESULT BIOSSettings::setBootMenuMode(BIOSBootMenuMode_T bootMenuMode)
 {
@@ -340 +336 @@
 }
 
-
 HRESULT BIOSSettings::setACPIEnabled(BOOL enable)
 {
@@ -369 +364 @@
 }
 
-
 HRESULT BIOSSettings::setIOAPICEnabled(BOOL aIOAPICEnabled)
 {
@@ -398 +392 @@
 }
 
-
 HRESULT BIOSSettings::setAPICMode(APICMode_T aAPICMode)
 {
@@ -427 +420 @@
 }
 
-
 HRESULT BIOSSettings::setPXEDebugEnabled(BOOL enable)
 {
@@ -446 +438 @@
 }
 
+
 HRESULT BIOSSettings::getTimeOffset(LONG64 *offset)
 {
@@ -455 +448 @@
 }
 
-
 HRESULT BIOSSettings::setTimeOffset(LONG64 offset)
 {
@@ -474 +466 @@
 }
 
+
+HRESULT BIOSSettings::getNonVolatileStorageEnabled(BOOL *enabled)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *enabled = m->bd->fNVRAMEnabled;
+
+    return S_OK;
+}
+
+HRESULT BIOSSettings::setNonVolatileStorageEnabled(BOOL enable)
+{
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(m->pMachine);
+    if (FAILED(adep.rc())) return adep.rc();
+
+    AutoCaller autoMachineCaller(m->pMachine);
+    AssertComRCReturnRC(autoMachineCaller.rc());
+
+    {
+        AutoReadLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+        m->bd.backup();
+        m->bd->fNVRAMEnabled = RT_BOOL(enable);
+        if (enable && m->bd->strNVRAMPath.isEmpty())
+            m->bd->strNVRAMPath = m->pMachine->i_getDefaultNVRAMFilename();
+    }
+
+    AutoWriteLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);  // mParent is const, needs no locking
+    m->pMachine->i_setModified(Machine::IsModified_BIOS);
+
+    return S_OK;
+}
+
+
 HRESULT BIOSSettings::getNonVolatileStorageFile(com::Utf8Str &aNonVolatileStorageFile)
 {
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    aNonVolatileStorageFile = "";
+    Utf8Str strTmp;
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        strTmp = m->bd->strNVRAMPath;
+    }
+
+    m->pMachine->i_calculateFullPath(strTmp, aNonVolatileStorageFile);
 
     return S_OK;
@@ -504 +536 @@
     AssertComRCReturnRC(autoCaller.rc());
 
+    AutoReadLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     // simply copy
     m->bd.assignCopy(&data);
+
+    Utf8Str strTmp(m->bd->strNVRAMPath);
+    m->pMachine->i_copyPathRelativeToMachine(strTmp, m->bd->strNVRAMPath);
 
     return S_OK;