Changeset 30384 in vbox for trunk/src/VBox

Timestamp:

Jun 23, 2010 9:56:54 AM (15 years ago)

Author:

vboxsync

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

62994

Message:

SCSI: Log used I/O method

File:

• trunk/src/VBox/Devices/Storage/DrvSCSI.cpp (modified) (4 diffs)

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

@@ -25 +25 @@
 #include <VBox/pdmthread.h>
 #include <VBox/vscsi.h>
+#include <VBox/scsi.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>
@@ -439 +440 @@
 /* -=-=-=-=- ISCSIConnector -=-=-=-=- */
 
+#ifdef DEBUG
+/**
+ * Dumps a SCSI request structure for debugging purposes.
+ *
+ * @returns nothing.
+ * @param   pRequest    Pointer to the request to dump.
+ */
+static void drvscsiDumpScsiRequest(PPDMSCSIREQUEST pRequest)
+{
+    Log(("Dump for pRequest=%#p Command: %s\n", pRequest, SCSICmdText(pRequest->pbCDB[0])));
+    Log(("cbCDB=%u\n", pRequest->cbCDB));
+    for (uint32_t i = 0; i < pRequest->cbCDB; i++)
+        Log(("pbCDB[%u]=%#x\n", i, pRequest->pbCDB[i]));
+    Log(("cbScatterGather=%u\n", pRequest->cbScatterGather));
+    Log(("cScatterGatherEntries=%u\n", pRequest->cScatterGatherEntries));
+    /* Print all scatter gather entries. */
+    for (uint32_t i = 0; i < pRequest->cScatterGatherEntries; i++)
+    {
+        Log(("ScatterGatherEntry[%u].cbSeg=%u\n", i, pRequest->paScatterGatherHead[i].cbSeg));
+        Log(("ScatterGatherEntry[%u].pvSeg=%#p\n", i, pRequest->paScatterGatherHead[i].pvSeg));
+    }
+    Log(("pvUser=%#p\n", pRequest->pvUser));
+}
+#endif
+
 /** @copydoc PDMISCSICONNECTOR::pfnSCSIRequestSend. */
 static DECLCALLBACK(int) drvscsiRequestSend(PPDMISCSICONNECTOR pInterface, PPDMSCSIREQUEST pSCSIRequest)
@@ -445 +471 @@
     PDRVSCSI pThis = PDMISCSICONNECTOR_2_DRVSCSI(pInterface);
     VSCSIREQ hVScsiReq;
+
+#ifdef DEBUG
+    drvscsiDumpScsiRequest(pSCSIRequest);
+#endif
 
     rc = VSCSIDeviceReqCreate(pThis->hVScsiDevice, &hVScsiReq,
@@ -746 +776 @@
                                    drvscsiAsyncIOLoopWakeup, 0, RTTHREADTYPE_IO, "SCSI async IO");
         AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n"), rc);
-    }
+
+        LogRel(("SCSI#%d: using normal I/O\n", pDrvIns->iInstance));
+    }
+    else
+        LogRel(("SCSI#%d: using async I/O\n", pDrvIns->iInstance));
 
     return VINF_SUCCESS;