Changeset 53603 in vbox

Timestamp:

Dec 25, 2014 7:45:47 PM (10 years ago)

Author:

vboxsync

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

97369

Message:

Main: Don't try to delete the storage of a disk image when the format is not file based while deleting a VM. Fixes an error an leftover files

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -5266 +5266 @@
                 LogFunc(("Deleting file %s\n", strLocation.c_str()));
             }
-            ComPtr<IProgress> pProgress2;
-            rc = pMedium->DeleteStorage(pProgress2.asOutParam());
-            if (FAILED(rc)) throw rc;
-            rc = task.pProgress->WaitForAsyncProgressCompletion(pProgress2);
-            if (FAILED(rc)) throw rc;
-            /* Check the result of the asynchronous process. */
-            LONG iRc;
-            rc = pProgress2->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 setError(ProgressErrorInfo(pProgress2));
+            if (pMedium->i_isMediumFormatFile())
+            {
+                ComPtr<IProgress> pProgress2;
+                rc = pMedium->DeleteStorage(pProgress2.asOutParam());
+                if (FAILED(rc)) throw rc;
+                rc = task.pProgress->WaitForAsyncProgressCompletion(pProgress2);
+                if (FAILED(rc)) throw rc;
+                /* Check the result of the asynchronous process. */
+                LONG iRc;
+                rc = pProgress2->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 setError(ProgressErrorInfo(pProgress2));
+            }
 
             /* Close the medium, deliberately without checking the return
--            * code, and without leaving any trace in the error info, as
--            * a failure here is a very minor issue, which shouldn't happen
--            * as above we even managed to delete the medium. */
+             * code, and without leaving any trace in the error info, as
+             * a failure here is a very minor issue, which shouldn't happen
+             * as above we even managed to delete the medium. */
             {
                 ErrorInfoKeeper eik;