Changeset 65078 in vbox for trunk/src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp

Timestamp:

Jan 3, 2017 1:24:58 PM (8 years ago)

Author:

vboxsync

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

112580

Message:

Devices/Storage/DrvHost*: Avoid using SCSI_MAX_BUFFER_SIZE (will be removed in the future) but query the maximum supported buffer size through a dedicated method from the platform specific code

File:

• trunk/src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp

@@ -27 +27 @@
 #include <iprt/log.h>
 
+/** Maximum buffer size supported by the CAM subsystem. */
+#define FBSD_SCSI_MAX_BUFFER_SIZE (64 * _1K)
+
 /**
  * Host backend specific data.
@@ -149 +152 @@
 
 
+DECLHIDDEN(size_t) drvHostBaseScsiCmdGetBufLimitOs(PDRVHOSTBASE pThis)
+{
+    RT_NOREF(pThis);
+
+    return FBSD_SCSI_MAX_BUFFER_SIZE;
+}
+
+
 DECLHIDDEN(int) drvHostBaseGetMediaSizeOs(PDRVHOSTBASE pThis, uint64_t *pcb)
 {
@@ -194 +205 @@
             const uint32_t  LBA       = off / pThis->Os.cbBlock;
             AssertReturn(!(off % pThis->Os.cbBlock), VERR_INVALID_PARAMETER);
-            uint32_t        cbRead32  =   cbRead > SCSI_MAX_BUFFER_SIZE
-                                        ? SCSI_MAX_BUFFER_SIZE
+            uint32_t        cbRead32  =   cbRead > FBSD_SCSI_MAX_BUFFER_SIZE
+                                        ? FBSD_SCSI_MAX_BUFFER_SIZE
                                         : (uint32_t)cbRead;
             const uint32_t  cBlocks   = cbRead32 / pThis->Os.cbBlock;