Changeset 59476 in vbox

Timestamp:

Jan 26, 2016 1:30:53 PM (9 years ago)

Author:

vboxsync

Message:

Storage/DrvVD: Make sure the disk container is destroyed when the guest ejects it

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -372 +372 @@
 
 static DECLCALLBACK(void) drvvdMediaExIoReqComplete(void *pvUser1, void *pvUser2, int rcReq);
+static void drvvdPowerOffOrDestructOrUnmount(PPDMDRVINS pDrvIns);
 
 /**
@@ -2406 +2407 @@
     /* Media is no longer locked even if it was previously. */
     pThis->fLocked = false;
+    drvvdPowerOffOrDestructOrUnmount(pThis->pDrvIns);
 
     /*
@@ -3475 +3477 @@
  * @param   pDrvIns    The driver instance.
  */
-static void drvvdPowerOffOrDestruct(PPDMDRVINS pDrvIns)
+static void drvvdPowerOffOrDestructOrUnmount(PPDMDRVINS pDrvIns)
 {
     PVBOXDISK pThis = PDMINS_2_DATA(pDrvIns, PVBOXDISK);
@@ -3515 +3517 @@
 {
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
-    drvvdPowerOffOrDestruct(pDrvIns);
+    drvvdPowerOffOrDestructOrUnmount(pDrvIns);
 }
 
@@ -3627 +3629 @@
      * callback first when we reconfigure the driver chain after a snapshot.
      */
-    drvvdPowerOffOrDestruct(pDrvIns);
+    drvvdPowerOffOrDestructOrUnmount(pDrvIns);
     if (pThis->MergeLock != NIL_RTSEMRW)
     {