Changeset 98289 in vbox for trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp

Timestamp:

Jan 24, 2023 4:02:15 PM (23 months ago)

Author:

vboxsync

Message:

Main/src-server: rc -> hrc/vrc (partial). bugref:10223

File:

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

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

@@ -50 +50 @@
     HRESULT add(const Utf8Str &folder, const Utf8Str &file)
     {
-        HRESULT rc = S_OK;
         m_list.insert(std::make_pair(folder, file));
-        return rc;
+        return S_OK;
     }
 
     HRESULT add(const Utf8Str &fullPath)
     {
-        HRESULT rc = S_OK;
         Utf8Str folder = fullPath;
         folder.stripFilename();
@@ -63 +61 @@
         filename.stripPath();
         m_list.insert(std::make_pair(folder, filename));
-        return rc;
+        return S_OK;
     }
 
     HRESULT removeFileFromList(const Utf8Str &fullPath)
     {
-        HRESULT rc = S_OK;
         Utf8Str folder = fullPath;
         folder.stripFilename();
@@ -86 +83 @@
         }
 
-        return rc;
+        return S_OK;
     }
 
     HRESULT removeFileFromList(const Utf8Str &path, const Utf8Str &fileName)
     {
-        HRESULT rc = S_OK;
         rangeRes_t res = m_list.equal_range(path);
         for (it_t it=res.first; it!=res.second;)
@@ -104 +100 @@
                 ++it;
         }
-        return rc;
+        return S_OK;
     }
 
     HRESULT removeFolderFromList(const Utf8Str &path)
     {
-        HRESULT rc = S_OK;
         m_list.erase(path);
-        return rc;
+        return S_OK;
     }
 
@@ -590 +585 @@
 
     BOOL fCanceled = false;
-    HRESULT rc = pProgress->COMGETTER(Canceled)(&fCanceled);
-    if (FAILED(rc)) return VERR_GENERAL_FAILURE;
+    HRESULT hrc = pProgress->COMGETTER(Canceled)(&fCanceled);
+    if (FAILED(hrc)) return VERR_GENERAL_FAILURE;
     /* If canceled by the user tell it to the copy operation. */
     if (fCanceled) return VERR_CANCELLED;
     /* Set the new process. */
-    rc = pProgress->SetCurrentOperationProgress(uPercentage);
-    if (FAILED(rc)) return VERR_GENERAL_FAILURE;
+    hrc = pProgress->SetCurrentOperationProgress(uPercentage);
+    if (FAILED(hrc)) return VERR_GENERAL_FAILURE;
 
     return VINF_SUCCESS;
@@ -1141 +1136 @@
                                     const Utf8Str &strTargetFolder)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     ComObjPtr<Machine> &machine = m_pMachine;
     Utf8Str strLocation;
@@ -1158 +1153 @@
             Bstr bstrSrcName;
 
-            rc = pMedium->COMGETTER(Name)(bstrSrcName.asOutParam());
-            if (FAILED(rc)) throw rc;
+            hrc = pMedium->COMGETTER(Name)(bstrSrcName.asOutParam());
+            if (FAILED(hrc)) throw hrc;
 
             if (strTargetFolder.isNotEmpty())
             {
                 strTargetImageName = strTargetFolder;
-                rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
-                if (FAILED(rc)) throw rc;
+                hrc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+                if (FAILED(hrc)) throw hrc;
                 strLocation = bstrLocation;
 
@@ -1174 +1169 @@
 
                 strTargetImageName.append(RTPATH_DELIMITER).append(strLocation);
-                rc = m_pProgress->SetNextOperation(BstrFmt(tr("Moving medium '%ls' ..."),
-                                                           bstrSrcName.raw()).raw(),
-                                                   mt.uWeight);
-                if (FAILED(rc)) throw rc;
+                hrc = m_pProgress->SetNextOperation(BstrFmt(tr("Moving medium '%ls' ..."), bstrSrcName.raw()).raw(), mt.uWeight);
+                if (FAILED(hrc)) throw hrc;
             }
             else
             {
                 strTargetImageName = mt.strBaseName;//Should contain full path to the image
-                rc = m_pProgress->SetNextOperation(BstrFmt(tr("Moving medium '%ls' back..."),
-                                                           bstrSrcName.raw()).raw(),
-                                                   mt.uWeight);
-                if (FAILED(rc)) throw rc;
+                hrc = m_pProgress->SetNextOperation(BstrFmt(tr("Moving medium '%ls' back..."), bstrSrcName.raw()).raw(), mt.uWeight);
+                if (FAILED(hrc)) throw hrc;
             }
 
