Changeset 65061 in vbox

Timestamp:

Jan 3, 2017 10:55:26 AM (8 years ago)

Author:

vboxsync

Message:

pdmstorageifs.h: Pass the CDB length in PDMIMEDIA::pfnSendCmd to not being bound to guessing it in the host DVD access driver

Location:

trunk

Files:

• include/VBox/vmm/pdmstorageifs.h (modified) (3 diffs)
• src/VBox/Devices/Storage/DevATA.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvHostDVD.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmstorageifs.h

@@ -288 +288 @@
      * @returns VBox status code.
      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
-     * @param   pbCmd           Offset to start reading from.
+     * @param   pbCdb           The command to process.
+     * @param   cbCdb           The length of the command in bytes.
      * @param   enmTxDir        Direction of transfer.
      * @param   pvBuf           Pointer tp the transfer buffer.
@@ -297 +298 @@
      * @thread  Any thread.
      */
-    DECLR3CALLBACKMEMBER(int, pfnSendCmd,(PPDMIMEDIA pInterface, const uint8_t *pbCmd, PDMMEDIATXDIR enmTxDir,
-                                          void *pvBuf, uint32_t *pcbBuf, uint8_t *pabSense, size_t cbSense,
-                                          uint32_t cTimeoutMillies));
+    DECLR3CALLBACKMEMBER(int, pfnSendCmd,(PPDMIMEDIA pInterface, const uint8_t *pbCdb, size_t cbCdb,
+                                          PDMMEDIATXDIR enmTxDir, void *pvBuf, uint32_t *pcbBuf,
+                                          uint8_t *pabSense, size_t cbSense, uint32_t cTimeoutMillies));
 
     /**
@@ -462 +463 @@
 } PDMIMEDIA;
 /** PDMIMEDIA interface ID. */
-#define PDMIMEDIA_IID                           "d344aeaa-3ad0-4563-bb03-2733383e9230"
+#define PDMIMEDIA_IID                           "527246f5-f300-47a7-9ec3-03d8ea8bf9de"
 
 

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

@@ -2051 +2051 @@
                     break;
             }
-            rc = s->pDrvMedia->pfnSendCmd(s->pDrvMedia, aATAPICmd, (PDMMEDIATXDIR)s->uTxDir, pbBuf, &cbCurrTX, abATAPISense, sizeof(abATAPISense), 30000 /**< @todo timeout */);
+            rc = s->pDrvMedia->pfnSendCmd(s->pDrvMedia, aATAPICmd, ATAPI_PACKET_SIZE, (PDMMEDIATXDIR)s->uTxDir,
+                                          pbBuf, &cbCurrTX, abATAPISense, sizeof(abATAPISense), 30000 /**< @todo timeout */);
             if (rc != VINF_SUCCESS)
                 break;
@@ -2092 +2093 @@
     }
     else
-        rc = s->pDrvMedia->pfnSendCmd(s->pDrvMedia, s->aATAPICmd, (PDMMEDIATXDIR)s->uTxDir, s->CTX_SUFF(pbIOBuffer), &cbTransfer, abATAPISense, sizeof(abATAPISense), 30000 /**< @todo timeout */);
+        rc = s->pDrvMedia->pfnSendCmd(s->pDrvMedia, s->aATAPICmd, ATAPI_PACKET_SIZE, (PDMMEDIATXDIR)s->uTxDir,
+                                      s->CTX_SUFF(pbIOBuffer), &cbTransfer, abATAPISense, sizeof(abATAPISense), 30000 /**< @todo timeout */);
     if (pProf) { STAM_PROFILE_ADV_STOP(pProf, b); }
 

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

@@ -500 +500 @@
 
 /** @interface_method_impl{PDMIMEDIA,pfnSendCmd} */
-static DECLCALLBACK(int) drvHostDvdSendCmd(PPDMIMEDIA pInterface, const uint8_t *pbCmd,
+static DECLCALLBACK(int) drvHostDvdSendCmd(PPDMIMEDIA pInterface, const uint8_t *pbCdb, size_t cbCdb,
                                            PDMMEDIATXDIR enmTxDir, void *pvBuf, uint32_t *pcbBuf,
                                            uint8_t *pabSense, size_t cbSense, uint32_t cTimeoutMillies)
@@ -506 +506 @@
     PDRVHOSTBASE pThis = RT_FROM_MEMBER(pInterface, DRVHOSTBASE, IMedia);
     int rc;
-    LogFlow(("%s: cmd[0]=%#04x txdir=%d pcbBuf=%d timeout=%d\n", __FUNCTION__, pbCmd[0], enmTxDir, *pcbBuf, cTimeoutMillies));
+    LogFlow(("%s: cmd[0]=%#04x txdir=%d pcbBuf=%d timeout=%d\n", __FUNCTION__, pbCdb[0], enmTxDir, *pcbBuf, cTimeoutMillies));
 
     RTCritSectEnter(&pThis->CritSect);
-    /*
-     * Pass the request on to the internal scsi command interface.
-     * The command seems to be 12 bytes long, the docs a bit copy&pasty on the command length point...
-     */
+    /* Pass the request on to the internal scsi command interface. */
     if (enmTxDir == PDMMEDIATXDIR_FROM_DEVICE)
         memset(pvBuf, '\0', *pcbBuf); /* we got read size, but zero it anyway. */
-    rc = drvHostBaseScsiCmdOs(pThis, pbCmd, 12, enmTxDir, pvBuf, pcbBuf, pabSense, cbSense, cTimeoutMillies);
+    rc = drvHostBaseScsiCmdOs(pThis, pbCdb, cbCdb, enmTxDir, pvBuf, pcbBuf, pabSense, cbSense, cTimeoutMillies);
     if (rc == VERR_UNRESOLVED_ERROR)
         /* sense information set */
         rc = VERR_DEV_IO_ERROR;
 
-    if (pbCmd[0] == SCSI_GET_EVENT_STATUS_NOTIFICATION)
+    if (pbCdb[0] == SCSI_GET_EVENT_STATUS_NOTIFICATION)
     {
         uint8_t *pbBuf = (uint8_t*)pvBuf;