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

Timestamp:

Jun 22, 2015 3:08:04 PM (9 years ago)

Author:

vboxsync

Message:

Main/MachineImplCloneVM.cpp: fix cloning of VMs with floppy (handled regularly, like writethrough disks) and DVD attachments, which previously could lead to hangs (especially when the image was located in the VM directory), and some tweaking of the error handling code path to make it more robust.

File:

• trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (modified) (18 diffs)

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

@@ -46 +46 @@
 {
     RTCList<MEDIUMTASK>     chain;
+    DeviceType_T            devType;
     bool                    fCreateDiffs;
     bool                    fAttachLinked;
@@ -270 +271 @@
             if (FAILED(rc)) return rc;
 
-            /* Only harddisk's are of interest. */
-            if (type != DeviceType_HardDisk)
+            /* Only harddisks and floppies are of interest. */
+            if (   type != DeviceType_HardDisk
+                && type != DeviceType_Floppy)
                 continue;
 
@@ -278 +280 @@
             rc = pAtt->COMGETTER(Medium)(pSrcMedium.asOutParam());
             if (FAILED(rc)) return rc;
+
             if (pSrcMedium.isNull())
                 continue;
@@ -284 +287 @@
              * contain one image only. */
             MEDIUMTASKCHAIN mtc;
+            mtc.devType       = type;
             mtc.fCreateDiffs  = fCreateDiffs;
             mtc.fAttachLinked = fAttachLinked;
@@ -377 +381 @@
             if (FAILED(rc)) return rc;
 
-            /* Only harddisk's are of interest. */
-            if (type != DeviceType_HardDisk)
+            /* Only harddisks and floppies are of interest. */
+            if (   type != DeviceType_HardDisk
+                && type != DeviceType_Floppy)
                 continue;
 
@@ -390 +395 @@
 
             MEDIUMTASKCHAIN mtc;
+            mtc.devType       = type;
             mtc.fCreateDiffs  = fCreateDiffs;
             mtc.fAttachLinked = fAttachLinked;
@@ -520 +526 @@
             if (FAILED(rc)) return rc;
 
-            /* Only harddisk's are of interest. */
-            if (type != DeviceType_HardDisk)
+            /* Only harddisks and floppies are of interest. */
+            if (   type != DeviceType_HardDisk
+                && type != DeviceType_Floppy)
                 continue;
 
@@ -528 +535 @@
             rc = pAtt->COMGETTER(Medium)(pSrcMedium.asOutParam());
             if (FAILED(rc)) return rc;
+
             if (pSrcMedium.isNull())
                 continue;
@@ -535 +543 @@
              * will not create a full copy of the base/child relationship.) */
             MEDIUMTASKCHAIN mtc;
+            mtc.devType       = type;
             mtc.fCreateDiffs  = fCreateDiffs;
             mtc.fAttachLinked = fAttachLinked;
@@ -646 +655 @@
              ++it4)
         {
-            if (   it4->deviceType == DeviceType_HardDisk
+            if (   (   it4->deviceType == DeviceType_HardDisk
+                    || it4->deviceType == DeviceType_Floppy)
                 && it4->uuid == bstrOldId)
             {
@@ -996 +1006 @@
         /* Reset media registry. */
         trgMCF.mediaRegistry.llHardDisks.clear();
+        trgMCF.mediaRegistry.llDvdImages.clear();
+        trgMCF.mediaRegistry.llFloppyImages.clear();
         /* If we got a valid snapshot id, replace the hardware/storage section
          * with the stuff from the snapshot. */
@@ -1147 +1159 @@
                         /* Default format? */
                         Utf8Str strDefaultFormat;
-                        p->mParent->i_getDefaultHardDiskFormat(strDefaultFormat);
+                        if (mtc.devType == DeviceType_HardDisk)
+                            p->mParent->i_getDefaultHardDiskFormat(strDefaultFormat);
+                        else
+                            strDefaultFormat = "RAW";
+
                         Bstr bstrSrcFormat(strDefaultFormat);
 
@@ -1225 +1241 @@
                                            strFile,
                                            Guid::Empty /* empty media registry */,
-                                           DeviceType_HardDisk);
+                                           mtc.devType);
                         if (FAILED(rc)) throw rc;
 
@@ -1231 +1247 @@
                         pTarget->i_updateId(newId);
 
-                        srcLock.release();
                         /* Do the disk cloning. */
                         ComPtr<IProgress> progress2;
 
                         ComObjPtr<Medium> pLMedium = static_cast<Medium*>((IMedium*)pMedium);
+                        srcLock.release();
                         rc = pLMedium->i_cloneToEx(pTarget,
                                                    srcVar,
@@ -1242 +1258 @@
                                                    uSrcParentIdx,
                                                    uTrgParentIdx);
+                        srcLock.acquire();
                         if (FAILED(rc)) throw rc;
 
                         /* Wait until the async process has finished. */
+                        srcLock.release();
                         rc = d->pProgress->WaitForAsyncProgressCompletion(progress2);
                         srcLock.acquire();
@@ -1264 +1282 @@
                         rc = pMedium->COMGETTER(Type)(&type);
                         if (FAILED(rc)) throw rc;
+                        trgLock.release();
+                        srcLock.release();
                         rc = pTarget->COMSETTER(Type)(type);
+                        srcLock.acquire();
+                        trgLock.acquire();
                         if (FAILED(rc)) throw rc;
                         map.insert(TStrMediumPair(Utf8Str(bstrSrcId), pTarget));
-                        /* register the new harddisk */
+                        /* register the new medium */
                         {
                             AutoWriteLock tlock(p->mParent->i_getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
                             rc = p->mParent->i_registerMedium(pTarget, &pTarget,
-                                                            tlock);
+                                                              tlock);
                             if (FAILED(rc)) throw rc;
                         }
@@ -1463 +1485 @@
     catch (HRESULT rc2)
     {
+        /* Error handling code only works correctly without locks held. */
+        trgLock.release();
+        srcLock.release();
         rc = rc2;
     }
@@ -1488 +1513 @@
             const ComObjPtr<Medium> &pMedium = newMedia.at(i - 1);
             mrc = pMedium->i_deleteStorage(NULL /* aProgress */,
-                                         true /* aWait */);
+                                           true /* aWait */);
             pMedium->Close();
         }