Changeset 749 in vbox

Timestamp:

Feb 7, 2007 2:49:33 PM (18 years ago)

Author:

vboxsync

Message:

Main: Fixed: Don't try to delete the image file of a differencing VDI on unregistration if the last accessibility check for this VDI failed.

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxImpl.cpp (modified) (3 diffs)
• include/HardDiskImpl.h (modified) (1 diff)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -3833 +3833 @@
     AutoLock alock (this);
 
-    /*
-     *  Lock the hard disk to ensure nobody registers it again before we delete
-     *  the differencing image (sanity check actually -- should never happen).
-     */
+    /* Lock the hard disk to ensure nobody registers it again before we delete
+     * the differencing image (sanity check actually -- should never happen). */
     AutoLock hdLock (aHardDisk);
 
@@ -3848 +3846 @@
     if (!aHardDisk->parent())
     {
-        /*
-         *  non-differencing hard disk:
-         *  remove from the collection of top-level hard disks
-         */
+        /* non-differencing hard disk:
+         * remove from the collection of top-level hard disks */
         mData.mHardDisks.remove (aHardDisk);
     }
@@ -3858 +3854 @@
         Assert (aHardDisk->isDifferencing());
 
-        /* differencing hard disk: uninitialize */
-        rc = aHardDisk->asVDI()->DeleteImage();
+        /* differencing hard disk: delete (only if the last access check
+         * succeeded) and uninitialize */
+        if (aHardDisk->asVDI()->lastAccessError().isNull())
+            rc = aHardDisk->asVDI()->DeleteImage();
         aHardDisk->uninit();
     }

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

@@ -167 +167 @@
     void updatePaths (const char *aOldPath, const char *aNewPath);
 
-    /* these must be are called from under the lock */
+    /* the following must be called from under the lock */
     bool isBusy() { isLockedOnCurrentThread(); return mBusy; }
     unsigned readers() { isLockedOnCurrentThread(); return mReaders; }
+    const Bstr &lastAccessError() const { return mLastAccessError; }
 
     // for VirtualBoxSupportErrorInfoImpl