Changeset 33105 in vbox for trunk/src

Timestamp:

Oct 13, 2010 12:52:58 PM (14 years ago)

Author:

vboxsync

Message:

Corrected assertion (and comments).

File:

• trunk/src/VBox/Devices/Storage/VBoxSCSI.cpp (modified) (1 diff)

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

@@ -373 +373 @@
     uint32_t cbTransfer = *pcTransfer * cb;
 
-    /* Read string only valid for data in register. */
-    AssertMsg(iRegister == 1, ("Hey only register 1 can be read from with string\n"));
-    AssertMsg(cbTransfer == 512, ("Only 512 byte transfers are allowed\n"));
-
+    /* Write string only valid for data in/out register. */
+    AssertMsg(iRegister == 1, ("Hey only register 1 can be written to with string\n"));
+    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);