@@ -1196 +1187 @@
 
             MediumType_T mediumType;//immutable, shared, passthrough
-            rc = pMedium->COMGETTER(Type)(&mediumType);
-            if (FAILED(rc)) throw rc;
+            hrc = pMedium->COMGETTER(Type)(&mediumType);
+            if (FAILED(hrc)) throw hrc;
 
             DeviceType_T deviceType;//floppy, hard, DVD
-            rc = pMedium->COMGETTER(DeviceType)(&deviceType);
-            if (FAILED(rc)) throw rc;
+            hrc = pMedium->COMGETTER(DeviceType)(&deviceType);
+            if (FAILED(hrc)) throw hrc;
 
             /* Drop lock early because IMedium::MoveTo needs to get the VirtualBox one. */
@@ -1207 +1198 @@
 
             ComPtr<IProgress> moveDiskProgress;
-            rc = pMedium->MoveTo(bstrLocation.raw(), moveDiskProgress.asOutParam());
-            if (SUCCEEDED(rc))
+            hrc = pMedium->MoveTo(bstrLocation.raw(), moveDiskProgress.asOutParam());
+            if (SUCCEEDED(hrc))
             {
                 /* In case of failure moveDiskProgress would be in the invalid state or not initialized at all
@@ -1214 +1205 @@
                  */
                 /* Wait until the other process has finished. */
-                rc = m_pProgress->WaitForOtherProgressCompletion(moveDiskProgress, 0 /* indefinite wait */);
+                hrc = m_pProgress->WaitForOtherProgressCompletion(moveDiskProgress, 0 /* indefinite wait */);
             }
 
@@ -1220 +1211 @@
             machineLock.acquire();
 
-            if (FAILED(rc)) throw rc;
+            if (FAILED(hrc)) throw hrc;
 
             Log2(("Moving %s has been finished\n", strTargetImageName.c_str()));
@@ -1229 +1220 @@
         machineLock.release();
     }
-    catch(HRESULT hrc)
+    catch (HRESULT hrcXcpt)
+    {
+        Log2(("Exception during moving the disk %s: %Rhrc\n", strLocation.c_str(), hrcXcpt));
+        hrc = hrcXcpt;
+        machineLock.release();
+    }
+    catch (...)
     {
         Log2(("Exception during moving the disk %s\n", strLocation.c_str()));
-        rc = hrc;
+        hrc = VirtualBoxBase::handleUnexpectedExceptions(m_pMachine, RT_SRC_POS);
         machineLock.release();
     }
-    catch (...)
-    {
-        Log2(("Exception during moving the disk %s\n", strLocation.c_str()));
-        rc = VirtualBoxBase::handleUnexpectedExceptions(m_pMachine, RT_SRC_POS);
-        machineLock.release();
-    }
-
-    return rc;
+
+    return hrc;
 }
 
