Changeset 27665 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 24, 2010 12:33:33 PM (15 years ago)

Author:

vboxsync

Message:

SCSI: Cleanup during destruction

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvSCSI.cpp (modified) (1 diff)
• VSCSI/VSCSIDevice.cpp (modified) (1 diff)
• VSCSI/VSCSILun.cpp (modified) (1 diff)

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

@@ -550 +550 @@
         AssertMsgRC(rc, ("Failed to destroy queue rc=%Rrc\n", rc));
     }
+
+    /* Free the VSCSI device and LUN handle. */
+    VSCSILUN hVScsiLun;
+    int rc = VSCSIDeviceLunDetach(pThis->hVScsiDevice, 0, &hVScsiLun);
+    AssertRC(rc);
+
+    Assert(hVScsiLun == pThis->hVScsiLun);
+    rc = VSCSILunDestroy(hVScsiLun);
+    AssertRC(rc);
+    rc = VSCSIDeviceDestroy(pThis->hVScsiDevice);
+    AssertRC(rc);
 }
 

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp

@@ -240 +240 @@
     AssertPtrReturn(pVScsiDevice->papVScsiLun[iLun], VERR_VSCSI_LUN_NOT_ATTACHED);
 
-    *phVScsiLun = pVScsiDevice->papVScsiLun[iLun];
+    PVSCSILUNINT pVScsiLun = pVScsiDevice->papVScsiLun[iLun];
+
+    pVScsiLun->pVScsiDevice = NULL;
+    *phVScsiLun = pVScsiLun;
     pVScsiDevice->papVScsiLun[iLun] = NULL;
     pVScsiDevice->cLunsAttached--;

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp

@@ -100 +100 @@
     AssertPtrReturn(pVScsiLun, VERR_INVALID_HANDLE);
     AssertReturn(!pVScsiLun->pVScsiDevice, VERR_VSCSI_LUN_ATTACHED_TO_DEVICE);
-    AssertReturn(vscsiIoReqOutstandingCountGet(pVScsiLun) != 0, VERR_VSCSI_LUN_BUSY);
+    AssertReturn(vscsiIoReqOutstandingCountGet(pVScsiLun) == 0, VERR_VSCSI_LUN_BUSY);
 
     int rc = pVScsiLun->pVScsiLunDesc->pfnVScsiLunDestroy(pVScsiLun);