Changeset 64078 in vbox

Timestamp:

Sep 28, 2016 11:55:51 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

111011

Message:

PDMIMEDIAEX: Add parameter to pfnIoReqSendScsiCmd to indicate where to store the SCSI status code on success

Location:

trunk

Files:

• include/VBox/vmm/pdmstorageifs.h (modified) (3 diffs)
• src/VBox/Devices/Samples/DrvStorageFilter.cpp (modified) (1 diff)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmstorageifs.h

@@ -808 +808 @@
      * @param   cbCdb           Size of the CDB in bytes.
      * @param   enmTxDir        Direction of transfer.
-     * @param   pvBuf           Pointer tp the transfer buffer.
      * @param   cbBuf           Size of the transfer buffer.
-     * @param   pbSenseKey      Status of the command (when return value is VERR_DEV_IO_ERROR).
+     * @param   pabSense        Where to store the optional sense key.
+     * @param   cbSense         Size of the sense key buffer.
+     * @param   pu8ScsiSts      Where to store the SCSI status on success.
      * @param   cTimeoutMillies Command timeout in milliseconds.
      * @thread  Any thread.
@@ -816 +817 @@
     DECLR3CALLBACKMEMBER(int, pfnIoReqSendScsiCmd,(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, uint32_t uLun,
                                                    const uint8_t *pbCdb, size_t cbCdb, PDMMEDIAEXIOREQSCSITXDIR enmTxDir,
-                                                   size_t cbBuf, uint8_t *pabSense, size_t cbSense, uint32_t cTimeoutMillies));
+                                                   size_t cbBuf, uint8_t *pabSense, size_t cbSense, uint8_t *pu8ScsiSts,
+                                                   uint32_t cTimeoutMillies));
 
     /**
@@ -892 +894 @@
 } PDMIMEDIAEX;
 /** PDMIMEDIAEX interface ID. */
-#define PDMIMEDIAEX_IID                      "d4c66196-13f0-433d-8e87-e4b957cb0194"
+#define PDMIMEDIAEX_IID                      "134a5ba9-0d6c-443f-8619-14fea6caaa8d"
 
 /**

trunk/src/VBox/Devices/Samples/DrvStorageFilter.cpp

@@ -338 +338 @@
 static DECLCALLBACK(int) drvStorageFltIMedia_IoReqSendScsiCmd(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, uint32_t uLun,
                                                               const uint8_t *pbCdb, size_t cbCdb, PDMMEDIAEXIOREQSCSITXDIR enmTxDir,
-                                                              size_t cbBuf, uint8_t *pabSense, size_t cbSense, uint32_t cTimeoutMillies)
+                                                              size_t cbBuf, uint8_t *pabSense, size_t cbSense, uint8_t *pu8ScsiSts,
+                                                              uint32_t cTimeoutMillies)
 {
     PDRVSTORAGEFILTER pThis = RT_FROM_MEMBER(pInterface, DRVSTORAGEFILTER, IMediaEx);
     return pThis->pIMediaExBelow->pfnIoReqSendScsiCmd(pThis->pIMediaExBelow, hIoReq, uLun, pbCdb, cbCdb,
-                                                      enmTxDir, cbBuf, pabSense, cbSense, cTimeoutMillies);
+                                                      enmTxDir, cbBuf, pabSense, cbSense, pu8ScsiSts,
+                                                      cTimeoutMillies);
 }
 

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

@@ -3626 +3626 @@
 static DECLCALLBACK(int) drvvdIoReqSendScsiCmd(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, uint32_t uLun,
                                                const uint8_t *pbCdb, size_t cbCdb, PDMMEDIAEXIOREQSCSITXDIR enmTxDir,
-                                               size_t cbBuf, uint8_t *pabSense, size_t cbSense, uint32_t cTimeoutMillies)
-{
-    RT_NOREF9(pInterface, uLun, pbCdb, cbCdb, enmTxDir, cbBuf, pabSense, cbSense, cTimeoutMillies);
+                                               size_t cbBuf, uint8_t *pabSense, size_t cbSense, uint8_t *pu8ScsiSts,
+                                               uint32_t cTimeoutMillies)
+{
+    RT_NOREF10(pInterface, uLun, pbCdb, cbCdb, enmTxDir, cbBuf, pabSense, cbSense, pu8ScsiSts, cTimeoutMillies);
     PPDMMEDIAEXIOREQINT pIoReq = hIoReq;
     VDIOREQSTATE enmState = (VDIOREQSTATE)ASMAtomicReadU32((volatile uint32_t *)&pIoReq->enmState);