Changeset 38694 in vbox for trunk/src/VBox

Timestamp:

Sep 8, 2011 9:44:08 PM (13 years ago)

Author:

vboxsync

Message:

VSCSI: Fix Solaris guests after adding support VPD pages, the device identification page is mandatory. Fix a crash for a read or write with a 0 transfer length

Location:

trunk/src/VBox/Devices/Storage/VSCSI

Files:

• VSCSILunSbc.cpp (modified) (3 diffs)
• VSCSIVpdPages.h (modified) (1 diff)

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

@@ -64 +64 @@
         rc = vscsiVpdPagePoolInit(&pVScsiLunSbc->VpdPagePool);
 
+    /* Create device identification page - mandatory. */
+    if (RT_SUCCESS(rc))
+    {
+        PVSCSIVPDPAGEDEVID pDevIdPage;
+
+        rc = vscsiVpdPagePoolAllocNewPage(&pVScsiLunSbc->VpdPagePool, VSCSI_VPD_DEVID_NUMBER,
+                                          VSCSI_VPD_DEVID_SIZE, (uint8_t **)&pDevIdPage);
+        if (RT_SUCCESS(rc))
+        {
+            /** @todo: Not conforming to the SPC spec but Solaris needs at least a stub to work. */
+            pDevIdPage->u5PeripheralDeviceType = SCSI_INQUIRY_DATA_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS;
+            pDevIdPage->u3PeripheralQualifier  = SCSI_INQUIRY_DATA_PERIPHERAL_QUALIFIER_CONNECTED;
+            pDevIdPage->u16PageLength          = RT_H2BE_U16(0x0);
+            cVpdPages++;
+        }
+    }
+
     if (   RT_SUCCESS(rc)
         && (pVScsiLun->fFeatures & VSCSI_LUN_FEATURE_UNMAP))
@@ -138 +155 @@
             pVpdPages->u16PageLength          = RT_H2BE_U16(cVpdPages);
 
+            pVpdPages->abVpdPages[idxVpdPage++] = VSCSI_VPD_DEVID_NUMBER;
+
             if (pVScsiLun->fFeatures & VSCSI_LUN_FEATURE_UNMAP)
             {
@@ -479 +498 @@
         {
             rcReq = vscsiLunReqSenseErrorSet(pVScsiLun, pVScsiReq, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR, 0x00);
+            vscsiDeviceReqComplete(pVScsiLun->pVScsiDevice, pVScsiReq, rcReq, false, VINF_SUCCESS);
+        }
+        else if (!cSectorTransfer)
+        {
+            /* A 0 transfer length is not an error. */
+            rcReq = vscsiLunReqSenseOkSet(pVScsiLun, pVScsiReq);
             vscsiDeviceReqComplete(pVScsiLun->pVScsiDevice, pVScsiReq, rcReq, false, VINF_SUCCESS);
         }

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPages.h

@@ -19 +19 @@
 
 #include <iprt/stdint.h>
+
+/** VPD device identification page number. */
+#define VSCSI_VPD_DEVID_NUMBER 0x83
+/** VPD device identification size. */
+#define VSCSI_VPD_DEVID_SIZE   4
+/**
+ * Device identification VPD page data.
+ */
+#pragma pack(1)
+typedef struct VSCSIVPDPAGEDEVID
+{
+    /** Device type. */
+    unsigned u5PeripheralDeviceType : 5;    /**< 0x00 / 00 */
+    /** Qualifier. */
+    unsigned u3PeripheralQualifier  : 3;
+    /** Page number. */
+    unsigned u8PageCode             : 8;
+    /** Page size (Big endian) */
+    unsigned u16PageLength          : 16;
+} VSCSIVPDPAGEDEVID;
+#pragma pack()
+AssertCompileSize(VSCSIVPDPAGEDEVID, VSCSI_VPD_DEVID_SIZE);
+typedef VSCSIVPDPAGEDEVID *PVSCSIVPDPAGEDEVID;
+typedef const VSCSIVPDPAGEDEVID *PCVSCSIVPDPAGEDEVID;
 
 /** VPD supported VPD pages page number. */