Changeset 91536 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Oct 4, 2021 9:46:04 AM (3 years ago)

Author:

vboxsync

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

147230

Message:

Main/NvramStore: Fix saving the tar bundle of the NVRAM state, bugref:10098

File:

• trunk/src/VBox/Main/src-all/NvramStoreImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-all/NvramStoreImpl.cpp

@@ -610 +610 @@
  * Saves the NVRAM store as a tar archive.
  */
-int NvramStore::i_saveStoreAsTar(void)
+int NvramStore::i_saveStoreAsTar(const char *pszPath)
 {
     uint32_t        offError = 0;
@@ -616 +616 @@
     RTVFSIOSTREAM   hVfsIos;
 
-    int rc = RTVfsChainOpenIoStream(m->bd->strNvramPath.c_str(), RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE,
+    int rc = RTVfsChainOpenIoStream(pszPath, RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE,
                                     &hVfsIos, &offError, RTErrInfoInitStatic(&ErrInfo));
     if (RT_SUCCESS(rc))
@@ -666 +666 @@
     int rc = VINF_SUCCESS;
 
+    Utf8Str strTmp;
+    NvramStore::getNonVolatileStorageFile(strTmp);
+
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     if (   m->bd->mapNvram.size() == 1
@@ -674 +677 @@
         rc = RTVfsFileSeek(hVfsFileNvram, 0 /*offSeek*/, RTFILE_SEEK_BEGIN, NULL /*poffActual*/);
         AssertRC(rc); RT_NOREF(rc);
-
-        Utf8Str strTmp;
-        NvramStore::getNonVolatileStorageFile(strTmp);
 
         RTVFSIOSTREAM hVfsIosDst;
@@ -693 +693 @@
     }
     else if (m->bd->mapNvram.size())
-        rc = i_saveStoreAsTar();
+        rc = i_saveStoreAsTar(strTmp.c_str());
     /* else: No NVRAM content to store so we are done here. */