Changeset 70823 in vbox

Timestamp:

Jan 31, 2018 11:35:09 AM (7 years ago)

Author:

vboxsync

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

120628

Message:

bugref:8345. removed changeset r120593 as useless for now. The function updateStateFilesXMLSettings() was reworked and renamed into updatePathsToStateFiles(). The code is more lighter now.

Location:

trunk/src/VBox/Main

Files:

• include/MachineImplMoveVM.h (modified) (1 diff)
• src-server/MachineImplMoveVM.cpp (modified) (13 diffs)

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

@@ -113 +113 @@
     void updateProgressStats(MEDIUMTASKCHAIN &mtc, ULONG &uCount, ULONG &uTotalWeight) const;
     HRESULT addSaveState(const ComObjPtr<Machine> &machine, ULONG &uCount, ULONG &uTotalWeight);
-    void updateStateFile(settings::MachineConfigFile *snl, const Guid &id, const Utf8Str &strFile);
-    void updateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile);
     void printStateFile(settings::SnapshotsList &snl);
     HRESULT getFilesList(const Utf8Str& strRootFolder, fileList_t &filesList);
     HRESULT getFolderSize(const Utf8Str& strRootFolder, uint64_t& size);
     HRESULT deleteFiles(const RTCList<Utf8Str>& listOfFiles);
-    HRESULT updateStateFilesXMLSettings(const std::map<Utf8Str, SAVESTATETASK>& listOfFiles, const Utf8Str& targetPath);
+    HRESULT updatePathsToStateFiles(const std::map<Utf8Str, SAVESTATETASK>& listOfFiles, 
+                                    const Utf8Str& sourcePath, const Utf8Str& targetPath);
     HRESULT moveAllDisks(const std::map<Utf8Str, MEDIUMTASK>& listOfDisks, const Utf8Str* strTargetFolder = NULL);
     HRESULT restoreAllDisks(const std::map<Utf8Str, MEDIUMTASK>& listOfDisks);

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

@@ -182 +182 @@
         m_pMachine->COMGETTER(LogFolder)(bstr_logFolder.asOutParam());
         strLogFolder = bstr_logFolder;
