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

Timestamp:

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

Author:

vboxsync

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

134004

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-server/BIOSSettingsImpl.cpp (modified) (4 diffs)

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

@@ -467 +467 @@
 
 
-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)
 {
@@ -510 +475 @@
     }
 
+    AutoReadLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);
+    if (strTmp.isEmpty())
+        strTmp = m->pMachine->i_getDefaultNVRAMFilename();
     if (strTmp.isNotEmpty())
         m->pMachine->i_calculateFullPath(strTmp, aNonVolatileStorageFile);
@@ -544 +512 @@
 
     Utf8Str strTmp(m->bd->strNVRAMPath);
-    m->pMachine->i_copyPathRelativeToMachine(strTmp, m->bd->strNVRAMPath);
+    if (strTmp.isNotEmpty())
+        m->pMachine->i_copyPathRelativeToMachine(strTmp, m->bd->strNVRAMPath);
+    if (   m->pMachine->i_getFirmwareType() == FirmwareType_BIOS
+        || m->bd->strNVRAMPath == m->pMachine->i_getDefaultNVRAMFilename())
+        m->bd->strNVRAMPath.setNull();
 
     return S_OK;
@@ -636 +608 @@
 }
 
+void BIOSSettings::i_updateNonVolatileStorageFile(const Utf8Str &aNonVolatileStorageFile)
+{
+    /* sanity */
+    AutoCaller autoCaller(this);
+    AssertComRCReturnVoid(autoCaller.rc());
+
+    AutoReadLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    Utf8Str strTmp(aNonVolatileStorageFile);
+    if (strTmp == m->pMachine->i_getDefaultNVRAMFilename())
+        strTmp.setNull();
+
+    if (strTmp == m->bd->strNVRAMPath)
+        return;
+
+    m->bd.backup();
+    m->bd->strNVRAMPath = strTmp;
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */