Changeset 63955 in vbox

Timestamp:

Sep 22, 2016 2:50:12 PM (8 years ago)

Author:

vboxsync

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

110841

Message:

pdmstorageifs.h: Small addendum to PDMIMEDIAEX which enables us to replace PDMISCSICONNECTOR with PDMIMEDIAEX later

Location:

trunk

Files:

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

trunk/include/VBox/vmm/pdmstorageifs.h

@@ -591 +591 @@
 
 /**
+ * Data direction for raw SCSI commands.
+ */
+typedef enum PDMMEDIAEXIOREQSCSITXDIR
+{
+    /** Invalid data direction. */
+    PDMMEDIAEXIOREQSCSITXDIR_INVALID     = 0,
+    /** Direction is unknown. */
+    PDMMEDIAEXIOREQSCSITXDIR_UNKNOWN,
+    /** Direction is from device to host. */
+    PDMMEDIAEXIOREQSCSITXDIR_FROM_DEVICE,
+    /** Direction is from host to device. */
+    PDMMEDIAEXIOREQSCSITXDIR_TO_DEVICE,
+    /** No data transfer associated with this request. */
+    PDMMEDIAEXIOREQSCSITXDIR_NONE,
+    /** 32bit hack. */
+    PDMMEDIAEXIOREQSCSITXDIR_32BIT_HACK  = 0x7fffffff
+} PDMMEDIAEXIOREQSCSITXDIR;
+
+/**
  * I/O request state.
  */
@@ -862 +881 @@
      *          Completion will be notified through PDMIMEDIAEXPORT::pfnIoReqCompleteNotify with the appropriate status code.
      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
-     * @param   pbCmd           The SCSI CDB containing the command.
      * @param   hIoReq          The I/O request to associate the command with.
+     * @param   uLun            The LUN the command is for.
+     * @param   pbCdb           The SCSI CDB containing the command.
+     * @param   cbCdb           Size of the CDB in bytes.
      * @param   enmTxDir        Direction of transfer.
      * @param   pvBuf           Pointer tp the transfer buffer.
@@ -871 +892 @@
      * @thread  Any thread.
      */
-    DECLR3CALLBACKMEMBER(int, pfnIoReqSendScsiCmd,(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, const uint8_t *pbCmd, PDMMEDIATXDIR enmTxDir,
+    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));
 
@@ -948 +970 @@
 } PDMIMEDIAEX;
 /** PDMIMEDIAEX interface ID. */
-#define PDMIMEDIAEX_IID                      "2094db35-ebe8-486d-a34b-a210f3f8beaf"
+#define PDMIMEDIAEX_IID                      "ae47c9a9-fa43-4b07-8f9a-b45bcc3fb8e4"
 
 /**

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

@@ -3741 +3741 @@
  * @interface_method_impl{PDMIMEDIAEX,pfnIoReqSendScsiCmd}
  */
-static DECLCALLBACK(int) drvvdIoReqSendScsiCmd(PPDMIMEDIAEX pInterface, PDMMEDIAEXIOREQ hIoReq, const uint8_t *pbCmd, PDMMEDIATXDIR enmTxDir,
+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_NOREF7(pInterface, pbCmd, enmTxDir, cbBuf, pabSense, cbSense, cTimeoutMillies);
+    RT_NOREF9(pInterface, uLun, pbCdb, cbCdb, enmTxDir, cbBuf, pabSense, cbSense, cTimeoutMillies);
     PPDMMEDIAEXIOREQINT pIoReq = hIoReq;
     VDIOREQSTATE enmState = (VDIOREQSTATE)ASMAtomicReadU32((volatile uint32_t *)&pIoReq->enmState);