@@ -1248 +1239 @@
 {
     ComObjPtr<Snapshot> pSnapshot;
-    HRESULT rc = m_pMachine->i_findSnapshotById(Guid() /* zero */, pSnapshot, true);
-    if (SUCCEEDED(rc) && !pSnapshot.isNull())
+    HRESULT hrc = m_pMachine->i_findSnapshotById(Guid() /* zero */, pSnapshot, true);
+    if (SUCCEEDED(hrc) && !pSnapshot.isNull())
         pSnapshot->i_updateSavedStatePaths(sourcePath.c_str(),
                                            targetPath.c_str());
@@ -1269 +1260 @@
 {
     ComObjPtr<Snapshot> pSnapshot;
-    HRESULT rc = m_pMachine->i_findSnapshotById(Guid() /* zero */, pSnapshot, true);
-    if (SUCCEEDED(rc) && !pSnapshot.isNull())
+    HRESULT hrc = m_pMachine->i_findSnapshotById(Guid() /* zero */, pSnapshot, true);
+    if (SUCCEEDED(hrc) && !pSnapshot.isNull())
         pSnapshot->i_updateNVRAMPaths(sourcePath.c_str(),
                                       targetPath.c_str());
@@ -1413 +1404 @@
 {
     ComPtr<IMedium> pBaseMedium;
-    HRESULT rc = pMedium->COMGETTER(Base)(pBaseMedium.asOutParam());
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = pMedium->COMGETTER(Base)(pBaseMedium.asOutParam());
+    if (FAILED(hrc)) return hrc;
     Bstr bstrBaseName;
-    rc = pBaseMedium->COMGETTER(Name)(bstrBaseName.asOutParam());
-    if (FAILED(rc)) return rc;
+    hrc = pBaseMedium->COMGETTER(Name)(bstrBaseName.asOutParam());
+    if (FAILED(hrc)) return hrc;
     strBaseName = bstrBaseName;
-    return rc;
+    return hrc;
 }
 
@@ -1425 +1416 @@
 {
     Bstr name;
-    HRESULT rc = pSnapshot->COMGETTER(Name)(name.asOutParam());
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = pSnapshot->COMGETTER(Name)(name.asOutParam());
+    if (FAILED(hrc)) return hrc;
 
     ComPtr<IMachine> l_pMachine;
-    rc = pSnapshot->COMGETTER(Machine)(l_pMachine.asOutParam());
-    if (FAILED(rc)) return rc;
+    hrc = pSnapshot->COMGETTER(Machine)(l_pMachine.asOutParam());
+    if (FAILED(hrc)) return hrc;
     machineList.push_back((Machine*)(IMachine*)l_pMachine);
 
     SafeIfaceArray<ISnapshot> sfaChilds;
-    rc = pSnapshot->COMGETTER(Children)(ComSafeArrayAsOutParam(sfaChilds));
-    if (FAILED(rc)) return rc;
+    hrc = pSnapshot->COMGETTER(Children)(ComSafeArrayAsOutParam(sfaChilds));
+    if (FAILED(hrc)) return hrc;
     for (size_t i = 0; i < sfaChilds.size(); ++i)
     {
-        rc = createMachineList(sfaChilds[i]);
-        if (FAILED(rc)) return rc;
-    }
-
-    return rc;
+        hrc = createMachineList(sfaChilds[i]);
+        if (FAILED(hrc)) return hrc;
+    }
+
+    return hrc;
 }
 
@@ -1450 +1441 @@
      * adding all directly and indirectly attached disk images to the worker
      * list. */
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     for (size_t i = 0; i < machineList.size(); ++i)
     {
@@ -1458 +1449 @@
          * machines to a worker list. */
         SafeIfaceArray<IMediumAttachment> sfaAttachments;
-        rc = machine->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(sfaAttachments));
-        if (FAILED(rc)) return rc;
+        hrc = machine->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(sfaAttachments));
+        if (FAILED(hrc)) return hrc;
         for (size_t a = 0; a < sfaAttachments.size(); ++a)
         {
             const ComPtr<IMediumAttachment> &pAtt = sfaAttachments[a];
             DeviceType_T deviceType;//floppy, hard, DVD
-            rc = pAtt->COMGETTER(Type)(&deviceType);
-            if (FAILED(rc)) return rc;
+            hrc = pAtt->COMGETTER(Type)(&deviceType);
+            if (FAILED(hrc)) return hrc;
 
             /* Valid medium attached? */
             ComPtr<IMedium> pMedium;
-            rc = pAtt->COMGETTER(Medium)(pMedium.asOutParam());
-            if (FAILED(rc)) return rc;
+            hrc = pAtt->COMGETTER(Medium)(pMedium.asOutParam());
+            if (FAILED(hrc)) return hrc;
 
             if (pMedium.isNull())
@@ -1476 +1467 @@
 
             Bstr bstrLocation;
-            rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
-            if (FAILED(rc)) return rc;
+            hrc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+            if (FAILED(hrc)) return hrc;
 
             /* Cast to ComObjPtr<Medium> */
@@ -1483 +1474 @@
 
             /* Check for "read-only" medium in terms that VBox can't create this one */
-            rc = isMediumTypeSupportedForMoving(pMedium);
-            if (FAILED(rc))
-            {
-                if (rc == S_FALSE)
-                {
-                    Log2(("Skipping file %ls because of this medium type hasn't been supported for moving.\n",
-                          bstrLocation.raw()));
-                    continue;
-                }
-                else
-                    return rc;
+            hrc = isMediumTypeSupportedForMoving(pMedium);
+            if (FAILED(hrc))
+            {
+                if (hrc != S_FALSE)
+                    return hrc;
+                Log2(("Skipping file %ls because of this medium type hasn't been supported for moving.\n", bstrLocation.raw()));
+                continue;
             }
 
@@ -1505 +1492 @@
                 /* Refresh the state so that the file size get read. */
                 MediumState_T e;
-                rc = pMedium->RefreshState(&e);
-                if (FAILED(rc)) return rc;
+                hrc = pMedium->RefreshState(&e);
+                if (FAILED(hrc)) return hrc;
 
                 LONG64 lSize;
-                rc = pMedium->COMGETTER(Size)(&lSize);
-                if (FAILED(rc)) return rc;
+                hrc = pMedium->COMGETTER(Size)(&lSize);
+                if (FAILED(hrc)) return hrc;
 
                 MediumType_T mediumType;//immutable, shared, passthrough
-                rc = pMedium->COMGETTER(Type)(&mediumType);
-                if (FAILED(rc)) return rc;
-
-                rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
-                if (FAILED(rc)) return rc;
+                hrc = pMedium->COMGETTER(Type)(&mediumType);
+                if (FAILED(hrc)) return hrc;
+
+                hrc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+                if (FAILED(hrc)) return hrc;
 
                 MEDIUMTASKMOVE mt;// = {false, "basename", NULL, 0, 0};
@@ -1534 +1521 @@
 
                 /* Query next parent. */
-                rc = pMedium->COMGETTER(Parent)(pMedium.asOutParam());
-                if (FAILED(rc)) return rc;
+                hrc = pMedium->COMGETTER(Parent)(pMedium.asOutParam());
+                if (FAILED(hrc)) return hrc;
             }
 
@@ -1542 +1529 @@
 
         /* Add the save state files of this machine if there is one. */
-        rc = addSaveState(machine);
-        if (FAILED(rc)) return rc;
+        hrc = addSaveState(machine);
+        if (FAILED(hrc)) return hrc;
 
         /* Add the NVRAM files of this machine if there is one. */
-        rc = addNVRAM(machine);
-        if (FAILED(rc)) return rc;
+        hrc = addNVRAM(machine);
+        if (FAILED(hrc)) return hrc;
     }
 
