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

Timestamp:

Oct 21, 2019 6:19:39 PM (6 years ago)

Author:

vboxsync

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

134142

Message:

Main/Machine+BIOSSettings+Console: Full implementation of NVRAM handling (part of VM delete, rename, clone and move code in combination with taking, deleting and restoring snapshots). Corresponding console update (ripping out old, never really used NVRAM handling).

File:

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

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

@@ -153 +153 @@
     m->bd.attachCopy(that->m->bd);
 
+    // Intentionally "forget" the NVRAM file since it must be unique and set
+    // to the correct value before the copy of the settings makes sense.
+    m->bd->strNVRAMPath.setNull();
+
     autoInitSpan.setSucceeded();
 
@@ -373 +377 @@
 
     m->bd.backup();
-
     m->bd->fIOAPICEnabled = RT_BOOL(aIOAPICEnabled);
+
     alock.release();
     AutoWriteLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);  // mParent is const, needs no locking
@@ -401 +405 @@
 
     m->bd.backup();
-
     m->bd->apicMode = aAPICMode;
+
     alock.release();
     AutoWriteLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);  // mParent is const, needs no locking
@@ -591 +595 @@
     /* this will back up current data */
     m->bd.assignCopy(aThat->m->bd);
+
+    // Intentionally "forget" the NVRAM file since it must be unique and set
+    // to the correct value before the copy of the settings makes sense.
+    m->bd->strNVRAMPath.setNull();
+
 }
 
@@ -608 +617 @@
 }
 
+Utf8Str BIOSSettings::i_getNonVolatileStorageFile()
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), Utf8Str::Empty);
+
+    Utf8Str strTmp;
+    BIOSSettings::getNonVolatileStorageFile(strTmp);
+    return strTmp;
+}
+
 void BIOSSettings::i_updateNonVolatileStorageFile(const Utf8Str &aNonVolatileStorageFile)
 {