Changeset 43474 in vbox for trunk/src/VBox

Timestamp:

Sep 30, 2012 11:31:15 AM (12 years ago)

Author:

vboxsync

Message:

VBOXSCSI: Extended to allow larger than 64K transfers.

Location:

trunk/src/VBox/Devices/Storage

Files:

• VBoxSCSI.cpp (modified) (6 diffs)
• VBoxSCSI.h (modified) (1 diff)

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

@@ -98 +98 @@
         case 1:
         {
-            if (pVBoxSCSI->cbBuf > 0)
+            /* If we're not in the 'command ready' state, there may not even be a buffer yet. */
+            if ((pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY) && pVBoxSCSI->cbBuf > 0)
             {
                 AssertMsg(pVBoxSCSI->pBuf, ("pBuf is NULL\n"));
+                Assert(pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY);
+                Assert(!pVBoxSCSI->fBusy);
                 uVal = pVBoxSCSI->pBuf[pVBoxSCSI->iBuf];
                 pVBoxSCSI->iBuf++;
@@ -163 +166 @@
                 else
                 {
-                    pVBoxSCSI->enmState = VBOXSCSISTATE_READ_CDB_SIZE;
+                    pVBoxSCSI->enmState = VBOXSCSISTATE_READ_CDB_SIZE_BUFHI;
                     pVBoxSCSI->uTxDir = uVal;
                 }
             }
-            else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_CDB_SIZE)
-            {
-                if (uVal > VBOXSCSI_CDB_SIZE_MAX)
+            else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_CDB_SIZE_BUFHI)
+            {
+                uint8_t     cbCDB = uVal & 0x0F;
+
+                if (cbCDB > VBOXSCSI_CDB_SIZE_MAX)
                     vboxscsiReset(pVBoxSCSI);
                 else
                 {
-                    pVBoxSCSI->enmState = VBOXSCSISTATE_READ_BUFFER_SIZE_LOW;
-                    pVBoxSCSI->cbCDB = uVal;
+                    pVBoxSCSI->enmState = VBOXSCSISTATE_READ_BUFFER_SIZE_LSB;
+                    pVBoxSCSI->cbCDB = cbCDB;
+                    pVBoxSCSI->cbBuf = (uVal & 0xF0) << 12;     /* Bits 16-19 of buffer size. */
                 }
             }
-            else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_BUFFER_SIZE_LOW)
-            {
-                pVBoxSCSI->enmState = VBOXSCSISTATE_READ_BUFFER_SIZE_HIGH;
-                pVBoxSCSI->cbBuf = uVal;
-            }
-            else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_BUFFER_SIZE_HIGH)
+            else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_BUFFER_SIZE_LSB)
+            {
+                pVBoxSCSI->enmState = VBOXSCSISTATE_READ_BUFFER_SIZE_MID;
+                pVBoxSCSI->cbBuf |= uVal;                       /* Bits 0-7 of buffer size. */
+            }
+            else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_BUFFER_SIZE_MID)
             {
                 pVBoxSCSI->enmState = VBOXSCSISTATE_READ_COMMAND;
-                pVBoxSCSI->cbBuf |= (((uint16_t)uVal) << 8);
+                pVBoxSCSI->cbBuf |= (((uint16_t)uVal) << 8);    /* Bits 8-15 of buffer size. */
             }
             else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_COMMAND)
@@ -351 +357 @@
         return VINF_SUCCESS;
 
-    int rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, pVBoxSCSI->pBuf, cbTransfer);
+    /* Also ignore attempts to read more data than is available. */
+    Assert(cbTransfer <= pVBoxSCSI->cbBuf);
+    if (cbTransfer > pVBoxSCSI->cbBuf)
+        cbTransfer = pVBoxSCSI->cbBuf;  /* Ignore excess data (not supposed to happen). */
+
+    int rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, pVBoxSCSI->pBuf + pVBoxSCSI->iBuf, cbTransfer);
     AssertRC(rc);
 
@@ -357 +368 @@
     *pcTransfer = 0;
 
-    RTMemFree(pVBoxSCSI->pBuf);
-    pVBoxSCSI->pBuf  = NULL;
-    pVBoxSCSI->cbBuf = 0;
-    pVBoxSCSI->cbCDB = 0;
-    pVBoxSCSI->iCDB  = 0;
-    pVBoxSCSI->iBuf  = 0;
-    pVBoxSCSI->uTargetDevice = 0;
-    pVBoxSCSI->enmState = VBOXSCSISTATE_NO_COMMAND;
-    memset(pVBoxSCSI->aCDB, 0, sizeof(pVBoxSCSI->aCDB));
+    /* Advance current buffer position. */
+    pVBoxSCSI->iBuf  += cbTransfer;
+    pVBoxSCSI->cbBuf -= cbTransfer;
+
+    if (pVBoxSCSI->cbBuf == 0)
+    {
+        /** The guest read the last byte from the data in buffer.
+         *  Clear everything and reset command buffer.
+         */
+        RTMemFree(pVBoxSCSI->pBuf);
+        pVBoxSCSI->pBuf  = NULL;
+        pVBoxSCSI->cbCDB = 0;
+        pVBoxSCSI->iCDB  = 0;
+        pVBoxSCSI->iBuf  = 0;
+        pVBoxSCSI->uTargetDevice = 0;
+        pVBoxSCSI->enmState = VBOXSCSISTATE_NO_COMMAND;
+        memset(pVBoxSCSI->aCDB, 0, sizeof(pVBoxSCSI->aCDB));
+    }
 
     return rc;
@@ -383 +403 @@
         return VINF_SUCCESS;
 
-    Assert(cbTransfer == pVBoxSCSI->cbBuf);
+    Assert(cbTransfer <= pVBoxSCSI->cbBuf);
     if (cbTransfer > pVBoxSCSI->cbBuf)
         cbTransfer = pVBoxSCSI->cbBuf;  /* Ignore excess data (not supposed to happen). */
 
-    int rc = PDMDevHlpPhysReadGCVirt(pDevIns, pVBoxSCSI->pBuf, GCSrc, cbTransfer);
+    int rc = PDMDevHlpPhysReadGCVirt(pDevIns, pVBoxSCSI->pBuf + pVBoxSCSI->iBuf, GCSrc, cbTransfer);
     AssertRC(rc);
+
+    /* Advance current buffer position. */
+    pVBoxSCSI->iBuf  += cbTransfer;
+    pVBoxSCSI->cbBuf -= cbTransfer;
 
     *pGCPtrSrc = (RTGCPTR)((RTGCUINTPTR)GCSrc + cbTransfer);
@@ -409 +433 @@
     }
 }
-

trunk/src/VBox/Devices/Storage/VBoxSCSI.h

@@ -71 +71 @@
     VBOXSCSISTATE_NO_COMMAND            = 0x00,
     VBOXSCSISTATE_READ_TXDIR            = 0x01,
-    VBOXSCSISTATE_READ_CDB_SIZE         = 0x02,
-    VBOXSCSISTATE_READ_BUFFER_SIZE_LOW  = 0x03,
-    VBOXSCSISTATE_READ_BUFFER_SIZE_HIGH = 0x04,
+    VBOXSCSISTATE_READ_CDB_SIZE_BUFHI   = 0x02,
+    VBOXSCSISTATE_READ_BUFFER_SIZE_LSB  = 0x03,
+    VBOXSCSISTATE_READ_BUFFER_SIZE_MID  = 0x04,
     VBOXSCSISTATE_READ_COMMAND          = 0x05,
     VBOXSCSISTATE_COMMAND_READY         = 0x06