@@ -1561 +1548 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -1567 +1554 @@
 {
     Bstr bstrSrcSaveStatePath;
-    HRESULT rc = machine->COMGETTER(StateFilePath)(bstrSrcSaveStatePath.asOutParam());
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = machine->COMGETTER(StateFilePath)(bstrSrcSaveStatePath.asOutParam());
+    if (FAILED(hrc)) return hrc;
     if (!bstrSrcSaveStatePath.isEmpty())
     {
@@ -1595 +1582 @@
 {
     ComPtr<INvramStore> pNvramStore;
-    HRESULT rc = machine->COMGETTER(NonVolatileStore)(pNvramStore.asOutParam());
-    if (FAILED(rc)) return rc;
+    HRESULT hrc = machine->COMGETTER(NonVolatileStore)(pNvramStore.asOutParam());
+    if (FAILED(hrc)) return hrc;
     Bstr bstrSrcNVRAMPath;
-    rc = pNvramStore->COMGETTER(NonVolatileStorageFile)(bstrSrcNVRAMPath.asOutParam());
-    if (FAILED(rc)) return rc;
+    hrc = pNvramStore->COMGETTER(NonVolatileStorageFile)(bstrSrcNVRAMPath.asOutParam());
+    if (FAILED(hrc)) return hrc;
     Utf8Str strSrcNVRAMPath(bstrSrcNVRAMPath);
     if (!strSrcNVRAMPath.isEmpty() && RTFileExists(strSrcNVRAMPath.c_str()))
@@ -1652 +1639 @@
 {
     Bstr bstrLocation;
-    HRESULT rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
-    if (FAILED(rc))
-        return rc;
+    HRESULT hrc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+    if (FAILED(hrc))
+        return hrc;
 
     DeviceType_T deviceType;
-    rc = pMedium->COMGETTER(DeviceType)(&deviceType);
-    if (FAILED(rc))
-        return rc;
+    hrc = pMedium->COMGETTER(DeviceType)(&deviceType);
+    if (FAILED(hrc))
+        return hrc;
 
     ComPtr<IMediumFormat> mediumFormat;
-    rc = pMedium->COMGETTER(MediumFormat)(mediumFormat.asOutParam());
-    if (FAILED(rc))
-        return rc;
+    hrc = pMedium->COMGETTER(MediumFormat)(mediumFormat.asOutParam());
+    if (FAILED(hrc))
+        return hrc;
 
     /* 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());
-    if (FAILED(rc))
-        return rc;
+    hrc = mediumFormat->COMGETTER(Name)(bstrFormatName.asOutParam());
+    if (FAILED(hrc))
+        return hrc;
 
     Utf8Str formatName = Utf8Str(bstrFormatName);