Changeset 81415 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Oct 21, 2019 3:06:34 PM (5 years ago)

Author:

vboxsync

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

134129

Message:

Main/MachineImplMoveVM: simplify updatePathsToStateFiles (which is still very wrong, because it uses a method which is used for renaming VMs), because it used the method to update the snapshots too often (for each snapshot, when one call updates them all)

File:

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

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

@@ -687 +687 @@
          * Update state file path
          * very important step!
-         * Not obvious how to do it correctly.
          */
-        {
-            Log2(("Update state file path\n"));
-            hrc = taskMoveVM->updatePathsToStateFiles(taskMoveVM->m_finalSaveStateFilesMap,
-                                                      taskMoveVM->m_vmFolders[VBox_SettingFolder],
-                                                      strTargetFolder);
-            if (FAILED(hrc))
-                throw hrc;
-        }
+        Log2(("Update state file path\n"));
+        /** @todo r=klaus: this update is not necessarily matching what the
+         * above code has set as the new folders, so it needs reimplementing */
+        taskMoveVM->updatePathsToStateFiles(taskMoveVM->m_vmFolders[VBox_SettingFolder],
+                                            strTargetFolder);
 
         /*
@@ -922 +918 @@
 
             /* Revert original paths to the state files */
-            {
-                hrc = taskMoveVM->updatePathsToStateFiles(taskMoveVM->m_finalSaveStateFilesMap,
-                                                          strTargetFolder,
-                                                          taskMoveVM->m_vmFolders[VBox_SettingFolder]);
-                if (FAILED(hrc))
-                {
-                    Log2(("Rollback scenario: can't restore the original paths to the state files. Machine settings %s can be corrupted.\n",
-                          machineData->m_strConfigFileFull.c_str()));
-                    throw hrc;
-                }
-            }
+            taskMoveVM->updatePathsToStateFiles(strTargetFolder,
+                                                taskMoveVM->m_vmFolders[VBox_SettingFolder]);
 
             /* Delete all created files. Here we update progress object */
@@ -1141 +1128 @@
 }
 
-HRESULT MachineMoveVM::updatePathsToStateFiles(const std::map<Utf8Str, SAVESTATETASKMOVE> &listOfFiles,
-                                               const Utf8Str &sourcePath, const Utf8Str &targetPath)
-{
-    HRESULT rc = S_OK;
-
-    std::map<Utf8Str, SAVESTATETASKMOVE>::const_iterator itState = listOfFiles.begin();
-    while (itState != listOfFiles.end())
-    {
-        const SAVESTATETASKMOVE &sst = itState->second;
-
-        if (sst.snapshotUuid != Guid::Empty)
-        {
-            Utf8Str strGuidMachine = sst.snapshotUuid.toString();
-            ComObjPtr<Snapshot> snapshotMachineObj;
-
-            rc = m_pMachine->i_findSnapshotById(sst.snapshotUuid, snapshotMachineObj, true);
-            if (SUCCEEDED(rc) && !snapshotMachineObj.isNull())
-                snapshotMachineObj->i_updateSavedStatePaths(sourcePath.c_str(),
-                                                            targetPath.c_str());
-
-        }
-        else
-        {
-            const Utf8Str &path = m_pMachine->mSSData->strStateFilePath;
-            /*
-             * This check for the case when a new value is equal to the old one.
-             * Maybe the more clever check is needed in the some corner cases.
-             */
-            if (!RTPathStartsWith(path.c_str(), targetPath.c_str()))
-                m_pMachine->mSSData->strStateFilePath = Utf8StrFmt("%s%s",
-                                                                   targetPath.c_str(),
-                                                                   path.c_str() + sourcePath.length());
-        }
-
-        ++itState;
-    }
-
-    return rc;
+void MachineMoveVM::updatePathsToStateFiles(const Utf8Str &sourcePath, const Utf8Str &targetPath)
+{
+    ComObjPtr<Snapshot> pSnapshot;
+    HRESULT rc = m_pMachine->i_findSnapshotById(Guid() /* zero */, pSnapshot, true);
+    if (SUCCEEDED(rc) && !pSnapshot.isNull())
+        pSnapshot->i_updateSavedStatePaths(sourcePath.c_str(),
+                                           targetPath.c_str());
+    if (RTPathStartsWith(m_pMachine->mSSData->strStateFilePath.c_str(), sourcePath.c_str()))
+        m_pMachine->mSSData->strStateFilePath = Utf8StrFmt("%s%s",
+                                                           targetPath.c_str(),
+                                                           m_pMachine->mSSData->strStateFilePath.c_str() + sourcePath.length());
+    else
+        m_pMachine->mSSData->strStateFilePath = Utf8StrFmt("%s%c%s",
+                                                           targetPath.c_str(),
+                                                           RTPATH_DELIMITER,
+                                                           RTPathFilename(m_pMachine->mSSData->strStateFilePath.c_str()));
 }