-        if (   m_type.equals("full")
+        if (   m_type.equals("basic")
             && strLogFolder.contains(strSettingsFilePath))
         {
@@ -198 +198 @@
             strStateFilePath = bstr_stateFilePath;
             strStateFilePath.stripFilename();
-            if (   m_type.equals("full")
+            if (   m_type.equals("basic")
                 && strStateFilePath.contains(strSettingsFilePath))
                 vmFolders.insert(std::make_pair(VBox_StateFolder, strStateFilePath));//Utf8Str(bstr_stateFilePath)));
@@ -207 +207 @@
         m_pMachine->COMGETTER(SnapshotFolder)(bstr_snapshotFolder.asOutParam());
         strSnapshotFolder = bstr_snapshotFolder;
-        if (   m_type.equals("full")
+        if (   m_type.equals("basic")
             && strSnapshotFolder.contains(strSettingsFilePath))
             vmFolders.insert(std::make_pair(VBox_SnapshotFolder, strSnapshotFolder));
@@ -230 +230 @@
         fileList_t actualFileList;
         Utf8Str strTargetImageName;
-
-//      if (m_pMachine->i_isSnapshotMachine())
-//          Guid snapshotId = m_pMachine->i_getSnapshotId();
 
         /* Global variable (defined at the beginning of file), so clear it before usage */
@@ -418 +415 @@
 
     return rc;
-}
-
-void MachineMoveVM::updateStateFile(settings::MachineConfigFile *snl, const Guid &id, const Utf8Str &strFile)
-{
-    settings::SnapshotsList::iterator it;
-    for (it = (*snl).llFirstSnapshot.begin(); it != (*snl).llFirstSnapshot.end(); ++it)
-    {
-        settings::Snapshot snap = (settings::Snapshot)(*it);
-        RTPrintf("it->uuid = %s , id = %s\n", snap.uuid.toStringCurly().c_str(), id.toStringCurly().c_str());
-        RTPrintf("it->strStateFile = %s , strFile = %s\n", it->strStateFile.c_str(), strFile.c_str());
-        if (it->uuid == id)
-        {
-            it->strStateFile = strFile;
-            RTPrintf("Modified it->strStateFile = %s\n", it->strStateFile.c_str());
-        }
-        else if (!it->llChildSnapshots.empty())
-            updateStateFile(it->llChildSnapshots, id, strFile);
-    }
-}
-
-void MachineMoveVM::updateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile)
-{
-    settings::SnapshotsList::iterator it;
-    for (it = snl.begin(); it != snl.end(); ++it)
-    {
-        if (it->uuid == id)
-        {
-            settings::Snapshot snap = (settings::Snapshot)(*it);
-            RTPrintf("it->uuid = %s , id = %s\n", snap.uuid.toStringCurly().c_str(), id.toStringCurly().c_str());
-            RTPrintf("it->strStateFile = %s , strFile = %s\n", snap.strStateFile.c_str(), strFile.c_str());
-            it->strStateFile = strFile;
-
-            RTPrintf("Modified it->strStateFile = %s\n", it->strStateFile.c_str());
-            m_pMachine->mSSData->strStateFilePath = strFile;
-            RTPrintf("Modified m_pMachine->mSSData->strStateFilePath = %s\n",
-                   m_pMachine->mSSData->strStateFilePath.c_str());
-        }
-        else if (!it->llChildSnapshots.empty())
-            updateStateFile(it->llChildSnapshots, id, strFile);
-    }
 }
 
@@ -630 +587 @@
         }
 
-        /* Update XML settings. */
-        rc = taskMoveVM->updateStateFilesXMLSettings(taskMoveVM->finalSaveStateFilesMap, strTrgSnapshotFolder);
+        /* Update state file path */
+        rc = taskMoveVM->updatePathsToStateFiles(taskMoveVM->finalSaveStateFilesMap,
+                                                 taskMoveVM->vmFolders[VBox_SettingFolder],
+                                                 strTargetFolder);
         if (FAILED(rc))
             throw rc;
@@ -755 +714 @@
             machineData->m_strConfigFileFull = strTargetSettingsFilePath;
             taskMoveVM->m_pMachine->mParent->i_copyPathRelativeToConfig(strTargetSettingsFilePath, machineData->m_strConfigFile);
-//          machineData->m_strConfigFile = strTargetSettingsFilePath;
+
             RTPrintf("\nmachineData->m_strConfigFileFull = %s\n", machineData->m_strConfigFileFull.c_str());
             RTPrintf("\nmachineData->m_strConfigFile = %s\n", machineData->m_strConfigFile.c_str());
@@ -796 +755 @@
         /* ! Apparently we should update the Progress object !*/
 
-        /* Restore the original XML settings. */
-        rc = taskMoveVM->updateStateFilesXMLSettings(taskMoveVM->finalSaveStateFilesMap,
-                                                     taskMoveVM->vmFolders[VBox_StateFolder]);
+        /* Restoring the original mediums */
+        try
+        {
+            rc = taskMoveVM->moveAllDisks(taskMoveVM->finalMediumsMap);
+            if (FAILED(rc))
+                throw rc;
+        }
+        catch(HRESULT hrc)
+        {
+            RTPrintf("\nFailed: HRESULT exception\n");
+            taskMoveVM->result = hrc;
+        }
+        catch (...)
+        {
+            RTPrintf("\nFailed: Unknown exception\n");
+            rc = VirtualBoxBase::handleUnexpectedExceptions(taskMoveVM->m_pMachine, RT_SRC_POS);
+            taskMoveVM->result = rc;
+        }
+
+        /* Revert original paths to the state files */
+        rc = taskMoveVM->updatePathsToStateFiles(taskMoveVM->finalSaveStateFilesMap,
+                                                 strTargetFolder,
+                                                 taskMoveVM->vmFolders[VBox_SettingFolder]);
         if (FAILED(rc))
             throw rc;
@@ -816 +795 @@
 
         RTDirRemove(strTargetFolder.c_str());
-
-        /* Restoring the original mediums */
-        try
-        {
-            rc = taskMoveVM->moveAllDisks(taskMoveVM->finalMediumsMap);
-            if (FAILED(rc))
-                throw rc;
-        }
-        catch(HRESULT hrc)
-        {
-            RTPrintf("\nFailed: HRESULT exception\n");
-            taskMoveVM->result = hrc;
-        }
-        catch (...)
-        {
-            RTPrintf("\nFailed: Unknown exception\n");
-            rc = VirtualBoxBase::handleUnexpectedExceptions(taskMoveVM->m_pMachine, RT_SRC_POS);
-            taskMoveVM->result = rc;
-        }
 
         /* save all VM data */
@@ -981 +941 @@
                 throw machine->setError(ProgressErrorInfo(moveDiskProgress));
 
-            /* Update saved state path machine->mSSData->strStateFilePath */
-            {
-                Utf8Str configDir, newConfigDir;
-                Utf8Str strStateFileName;
-                Utf8Str strTargetSettingsFilePath;
-                if (strTargetFolder != NULL && !strTargetFolder->isEmpty())
-                {
-                    /* normal logic.*/
-                    newConfigDir = *strTargetFolder;
-                    configDir = vmFolders[VBox_SettingFolder];
-                }
-                else
-                {
-                    /* for restoration logic */
-                    newConfigDir = vmFolders[VBox_SettingFolder];
-                    /* Can't use strTargetFolder in this case because strTargetFolder is NULL in this case */
-                    configDir = m_targetPath;
-                    com::Utf8Str mName;
-                    machine->getName(mName);
-                    configDir.append(mName);
-                }
-
-                /* create a full state file path */
-                if (RTPathStartsWith(machine->mSSData->strStateFilePath.c_str(), configDir.c_str()))
-                {
-                    strStateFileName = machine->mSSData->strStateFilePath.c_str() + configDir.length();
-                    machine->mSSData->strStateFilePath = newConfigDir + strStateFileName;
-                }
-
-                for (size_t i = 0; i < machineList.size(); ++i)
-                {
-                    const ComObjPtr<Machine> &aMachine = machineList.at(i);
-
-                    com::Guid guidMachine = aMachine->i_getSnapshotId();
-                    if (guidMachine != Guid::Empty)
-                    {
-                        Utf8Str strGuidMachine = guidMachine.toString();
-                        ComObjPtr<Snapshot> snapshotMachineObj;
-
-                        rc = machine->i_findSnapshotById(guidMachine, snapshotMachineObj, true);
-                        if (SUCCEEDED(rc) && !snapshotMachineObj.isNull())
-                        {
-                            snapshotMachineObj->i_updateSavedStatePaths(configDir.c_str(),
-                                                                        newConfigDir.c_str());
-                        }
-                    }
-                }
-            }
-
             ++itMedium;
         }
