Changeset 44889 in vbox for trunk

Timestamp:

Mar 1, 2013 3:45:44 PM (12 years ago)

Author:

vboxsync

Message:

Undid bad commit.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvSCSI.cpp (modified) (2 diffs)
• VSCSI/VSCSIInternal.h (modified) (2 diffs)

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

@@ -258 +258 @@
 }
 
-static DECLCALLBACK(int) drvscsiEject(VSCSILUN hVScsiLun, void *pvScsiLunUser)
-{
-    PDRVSCSI    pThis = (PDRVSCSI)pvScsiLunUser;
-    int         rc;
-
-#if 0
-    /* This must be done from EMT. */
-    PPDMDEVINS pDevIns = NULL; //ATADEVSTATE_2_DEVINS(s);
-    
-    rc = VMR3ReqPriorityCallWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
-                                 (PFNRT)pThis->pDrvMount->pfnUnmount, 3,
-                                 pThis->pDrvMount, false /*=fForce*/, true /*=fEject*/);
-    Assert(RT_SUCCESS(rc) || (rc == VERR_PDM_MEDIA_LOCKED) || (rc = VERR_PDM_MEDIA_NOT_MOUNTED));
-    if (RT_SUCCESS(rc) && pThis->pMediaNotify)
-    {
-        rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
-                               (PFNRT)pThis->pMediaNotify->pfnEjected, 2,
-                               pThis->pMediaNotify, s->iLUN);
-        AssertRC(rc);
-    }
-#endif
-    return VINF_SUCCESS;
-}
-
 static int drvscsiTransferCompleteNotify(PPDMIBLOCKASYNCPORT pInterface, void *pvUser, int rc)
 {
@@ -998 +974 @@
     pThis->VScsiIoCallbacks.pfnVScsiLunGetFeatureFlags    = drvscsiGetFeatureFlags;
     pThis->VScsiIoCallbacks.pfnVScsiLunMediumSetLock      = drvscsiSetLock;
-    pThis->VScsiIoCallbacks.pfnVScsiLunMediumEject        = drvscsiEject;
 
     rc = VSCSIDeviceCreate(&pThis->hVScsiDevice, drvscsiVScsiReqCompleted, pThis);

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h

@@ -364 +364 @@
 
 /**
- * Wrapper for the medium lock/unlock I/O callback.
+ * Wrapper for the get medium lock/unlock I/O callback.
  *
  * @returns VBox status code.
@@ -378 +378 @@
 
 /**
- * Wrapper for the medium eject I/O callback.
- *
- * @returns VBox status code.
- * @param   pVScsiLun   The LUN.
- */
-DECLINLINE(int) vscsiLunMediumEject(PVSCSILUNINT pVScsiLun)
-{
-    return pVScsiLun->pVScsiLunIoCallbacks->pfnVScsiLunMediumEject(pVScsiLun,
-                                                                   pVScsiLun->pvVScsiLunUser);
-}
-
-/**
  * Wrapper for the I/O request enqueue I/O callback.
  *