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

Timestamp:

Feb 6, 2018 6:25:47 AM (7 years ago)

Author:

vboxsync

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

120703

Message:

bugref:8345. Added the checks for floppy images and for DVD disks. Other small improvements.

File:

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

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

@@ -912 +912 @@
             RTPrintf("\nTarget disk %s \n", strTargetImageName.c_str());
 
-            ComPtr<IProgress> moveDiskProgress;
             bstrLocation = strTargetImageName.c_str();
-            rc = pMedium->SetLocation(bstrLocation.raw(), moveDiskProgress.asOutParam());
-
-            /* Wait until the async process has finished. */
-            machineLock.release();
-            if (strTargetFolder != NULL && !strTargetFolder->isEmpty())
-            {
-                rc = m_pProgress->WaitForAsyncProgressCompletion(moveDiskProgress);
+
+            MediumType_T mediumType;//immutable, shared, passthrough
+            rc = pMedium->COMGETTER(Type)(&mediumType);
+            if (FAILED(rc)) throw rc;
+
+            DeviceType_T deviceType;//floppy, hard, DVD
+            rc = pMedium->COMGETTER(DeviceType)(&deviceType);
+            if (FAILED(rc)) throw rc;
+
+            if (deviceType == DeviceType_Floppy)
+            {
+                //1. no host drive image
+                BOOL fHostDrive = false;
+                rc = pMedium->COMGETTER(HostDrive)(&fHostDrive);
+                if (FAILED(rc)) throw rc;
             }
             else
             {
-                rc = m_pRollBackProgress->WaitForAsyncProgressCompletion(moveDiskProgress);
-            }
-
-            machineLock.acquire();
-            if (FAILED(rc)) throw rc;
-
-            RTPrintf("\nMoving %s has finished\n", strTargetImageName.c_str());
-
-            /* Check the result of the async process. */
-            LONG iRc;
-            rc = moveDiskProgress->COMGETTER(ResultCode)(&iRc);
-            if (FAILED(rc)) throw rc;
-            /* If the thread of the progress object has an error, then
-             * retrieve the error info from there, or it'll be lost. */
-            if (FAILED(iRc))
-                throw machine->setError(ProgressErrorInfo(moveDiskProgress));
+                ComPtr<IProgress> moveDiskProgress;
+                rc = pMedium->SetLocation(bstrLocation.raw(), moveDiskProgress.asOutParam());
+                /* Wait until the async process has finished. */
+                machineLock.release();
+                if (strTargetFolder != NULL && !strTargetFolder->isEmpty())
+                {
+                    rc = m_pProgress->WaitForAsyncProgressCompletion(moveDiskProgress);
+                }
+                else
+                {
+                    rc = m_pRollBackProgress->WaitForAsyncProgressCompletion(moveDiskProgress);
+                }
+
+                machineLock.acquire();
+                if (FAILED(rc)) throw rc;
+
+                RTPrintf("\nMoving %s has finished\n", strTargetImageName.c_str());
+
+                /* Check the result of the async process. */
+                LONG iRc;
+                rc = moveDiskProgress->COMGETTER(ResultCode)(&iRc);
+                if (FAILED(rc)) throw rc;
+                /* If the thread of the progress object has an error, then
+                 * retrieve the error info from there, or it'll be lost. */
+                if (FAILED(iRc))
+                    throw machine->setError(ProgressErrorInfo(moveDiskProgress));
+            }
 
             ++itMedium;
@@ -1153 +1171 @@
         {
             const ComPtr<IMediumAttachment> &pAtt = sfaAttachments[a];
-            DeviceType_T type;
-            rc = pAtt->COMGETTER(Type)(&type);
+            DeviceType_T deviceType;//floppy, hard, DVD
+            rc = pAtt->COMGETTER(Type)(&deviceType);
             if (FAILED(rc)) return rc;
 
-            /* Only harddisks and floppies are of interest. */
-            if (   type != DeviceType_HardDisk
-                && type != DeviceType_Floppy)
+            /* Valid medium attached? */
+            ComPtr<IMedium> pMedium;
+            rc = pAtt->COMGETTER(Medium)(pMedium.asOutParam());
+            if (FAILED(rc)) return rc;
+
+            if (pMedium.isNull())
                 continue;
 
-            /* Valid medium attached? */
-            ComPtr<IMedium> pSrcMedium;
-            rc = pAtt->COMGETTER(Medium)(pSrcMedium.asOutParam());
-            if (FAILED(rc)) return rc;
-
-            if (pSrcMedium.isNull())
-                continue;
+            Bstr bstrLocation;
+            rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+            if (FAILED(rc)) throw rc;
+
+            /* some special checks for DVD */
+            if (deviceType == DeviceType_DVD)
+            {
+                //no host drive CD/DVD image
+                BOOL fHostDrive = false;
+                rc = pMedium->COMGETTER(HostDrive)(&fHostDrive);
+                if (FAILED(rc)) throw rc;
+
+                if(fHostDrive)
+                    continue;
+
+                //only ISO image is moved
+                Utf8Str ext = bstrLocation;
+                ext.assignEx(RTPathSuffix(ext.c_str()));//returns extension with dot (".iso")
+
+                int equality = ext.compare(".iso", Utf8Str::CaseInsensitive);
+                if (equality != false)
+                    continue;
+            }
 
             MEDIUMTASKCHAIN mtc;
-            mtc.devType       = type;
-
-            while (!pSrcMedium.isNull())
+            mtc.devType = deviceType;
+
+            while (!pMedium.isNull())
             {
                 /* Refresh the state so that the file size get read. */
                 MediumState_T e;
-                rc = pSrcMedium->RefreshState(&e);
+                rc = pMedium->RefreshState(&e);
                 if (FAILED(rc)) return rc;
+
                 LONG64 lSize;
-                rc = pSrcMedium->COMGETTER(Size)(&lSize);
+                rc = pMedium->COMGETTER(Size)(&lSize);
                 if (FAILED(rc)) return rc;
 
-                Bstr bstrLocation;
-                rc = pSrcMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+                MediumType_T mediumType;//immutable, shared, passthrough
+                rc = pMedium->COMGETTER(Type)(&mediumType);
                 if (FAILED(rc)) throw rc;
 
-                /* Save the current medium, for later cloning. */
+                rc = pMedium->COMGETTER(Location)(bstrLocation.asOutParam());
+                if (FAILED(rc)) throw rc;
+
                 MEDIUMTASK mt;
                 mt.strBaseName = bstrLocation;
@@ -1199 +1239 @@
 
                 mt.uIdx    = UINT32_MAX;
-                mt.pMedium = pSrcMedium;
+                mt.pMedium = pMedium;
                 mt.uWeight = (ULONG)((lSize + _1M - 1) / _1M);
                 mtc.chain.append(mt);
 
                 /* Query next parent. */
-                rc = pSrcMedium->COMGETTER(Parent)(pSrcMedium.asOutParam());
+                rc = pMedium->COMGETTER(Parent)(pMedium.asOutParam());
                 if (FAILED(rc)) return rc;
             }
@@ -1243 +1283 @@
         sst.strSaveStateFile = bstrSrcSaveStatePath;
         uint64_t cbSize;
+
         int vrc = RTFileQuerySize(sst.strSaveStateFile.c_str(), &cbSize);
         if (RT_FAILURE(vrc))