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

Timestamp:

Oct 21, 2019 8:33:26 AM (5 years ago)

Author:

vboxsync

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

134106

Message:

Main/MachineImplMoveVM: many cleanups including removal of unused code

File:

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

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

@@ -31 +31 @@
 
 /* This variable is global and used in the different places so it must be cleared each time before usage to avoid failure */
-std::vector< ComObjPtr<Machine> > machineList;
+std::vector<ComObjPtr<Machine> > machineList;
 
 typedef std::multimap<Utf8Str, Utf8Str> list_t;
@@ -40 +40 @@
 struct fileList_t
 {
-    HRESULT add(const Utf8Str& folder, const Utf8Str& file)
+    HRESULT add(const Utf8Str &folder, const Utf8Str &file)
     {
         HRESULT rc = S_OK;
@@ -47 +47 @@
     }
 
-    HRESULT add(const Utf8Str& fullPath)
+    HRESULT add(const Utf8Str &fullPath)
     {
         HRESULT rc = S_OK;
@@ -58 +58 @@
     }
 
-    HRESULT removeFileFromList(const Utf8Str& fullPath)
+    HRESULT removeFileFromList(const Utf8Str &fullPath)
     {
         HRESULT rc = S_OK;
@@ -81 +81 @@
     }
 
-    HRESULT removeFileFromList(const Utf8Str& path, const Utf8Str& fileName)
+    HRESULT removeFileFromList(const Utf8Str &path, const Utf8Str &fileName)
     {
         HRESULT rc = S_OK;
@@ -99 +99 @@
     }
 
-    HRESULT removeFolderFromList(const Utf8Str& path)
+    HRESULT removeFolderFromList(const Utf8Str &path)
     {
         HRESULT rc = S_OK;
@@ -106 +106 @@
     }
 
-    rangeRes_t getFilesInRange(const Utf8Str& path)
+    rangeRes_t getFilesInRange(const Utf8Str &path)
     {
         rangeRes_t res;
@@ -113 +113 @@
     }
 
-    std::list<Utf8Str> getFilesInList(const Utf8Str& path)
+    std::list<Utf8Str> getFilesInList(const Utf8Str &path)
     {
         std::list<Utf8Str> list_;
@@ -128 +128 @@
 
 
-#ifdef DEBUG
-void MachineMoveVM::ErrorInfoItem::logItem() const
-{
-    Log2(("(The error code is %Rrc): %s\n", m_code, m_description.c_str()));
-}
-#endif
-
 HRESULT MachineMoveVM::init()
 {
@@ -149 +142 @@
          *        for doing this.  We need this often and code like this doesn't
          *        need to be repeated and re-optimized in each instance... */
-        char* path = new char [len];
+        char *path = new char [len];
         RTStrCopy(path, len, m_targetPath.c_str());
         RTPathEnsureTrailingSeparator(path, len);
@@ -201 +194 @@
     vrc = RTDirClose(hDir); AssertRC(vrc);
 
-    Log2(("blocks: total %RTfoff, free %RTfoff ", cbTotal, cbFree));
+    Log2(("blocks: total %RTfoff, free %RTfoff\n", cbTotal, cbFree));
     Log2(("total space (Kb) %RTfoff (Mb) %RTfoff (Gb) %RTfoff\n", cbTotal/_1K, cbTotal/_1M, cbTotal/_1G));
     Log2(("total free space (Kb) %RTfoff (Mb) %RTfoff (Gb) %RTfoff\n", cbFree/_1K, cbFree/_1M, cbFree/_1G));
@@ -210 +203 @@
         return m_pMachine->setErrorVrc(vrc, "RTFsQueryProperties(%s): %Rrc", strTargetFolder.c_str(), vrc);
 
-    Log2(("disk properties:\n"
-          "remote: %RTbool\n"
-          "read only: %RTbool\n"
-          "compressed: %RTbool\n",
-          properties.fRemote,
-          properties.fReadOnly,
-          properties.fCompressed));
+    Log2(("disk properties: remote=%RTbool read only=%RTbool compressed=%RTbool\n",
+          properties.fRemote, properties.fReadOnly, properties.fCompressed));
 
     /* Get the original VM path */
@@ -493 +481 @@
     {
         hrc = m_pProgress->init(m_pMachine->i_getVirtualBox(),
-                                static_cast<IMachine*>(m_pMachine) /* aInitiator */,
+                                static_cast<IMachine *>(m_pMachine) /* aInitiator */,
                                 Utf8Str(m_pMachine->tr("Moving Machine")),
                                 true /* fCancellable */,
@@ -536 +524 @@
 DECLCALLBACK(int) MachineMoveVM::updateProgress(unsigned uPercent, void *pvUser)
 {
-    MachineMoveVM* pTask = *(MachineMoveVM**)pvUser;
+    MachineMoveVM *pTask = *(MachineMoveVM **)pvUser;
 
     if (    pTask
@@ -553 +541 @@
 DECLCALLBACK(int) MachineMoveVM::copyFileProgress(unsigned uPercentage, void *pvUser)
 {
-    ComObjPtr<Progress> pProgress = *static_cast< ComObjPtr<Progress>* >(pvUser);
+    ComObjPtr<Progress> pProgress = *static_cast<ComObjPtr<Progress> *>(pvUser);
 
     BOOL fCanceled = false;
@@ -568 +556 @@
 
 /* static */
-void MachineMoveVM::i_MoveVMThreadTask(MachineMoveVM* task)
+void MachineMoveVM::i_MoveVMThreadTask(MachineMoveVM *task)
 {
     LogFlowFuncEnter();
     HRESULT hrc = S_OK;
 
-    MachineMoveVM* taskMoveVM = task;
+    MachineMoveVM *taskMoveVM = task;
     ComObjPtr<Machine> &machine = taskMoveVM->m_pMachine;
 
@@ -637 +625 @@
     {
         /* Move all disks */
-        hrc = taskMoveVM->moveAllDisks(taskMoveVM->m_finalMediumsMap, &strTargetFolder);
+        hrc = taskMoveVM->moveAllDisks(taskMoveVM->m_finalMediumsMap, strTargetFolder);
         if (FAILED(hrc))
             throw hrc;
@@ -650 +638 @@
             /* When the current snapshot folder is absolute we reset it to the
              * default relative folder. */
-            if (RTPathStartsWithRoot((*machineConfFile).machineUserData.strSnapshotFolder.c_str()))
-                (*machineConfFile).machineUserData.strSnapshotFolder = "Snapshots";
-            (*machineConfFile).strStateFile = "";
+            if (RTPathStartsWithRoot(machineConfFile->machineUserData.strSnapshotFolder.c_str()))
+                machineConfFile->machineUserData.strSnapshotFolder = "Snapshots";
+            machineConfFile->strStateFile = "";
 
             /* The absolute name of the snapshot folder. */
             strTrgSnapshotFolder = Utf8StrFmt("%s%c%s", strTargetFolder.c_str(), RTPATH_DELIMITER,
-                                              (*machineConfFile).machineUserData.strSnapshotFolder.c_str());
+                                              machineConfFile->machineUserData.strSnapshotFolder.c_str());
 
             /* Check if a snapshot folder is necessary and if so doesn't already
@@ -709 +697 @@
             Log2(("Update state file path\n"));
             hrc = taskMoveVM->updatePathsToStateFiles(taskMoveVM->m_finalSaveStateFilesMap,
-                                                     taskMoveVM->m_vmFolders[VBox_SettingFolder],
-                                                     strTargetFolder);
+                                                      taskMoveVM->m_vmFolders[VBox_SettingFolder],
+                                                      strTargetFolder);
             if (FAILED(hrc))
                 throw hrc;
@@ -721 +709 @@
          */
         {
-            Log2(("Copy Machine settings file \n"));
+            Log2(("Copy Machine settings file\n"));
 
             hrc = taskMoveVM->m_pProgress->SetNextOperation(BstrFmt(machine->tr("Copy Machine settings file '%s' ..."),
-                                                                    (*machineConfFile).machineUserData.strName.c_str()).raw(),
+                                                                    machineConfFile->machineUserData.strName.c_str()).raw(),
                                                             1);
             if (FAILED(hrc))
@@ -803 +791 @@
                     taskMoveVM->getFilesList(taskMoveVM->m_vmFolders[VBox_LogFolder], filesList);
                     cit_t it = filesList.m_list.begin();
-                    while(it != filesList.m_list.end())
+                    while (it != filesList.m_list.end())
                     {
                         Utf8Str strFullSourceFilePath = it->first.c_str();
@@ -945 +933 @@
                 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()));
+                    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;
                 }
@@ -955 +943 @@
             if (FAILED(hrc))
             {
-                Log2(("Rollback scenario: can't delete new created files. Check the destination folder."));
+                Log2(("Rollback scenario: can't delete new created files. Check the destination folder.\n"));
                 throw hrc;
             }
@@ -963 +951 @@
             if (RT_FAILURE(vrc))
             {
-                Log2(("Rollback scenario: can't delete new destination folder."));
+                Log2(("Rollback scenario: can't delete new destination folder.\n"));
                 throw machine->setErrorVrc(vrc, "Rollback scenario: can't delete new destination folder.");
             }
@@ -974 +962 @@
                 if (FAILED(hrc))
                 {
-                    Log2(("Rollback scenario: can't save machine settings."));
+                    Log2(("Rollback scenario: can't save machine settings.\n"));
                     throw hrc;
                 }
@@ -1004 +992 @@
                 if (FAILED(hrc))
                 {
-                    Log2(("Rollback scenario: can't save global settings."));
+                    Log2(("Rollback scenario: can't save global settings.\n"));
                     throw hrc;
                 }
@@ -1051 +1039 @@
 }
 
-HRESULT MachineMoveVM::moveAllDisks(const std::map<Utf8Str, MEDIUMTASKMOVE>& listOfDisks,
-                                    const Utf8Str* strTargetFolder)
+HRESULT MachineMoveVM::moveAllDisks(const std::map<Utf8Str, MEDIUMTASKMOVE> &listOfDisks,
+                                    const Utf8Str &strTargetFolder)
 {
     HRESULT rc = S_OK;
@@ -1060 +1048 @@
     AutoWriteLock  machineLock(machine COMMA_LOCKVAL_SRC_POS);
 
-    try{
+    try
+    {
         std::map<Utf8Str, MEDIUMTASKMOVE>::const_iterator itMedium = listOfDisks.begin();
-        while(itMedium != listOfDisks.end())
+        while (itMedium != listOfDisks.end())
         {
             const MEDIUMTASKMOVE &mt = itMedium->second;
@@ -1073 +1062 @@
             if (FAILED(rc)) throw rc;
 
-            if (strTargetFolder != NULL && !strTargetFolder->isEmpty())
-            {
-                strTargetImageName = *strTargetFolder;
+            if (strTargetFolder.isNotEmpty())
+            {
+                strTargetImageName = strTargetFolder;
                 rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
                 if (FAILED(rc)) throw rc;
@@ -1143 +1132 @@
     catch(HRESULT hrc)
     {
-        Log2(("\nException during moving the disk %s\n", strLocation.c_str()));
+        Log2(("Exception during moving the disk %s\n", strLocation.c_str()));
         rc = hrc;
         machineLock.release();
@@ -1149 +1138 @@
     catch (...)
     {
-        Log2(("\nException during moving the disk %s\n", strLocation.c_str()));
+        Log2(("Exception during moving the disk %s\n", strLocation.c_str()));
         rc = VirtualBoxBase::handleUnexpectedExceptions(m_pMachine, RT_SRC_POS);
         machineLock.release();
@@ -1157 +1146 @@
 }
 
-HRESULT MachineMoveVM::updatePathsToStateFiles(const std::map<Utf8Str, SAVESTATETASKMOVE>& listOfFiles,
-                                               const Utf8Str& sourcePath, const Utf8Str& targetPath)
+HRESULT MachineMoveVM::updatePathsToStateFiles(const std::map<Utf8Str, SAVESTATETASKMOVE> &listOfFiles,
+                                               const Utf8Str &sourcePath, const Utf8Str &targetPath)
 {
     HRESULT rc = S_OK;
@@ -1197 +1186 @@
 }
 
-HRESULT MachineMoveVM::getFilesList(const Utf8Str& strRootFolder, fileList_t &filesList)
+HRESULT MachineMoveVM::getFilesList(const Utf8Str &strRootFolder, fileList_t &filesList)
 {
     RTDIR hDir;
@@ -1256 +1245 @@
 }
 
-HRESULT MachineMoveVM::deleteFiles(const RTCList<Utf8Str>& listOfFiles)
+HRESULT MachineMoveVM::deleteFiles(const RTCList<Utf8Str> &listOfFiles)
 {
     HRESULT hrc = S_OK;
@@ -1279 +1268 @@
 }
 
-HRESULT MachineMoveVM::getFolderSize(const Utf8Str& strRootFolder, uint64_t& size)
+HRESULT MachineMoveVM::getFolderSize(const Utf8Str &strRootFolder, uint64_t &size)
 {
     HRESULT hrc = S_OK;
@@ -1293 +1282 @@
         {
             cit_t it = filesList.m_list.begin();
-            while(it != filesList.m_list.end())
+            while (it != filesList.m_list.end())
             {
                 uint64_t cbFile = 0;
@@ -1334 +1323 @@
 
 HRESULT MachineMoveVM::createMachineList(const ComPtr<ISnapshot> &pSnapshot,
-                                         std::vector< ComObjPtr<Machine> > &aMachineList) const
+                                         std::vector<ComObjPtr<Machine> > &aMachineList) const
 {
     Bstr name;
@@ -1394 +1383 @@
             ComObjPtr<Medium> pObjMedium = (Medium *)(IMedium *)pMedium;
 
-            /*Check for "read-only" medium in terms that VBox can't create this one */
+            /* Check for "read-only" medium in terms that VBox can't create this one */
             rc = isMediumTypeSupportedForMoving(pMedium);
             if (FAILED(rc))
@@ -1452 +1441 @@
             m_llMedias.append(mtc);
         }
+
         /* Add the save state files of this machine if there is one. */
         rc = addSaveState(machine);
         if (FAILED(rc)) return rc;
-
-    }
+    }
+
     /* Build up the index list of the image chain. Unfortunately we can't do
      * that in the previous loop, cause there we go from child -> parent and
@@ -1541 +1531 @@
         return rc;
 
-    /*Check whether VBox is able to create this medium format or not, i.e. medium can be "read-only" */
+    /* Check whether VBox is able to create this medium format or not, i.e. medium can be "read-only" */
     Bstr bstrFormatName;
     rc = mediumFormat->COMGETTER(Name)(bstrFormatName.asOutParam());
@@ -1550 +1540 @@
     if (formatName.compare("VHDX", Utf8Str::CaseInsensitive) == 0)
     {
-        Log2(("Skipping medium %ls. VHDX format is supported in \"read-only\" mode only. \n", bstrLocation.raw()));
+        Log2(("Skipping medium %ls. VHDX format is supported in \"read-only\" mode only.\n", bstrLocation.raw()));
         return S_FALSE;
     }