Changeset 40258 in vbox

Timestamp:

Feb 27, 2012 9:48:41 AM (13 years ago)

Author:

vboxsync

Message:

Storage/VD: errors during closing all images in VDDestroy shouldn't be lost

Location:

trunk

Files:

• include/VBox/vd.h (modified) (1 diff)
• src/VBox/Storage/VD.cpp (modified) (3 diffs)

trunk/include/VBox/vd.h

@@ -470 +470 @@
  * If container has opened image files they will be closed.
  *
- * @param   pDisk           Pointer to HDD container.
- */
-VBOXDDU_DECL(void) VDDestroy(PVBOXHDD pDisk);
+ * @return  VBox status code.
+ * @param   pDisk           Pointer to HDD container.
+ */
+VBOXDDU_DECL(int) VDDestroy(PVBOXHDD pDisk);
 
 /**

trunk/src/VBox/Storage/VD.cpp

@@ -5134 +5134 @@
  * If container has opened image files they will be closed.
  *
+ * @returns VBox status code.
  * @param   pDisk           Pointer to HDD container.
  */
-VBOXDDU_DECL(void) VDDestroy(PVBOXHDD pDisk)
-{
+VBOXDDU_DECL(int) VDDestroy(PVBOXHDD pDisk)
+{
+    int rc = VINF_SUCCESS;
     LogFlowFunc(("pDisk=%#p\n", pDisk));
     do
@@ -5144 +5146 @@
         AssertPtrBreak(pDisk);
         AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
-        VDCloseAll(pDisk);
+        rc = VDCloseAll(pDisk);
         RTCritSectDelete(&pDisk->CritSect);
         RTMemCacheDestroy(pDisk->hMemCacheIoCtx);
@@ -5150 +5152 @@
         RTMemFree(pDisk);
     } while (0);
-    LogFlowFunc(("returns\n"));
+    LogFlowFunc(("returns %Rrc\n", rc));
+    return rc;
 }