Changeset 35009 in vbox

Timestamp:

Dec 13, 2010 1:48:07 PM (14 years ago)

Author:

vboxsync

Message:

Main: delete media files on machine deletion only if the medium actually has a file

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• MediumImpl.cpp (modified) (1 diff)
• include/MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4296 +4296 @@
     //    and must be closed first, or closing the parents will fail because they will
     //    children);
-    // 2) media from the youngest snapshots followed those from the parent snapshots until
+    // 2) media from the youngest snapshots followed by those from the parent snapshots until
     //    the root ("first") snapshot of the machine
     // This order allows for closing the media on this list from the beginning to the end
@@ -4402 +4402 @@
 
         Utf8Str bstrLocation = pMedium->getLocationFull();
+
+        bool fDoesMediumNeedFileDeletion = pMedium->isMediumFormatFile();
+
         // close the medium now; if that succeeds, then that means the medium is no longer
         // in use and we can add it to the list of files to delete
         rc = pMedium->close(&pTask->llRegistriesThatNeedSaving,
                             mediumAutoCaller);
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(rc) && fDoesMediumNeedFileDeletion)
             pTask->llFilesToDelete.push_back(bstrLocation);
     }

trunk/src/VBox/Main/MediumImpl.cpp

@@ -2953 +2953 @@
 {
     return m->formatObj;
+}
+
+/**
+ * Internal method that returns true if the medium is represented by a file on the host disk
+ * (and not iSCSI or something).
+ * @return
+ */
+bool Medium::isMediumFormatFile() const
+{
+    if (    m->formatObj
+         && (m->formatObj->getCapabilities() & MediumFormatCapabilities_File)
+       )
+        return true;
+    return false;
 }
 

trunk/src/VBox/Main/include/MediumImpl.h

@@ -171 +171 @@
     const Utf8Str& getFormat() const;
     const ComObjPtr<MediumFormat> & getMediumFormat() const;
+    bool isMediumFormatFile() const;
     uint64_t getSize() const;
     DeviceType_T getDeviceType() const;