Changeset 95476 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 1, 2022 1:17:59 PM (3 years ago)

Author:

vboxsync

Message:

Main/Snapshot: not able to restore from a snapshot more than once if VM
has multiple snapshots. bugref:10252

If a VM has multiple snapshots then restoring from any snapshot beyond
the first will result in that snapshot being deleted during power up.
Any attempt to restore from this snapshot in the future will thus fail
as the file is now gone. Fixed by updating Snapshot::i_sharesSavedStateFile()
to check each snapshot's saved state file rather than just the first
snapshot.

Also 'VBoxManage unregistervm x --delete' fails to remove snapshots due
to a regression in Snapshot::i_uninitAll() which accidentally inverted
the logic when testing if the snapshot was in the llFilenames list
already.

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (3 diffs)

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

@@ -763 +763 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    const Utf8Str &path = m->pMachine->mSSData->strStateFilePath;
-
-    if (path.isEmpty())
-        return false;
-
     std::list<const Snapshot *> llSnapshotsTodo;
     llSnapshotsTodo.push_back(this);
@@ -775 +770 @@
         const Snapshot *pSnapshot = llSnapshotsTodo.front();
         llSnapshotsTodo.pop_front();
-
-        if (!pSnapshotToIgnore || pSnapshotToIgnore != this)
+        const Utf8Str &path = pSnapshot->m->pMachine->mSSData->strStateFilePath;
+
+        if ((!pSnapshotToIgnore || pSnapshotToIgnore != this) && path.isNotEmpty())
             if (path == strPath)
                 return true;
@@ -998 +994 @@
                 std::list<Utf8Str>::const_iterator itFound = find(llFilenames.begin(), llFilenames.end(), strFile);
 
-                if (itFound != llFilenames.end())
+                if (itFound == llFilenames.end())
                     llFilenames.push_back(strFile);
             }