Changeset 70674 in vbox

Timestamp:

Jan 22, 2018 12:00:30 PM (7 years ago)

Author:

vboxsync

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

120410

Message:

bugref:8345. Added a Progress object for rollback action. is it correct or not? I am not sure.

File:

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

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

@@ -375 +375 @@
         }
 
-        /** weak VirtualBox parent */
-        VirtualBox* const pVirtualBox = NULL;
-        unconst(pVirtualBox) = m_pMachine->i_getVirtualBox();
-        rc = m_pProgress->init(pVirtualBox,
-                             static_cast<IMachine*>(m_pMachine) /* aInitiator */,
-                             Bstr(m_pMachine->tr("Moving Machine")).raw(),
-                             true /* fCancellable */,
-                             uCount,
-                             uTotalWeight,
-                             Bstr(m_pMachine->tr("Initialize Moving")).raw(),
-                             1);
-        if (FAILED(rc))
-        {
-            throw m_pMachine->setError(VBOX_E_IPRT_ERROR,
-                                 m_pMachine->tr("Couldn't correctly setup the progress object for moving VM operation (%Rrc)"),
-                                 rc);
+        /* Init both Progress instances */
+        {
+            /** weak VirtualBox parent */
+            VirtualBox* const pVirtualBox = NULL;
+            unconst(pVirtualBox) = m_pMachine->i_getVirtualBox();
+            rc = m_pProgress->init(pVirtualBox,
+                                 static_cast<IMachine*>(m_pMachine) /* aInitiator */,
+                                 Bstr(m_pMachine->tr("Moving Machine")).raw(),
+                                 true /* fCancellable */,
+                                 uCount,
+                                 uTotalWeight,
+                                 Bstr(m_pMachine->tr("Initialize Moving")).raw(),
+                                 1);
+            if (FAILED(rc))
+            {
+                throw m_pMachine->setError(VBOX_E_IPRT_ERROR,
+                                     m_pMachine->tr("Couldn't correctly setup the progress object "
+                                                    "for moving VM operation (%Rrc)"),
+                                     rc);
+            }
+
+            m_pRollBackProgress.createObject();
+            rc = m_pRollBackProgress->init(pVirtualBox,
+                                 static_cast<IMachine*>(m_pMachine) /* aInitiator */,
+                                 Bstr(m_pMachine->tr("Moving back Machine")).raw(),
+                                 true /* fCancellable */,
+                                 uCount,
+                                 uTotalWeight,
+                                 Bstr(m_pMachine->tr("Initialize Moving back")).raw(),
+                                 1);
+            if (FAILED(rc))
+            {
+                throw m_pMachine->setError(VBOX_E_IPRT_ERROR,
+                                     m_pMachine->tr("Couldn't correctly setup the progress object "
+                                                    "for possible rollback operation during moving VM (%Rrc)"),
+                                     rc);
+            }
         }
 
@@ -511 +532 @@
 
     AutoCaller autoCaller(machine);
-    if (FAILED(autoCaller.rc())) return;//Should we return something here?
+//  if (FAILED(autoCaller.rc())) return;//Should we return something here?
 
     Utf8Str strTargetFolder = taskMoveVM->m_targetPath;
@@ -852 +873 @@
             Bstr bstrSrcName;
 
+            rc = pMedium->COMGETTER(Name)(bstrSrcName.asOutParam());
+            if (FAILED(rc)) throw rc;
+
             if (strTargetFolder != NULL && !strTargetFolder->isEmpty())
             {
@@ -869 +893 @@
 
                 strTargetImageName.append(RTPATH_DELIMITER).append(strLocation);
-            }
-            else
-            {
-                strTargetImageName = mt.strBaseName;//Should contain full path to the image
-            }
-
-            rc = pMedium->COMGETTER(Name)(bstrSrcName.asOutParam());
-            if (FAILED(rc)) throw rc;
-
-            rc = m_pProgress->SetNextOperation(BstrFmt(machine->tr("Moving Disk '%ls' ..."),
+                rc = m_pProgress->SetNextOperation(BstrFmt(machine->tr("Moving Disk '%ls' ..."),
                                                        bstrSrcName.raw()).raw(),
                                                        mt.uWeight);
-            if (FAILED(rc)) throw rc;
+                if (FAILED(rc)) throw rc;
+            }
+            else
+            {
+                strTargetImageName = mt.strBaseName;//Should contain full path to the image
+                rc = m_pRollBackProgress->SetNextOperation(BstrFmt(machine->tr("Moving back Disk '%ls' ..."),
+                                                       bstrSrcName.raw()).raw(),
+                                                       mt.uWeight);
+                if (FAILED(rc)) throw rc;
+            }
+
+
 
             /* consistency: use \ if appropriate on the platform */
@@ -893 +919 @@
             /* Wait until the async process has finished. */
             machineLock.release();
-            rc = m_pProgress->WaitForAsyncProgressCompletion(moveDiskProgress);
+            if (strTargetFolder != NULL && !strTargetFolder->isEmpty())
+            {
+                rc = m_pProgress->WaitForAsyncProgressCompletion(moveDiskProgress);
+            }
+            else
+            {
+                rc = m_pRollBackProgress->WaitForAsyncProgressCompletion(moveDiskProgress);
+            }
+
             machineLock.acquire();
             if (FAILED(rc)) throw rc;