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

Timestamp:

Oct 22, 2012 9:34:18 AM (12 years ago)

Author:

vboxsync

Message:

VSCSI: Added support for media locking/unlocking.

Location:

trunk/src/VBox/Devices/Storage

Files:

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

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

@@ -246 +246 @@
 }
 
+static DECLCALLBACK(int) drvscsiSetLock(VSCSILUN hVScsiLun, void *pvScsiLunUser, bool fLocked)
+{
+    PDRVSCSI pThis = (PDRVSCSI)pvScsiLunUser;
+
+    if (fLocked)
+        pThis->pDrvMount->pfnLock(pThis->pDrvMount);
+    else
+        pThis->pDrvMount->pfnUnlock(pThis->pDrvMount);
+
+    return VINF_SUCCESS;
+}
+
 static int drvscsiTransferCompleteNotify(PPDMIBLOCKASYNCPORT pInterface, void *pvUser, int rc)
 {
@@ -961 +973 @@
     pThis->VScsiIoCallbacks.pfnVScsiLunReqTransferEnqueue = drvscsiReqTransferEnqueue;
     pThis->VScsiIoCallbacks.pfnVScsiLunGetFeatureFlags    = drvscsiGetFeatureFlags;
+    pThis->VScsiIoCallbacks.pfnVScsiLunMediumSetLock      = drvscsiSetLock;
 
     rc = VSCSIDeviceCreate(&pThis->hVScsiDevice, drvscsiVScsiReqCompleted, pThis);

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

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

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

@@ -409 +409 @@
         {
             pVScsiLunMmc->fLocked = pVScsiReq->pbCDB[4] & 1;
+            vscsiLunMediumSetLock(pVScsiLun, pVScsiLunMmc->fLocked);
             rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq);
             break;