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

Timestamp:

Sep 4, 2019 6:34:01 PM (6 years ago)

Author:

vboxsync

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

133113

Message:

VSCSI: Set the correct transfer size for INQUIRY commands depending on whether the EVPD bit is set

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

• VSCSILunSbc.cpp (modified) (2 diffs)
• VSCSIVpdPagePool.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp

@@ -202 +202 @@
         {
             vscsiReqSetXferDir(pVScsiReq, VSCSIXFERDIR_T2I);
-            vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), scsiBE2H_U16(&pVScsiReq->pbCDB[3])));
 
             /* Check for EVPD bit. */
@@ -224 +223 @@
                 SCSIINQUIRYDATA ScsiInquiryReply;
 
+                vscsiReqSetXferSize(pVScsiReq, RT_MIN(sizeof(SCSIINQUIRYDATA), scsiBE2H_U16(&pVScsiReq->pbCDB[3])));
                 memset(&ScsiInquiryReply, 0, sizeof(ScsiInquiryReply));
 

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPagePool.cpp

@@ -108 +108 @@
         if (pPage->abPage[1] == uPage)
         {
+            vscsiReqSetXferSize(pVScsiReq, pPage->cbPage);
             RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, &pPage->abPage[0], pPage->cbPage);
             return VINF_SUCCESS;