Changeset 103902 in vbox for trunk/src/VBox/Devices/Storage/VSCSI

Timestamp:

Mar 18, 2024 5:11:22 PM (12 months ago)

Author:

vboxsync

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

162274

Message:

VSCSI: Fixed a problem with potentially unset cbSector in READ CD command. Added more logging.

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

• VSCSIDevice.cpp (modified) (2 diffs)
• VSCSILunMmc.cpp (modified) (3 diffs)
• VSCSISense.cpp (modified) (3 diffs)

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

@@ -60 +60 @@
  * @returns Flag whether we could handle the request.
  * @param   pVScsiDevice    The virtual SCSI device instance.
- * @param   pVScsiReq       The SCSi request.
+ * @param   pVScsiReq       The SCSI request.
  * @param   prcReq          The final return value if the request was handled.
  */
@@ -67 +67 @@
 {
     bool fProcessed = true;
+
+    LogFlowFunc(("CDB: %.*Rhxs Cmd: %s\n", pVScsiReq->cbCDB, pVScsiReq->pbCDB, SCSICmdText(pVScsiReq->pbCDB[0])));
 
     switch (pVScsiReq->pbCDB[0])

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

@@ -1297 +1297 @@
                             break;
                         case 0x10:
-                            /* normal read */
+                            /* user data only (normal read) */
                             enmTxDir = VSCSIIOREQTXDIR_READ;
                             cbSector = _2K;
@@ -1303 +1303 @@
                         case 0xf8:
                         {
+                            /* everything (sync, headers, user data, ECC) */
                             if (cbSectorRegion == 2048)
                             {
@@ -1351 +1352 @@
                                     if (paSegsNew)
                                     {
+                                        Assert(cbSectorRegion == 2048);
+                                        cbSector = cbSectorRegion;
                                         enmTxDir = VSCSIIOREQTXDIR_READ;
 

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

@@ -45 +45 @@
 int vscsiReqSenseOkSet(PVSCSISENSE pVScsiSense, PVSCSIREQINT pVScsiReq)
 {
+    LogFlowFunc(("STATUS OK\n"));
     memset(pVScsiSense->abSenseBuf, 0, sizeof(pVScsiSense->abSenseBuf));
 
@@ -64 +65 @@
 int vscsiReqSenseErrorSet(PVSCSISENSE pVScsiSense, PVSCSIREQINT pVScsiReq, uint8_t uSCSISenseKey, uint8_t uSCSIASC, uint8_t uSCSIASCQ)
 {
+    LogFlowFunc(("CHECK CONDITION: %s %s\n", SCSISenseText(uSCSISenseKey), SCSISenseExtText(uSCSIASC, uSCSIASCQ)));
     memset(pVScsiSense->abSenseBuf, 0, sizeof(pVScsiSense->abSenseBuf));
     pVScsiSense->abSenseBuf[0] = (1 << 7) | SCSI_SENSE_RESPONSE_CODE_CURR_FIXED; /* Fixed format */
@@ -82 +84 @@
 int vscsiReqSenseErrorInfoSet(PVSCSISENSE pVScsiSense, PVSCSIREQINT pVScsiReq, uint8_t uSCSISenseKey, uint8_t uSCSIASC, uint8_t uSCSIASCQ, uint32_t uInfo)
 {
+    LogFlowFunc(("CHECK CONDITION: %s %s uInfo:%02x\n", SCSISenseText(uSCSISenseKey), SCSISenseExtText(uSCSIASC, uSCSIASCQ), uInfo));
     memset(pVScsiSense->abSenseBuf, 0, sizeof(pVScsiSense->abSenseBuf));
     pVScsiSense->abSenseBuf[0] = RT_BIT(7) | SCSI_SENSE_RESPONSE_CODE_CURR_FIXED; /* Fixed format */