Changeset 108620 in vbox

Timestamp:

Mar 19, 2025 7:29:06 PM (2 months ago)

Author:

vboxsync

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

168032

Message:

Main/NvramStore: Changeset r164311 modified the implementation of
NvramStore::getNonVolatileStorageFile() to return failure if no NVRAM
file however the API documents that this attribute may not exist. This
change breaks IMachine::moveTo() if the VM has a snapshot since
snapshots don't have an NVRAM file. Thus restore the behaviour of
getNonVolatileStorageFile() to its previous incarnation where the caller
is required to check for the attribute's existence upon successful
invocation.

Location:

trunk/src/VBox/Main

Files:

• include/NvramStoreImpl.h (modified) (1 diff)
• src-all/NvramStoreImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/NvramStoreImpl.h

@@ -85 +85 @@
 #endif
 
-    int i_getNonVolatileStorageFile(com::Utf8Str &aNonVolatileStorageFile);
     com::Utf8Str i_getNonVolatileStorageFile();
     void i_updateNonVolatileStorageFile(const com::Utf8Str &aNonVolatileStorageFile);

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

@@ -357 +357 @@
 HRESULT NvramStore::getNonVolatileStorageFile(com::Utf8Str &aNonVolatileStorageFile)
 {
-    int vrc = i_getNonVolatileStorageFile(aNonVolatileStorageFile);
-    if (RT_FAILURE(vrc))
-        return setError(E_FAIL, tr("This machine does not have an NVRAM store file"));
+#ifndef VBOX_COM_INPROC
+    Utf8Str strTmp;
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        strTmp = m->bd->strNvramPath;
+    }
+
+    AutoReadLock mlock(m->pParent COMMA_LOCKVAL_SRC_POS);
+    if (strTmp.isEmpty())
+        strTmp = m->pParent->i_getDefaultNVRAMFilename();
+    if (strTmp.isNotEmpty())
+        m->pParent->i_calculateFullPath(strTmp, aNonVolatileStorageFile);
+#else
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    aNonVolatileStorageFile = m->bd->strNvramPath;
+#endif
 
     return S_OK;
@@ -369 +382 @@
 #ifndef VBOX_COM_INPROC
     Utf8Str strPath;
-    int vrc = i_getNonVolatileStorageFile(strPath);
-    if (RT_FAILURE(vrc))
+    NvramStore::getNonVolatileStorageFile(strPath);
+    if (strPath.isEmpty())
         return setError(E_FAIL, tr("No NVRAM store file found"));
 
@@ -383 +396 @@
         if (!m->mapNvram.size())
         {
-            vrc = i_loadStore(strPath.c_str());
+            int vrc = i_loadStore(strPath.c_str());
             if (RT_FAILURE(vrc))
                 hrc = setError(E_FAIL, tr("Loading the NVRAM store failed (%Rrc)\n"), vrc);
@@ -453 +466 @@
     if (FAILED(adep.hrc())) return adep.hrc();
 
-    Utf8Str strPath = i_getNonVolatileStorageFile();
+    Utf8Str strPath;
+    NvramStore::getNonVolatileStorageFile(strPath);
 
     /* We need a write lock because of the lazy initialization. */
@@ -521 +535 @@
 
 /**
- * Returns the path of the non-volatile storage file.
- *
- * @returns VBox status code.
- * @retval  VERR_FILE_NOT_FOUND if the storage file was not found.
- * @param   aNonVolatileStorageFile   Returns path to non-volatile stroage file on success.
- */
-int NvramStore::i_getNonVolatileStorageFile(com::Utf8Str &aNonVolatileStorageFile)
-{
-#ifndef VBOX_COM_INPROC
-    Utf8Str strTmp;
-    {
-        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-        strTmp = m->bd->strNvramPath;
-    }
-
-    AutoReadLock mlock(m->pParent COMMA_LOCKVAL_SRC_POS);
-    if (strTmp.isEmpty())
-        strTmp = m->pParent->i_getDefaultNVRAMFilename();
-    if (strTmp.isNotEmpty())
-        m->pParent->i_calculateFullPath(strTmp, aNonVolatileStorageFile);
-#else
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    aNonVolatileStorageFile = m->bd->strNvramPath;
-#endif
-
-    if (aNonVolatileStorageFile.isEmpty())
-        return VERR_FILE_NOT_FOUND;
-
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Returns the path of the non-volatile stroage file.
  *
@@ -566 +547 @@
 
     Utf8Str strTmp;
-    /* rc ignored */ i_getNonVolatileStorageFile(strTmp);
+    NvramStore::getNonVolatileStorageFile(strTmp);
     return strTmp;
 }
@@ -1197 +1178 @@
     int vrc = VINF_SUCCESS;
 
-    Utf8Str strPath = i_getNonVolatileStorageFile();
+    Utf8Str strPath;
+    NvramStore::getNonVolatileStorageFile(strPath);
 
     /*