Changeset 4706 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 11, 2007 12:06:33 PM (18 years ago)

Author:

vboxsync

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

24373

Message:

Fix incorrect setting of buffer end index if huge ATAPI transfers are
requested.

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (3 diffs)

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

@@ -1622 +1622 @@
     cbTransfer = RT_MIN(s->cbTotalTransfer, s->cbIOBuffer);
     cSectors = cbTransfer / s->cbATAPISector;
-    Assert(cSectors * s->cbATAPISector == cbTransfer);
+    Assert(cSectors * s->cbATAPISector <= cbTransfer);
     Log(("%s: %d sectors at LBA %d\n", __FUNCTION__, cSectors, s->iATAPILBA));
 
@@ -1673 +1673 @@
         STAM_COUNTER_ADD(&s->StatBytesRead, s->cbATAPISector * cSectors);
 
+        /* The initial buffer end value has been set up based on the total
+         * transfer size. But the I/O buffer size limits what can actually be
+         * done in one transfer, so set the actual value of the buffer end. */
+        s->iIOBufferEnd = cbTransfer;
         atapiCmdOK(s);
         s->iATAPILBA += cSectors;
@@ -1829 +1833 @@
             /* Reply with the same amount of data as the real drive. */
             s->cbTotalTransfer = cbTransfer;
+            /* The initial buffer end value has been set up based on the total
+             * transfer size. But the I/O buffer size limits what can actually be
+             * done in one transfer, so set the actual value of the buffer end. */
+            s->iIOBufferEnd = cbTransfer;
             if (s->aATAPICmd[0] == SCSI_INQUIRY)
             {