@@ -1051 +962 @@
 }
 
-HRESULT MachineMoveVM::updateStateFilesXMLSettings(const std::map<Utf8Str, SAVESTATETASK>& listOfFiles,
-                                                    const Utf8Str& targetPath)
+HRESULT MachineMoveVM::updatePathsToStateFiles(const std::map<Utf8Str, SAVESTATETASK>& listOfFiles,
+                                               const Utf8Str& sourcePath, const Utf8Str& targetPath)
 {
     HRESULT rc = S_OK;
-    Machine::Data *machineData = m_pMachine->mData.data();
-    settings::MachineConfigFile *machineConfFile = machineData->pMachineConfigFile;
 
     std::map<Utf8Str, SAVESTATETASK>::const_iterator itState = listOfFiles.begin();
@@ -1066 +975 @@
                                                            RTPathFilename(sst.strSaveStateFile.c_str()));
 
-        /* Update the path in the configuration either for the current
-         * machine state or the snapshots. */
-        if (!sst.snapshotUuid.isValid() || sst.snapshotUuid.isZero())
-        {
-            (*machineConfFile).strStateFile = strTargetSaveStateFilePath;
-        }
-        else
-        {
-            updateStateFile(m_pMachine->mData->pMachineConfigFile->llFirstSnapshot,
-                            sst.snapshotUuid, strTargetSaveStateFilePath);
+        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());
         }
 
@@ -1183 +1090 @@
             ++it;
         }
-//      RTPrintf("Total folder %s size %llu\n", strRootFolder.c_str(), totalFolderSize);
+
         size = totalFolderSize;
     }