Changeset 21807 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Jul 27, 2009 11:19:23 AM (16 years ago)

Author:

vboxsync

Message:

Storage/iSCSI: clip read/write block size to sane values, and make sure the caller gets the information how much was actually transferred

File:

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

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

@@ -2758 +2758 @@
     }
 
+    /*
+     * Clip read size to a value which is supported by many targets.
+     */
+    cbToRead = RT_MIN(cbToRead, _256K);
+
     lba = uOffset / pImage->cbSector;
     tls = (uint16_t)(cbToRead / pImage->cbSector);
@@ -2787 +2792 @@
     rc = iscsiCommand(pImage, &sr);
     if (RT_FAILURE(rc))
+    {
         AssertMsgFailed(("iscsiCommand(%s, %#llx) -> %Rrc\n", pImage->pszTargetName, uOffset, rc));
+        *pcbActuallyRead = 0;
+    }
+    else
+        *pcbActuallyRead = cbToRead;
 
 out:
@@ -2821 +2831 @@
     *pcbPreRead = 0;
     *pcbPostRead = 0;
+
+    /*
+     * Clip write size to a value which is supported by many targets.
+     */
+    cbToWrite = RT_MIN(cbToWrite, _256K);
 
     lba = uOffset / pImage->cbSector;