Changeset 24169 in vbox for trunk/src/VBox

Timestamp:

Oct 29, 2009 4:33:48 PM (16 years ago)

Author:

vboxsync

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

54108

Message:

ATA/ATAPI: Add more keys to overwrite VPD data for CD drives

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevATA.cpp (modified) (4 diffs)
• testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)

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

@@ -108 +108 @@
 #define ATA_FIRMWARE_REVISION_LENGTH  8
 #define ATA_MODEL_NUMBER_LENGTH      40
+#define ATAPI_INQUIRY_VENDOR_ID      16
+#define ATAPI_INQUIRY_PRODUCT_ID     16
+#define ATAPI_INQUIRY_REVISION        4
 
 /*******************************************************************************
@@ -290 +293 @@
     /** The model number to use for IDENTIFY DEVICE commands. */
     char                                szModelNumber[ATA_MODEL_NUMBER_LENGTH+1];
-
-    uint8_t                             abAlignment3[HC_ARCH_BITS == 32 ? 7 : 7];
+    /** The vendor identification string for SCSI INQUIRY commands. */
+    char                                szInquiryVendorId[ATAPI_INQUIRY_VENDOR_ID+1];
+    /** The product identification string for SCSI INQUIRY commands. */
+    char                                szInquiryProductId[ATAPI_INQUIRY_PRODUCT_ID+1];
+    /** The revision string for SCSI INQUIRY commands. */
+    char                                szInquiryRevision[ATAPI_INQUIRY_REVISION+1];
+
+    uint8_t                             abAlignment3[7];
 } ATADevState;
 AssertCompileMemberAlignment(ATADevState, cTotalSectors, 8);
@@ -2372 +2381 @@
     pbBuf[6] = 0; /* reserved */
     pbBuf[7] = 0; /* reserved */
-    ataSCSIPadStr(pbBuf + 8, "VBOX", 8);
-    ataSCSIPadStr(pbBuf + 16, "CD-ROM", 16);
-    ataSCSIPadStr(pbBuf + 32, "1.0", 4);
+    ataSCSIPadStr(pbBuf + 8, s->szInquiryVendorId, 8);
+    ataSCSIPadStr(pbBuf + 16, s->szInquiryProductId, 16);
+    ataSCSIPadStr(pbBuf + 32, s->szInquiryRevision, 4);
     s->iSourceSink = ATAFN_SS_NULL;
     atapiCmdOK(s);
@@ -6789 +6798 @@
                                     N_("PIIX3 configuration error: failed to read \"ModelNumber\" as string"));
                     }
+
+                    /* There are three other identification strings for CD drives used for INQUIRY */
+                    if (pIf->fATAPI)
+                    {
+                        rc = CFGMR3QueryStringDef(pCfgNode, "ATAPIVendorId", pIf->szInquiryVendorId, sizeof(pIf->szInquiryVendorId),
+                                                  "VBOX");
+                        if (RT_FAILURE(rc))
+                        {
+                            if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
+                                return PDMDEV_SET_ERROR(pDevIns, VERR_INVALID_PARAMETER,
+                                           N_("PIIX3 configuration error: \"ATAPIVendorId\" is longer than 16 bytes"));
+                            return PDMDEV_SET_ERROR(pDevIns, rc,
+                                        N_("PIIX3 configuration error: failed to read \"ATAPIVendorId\" as string"));
+                        }
+
+                        rc = CFGMR3QueryStringDef(pCfgNode, "ATAPIProductId", pIf->szInquiryProductId, sizeof(pIf->szInquiryProductId),
+                                                  "CD-ROM");
+                        if (RT_FAILURE(rc))
+                        {
+                            if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
+                                return PDMDEV_SET_ERROR(pDevIns, VERR_INVALID_PARAMETER,
+                                           N_("PIIX3 configuration error: \"ATAPIProductId\" is longer than 16 bytes"));
+                            return PDMDEV_SET_ERROR(pDevIns, rc,
+                                        N_("PIIX3 configuration error: failed to read \"ATAPIProductId\" as string"));
+                        }
+
+                        rc = CFGMR3QueryStringDef(pCfgNode, "ATAPIRevision", pIf->szInquiryRevision, sizeof(pIf->szInquiryRevision),
+                                                  "1.0");
+                        if (RT_FAILURE(rc))
+                        {
+                            if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
+                                return PDMDEV_SET_ERROR(pDevIns, VERR_INVALID_PARAMETER,
+                                           N_("PIIX3 configuration error: \"ATAPIRevision\" is longer than 4 bytes"));
+                            return PDMDEV_SET_ERROR(pDevIns, rc,
+                                        N_("PIIX3 configuration error: failed to read \"ATAPIRevision\" as string"));
+                        }
+                    }
                 }
 

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -740 +740 @@
     GEN_CHECK_OFF(ATADevState, szModelNumber);
     GEN_CHECK_OFF(ATADevState, szModelNumber[ATA_MODEL_NUMBER_LENGTH]);
+    GEN_CHECK_OFF(ATADevState, szInquiryVendorId);
+    GEN_CHECK_OFF(ATADevState, szInquiryVendorId[ATAPI_INQUIRY_VENDOR_ID]);
+    GEN_CHECK_OFF(ATADevState, szInquiryProductId);
+    GEN_CHECK_OFF(ATADevState, szInquiryProductId[ATAPI_INQUIRY_PRODUCT_ID]);
+    GEN_CHECK_OFF(ATADevState, szInquiryRevision);
+    GEN_CHECK_OFF(ATADevState, szInquiryRevision[ATAPI_INQUIRY_REVISION]);
     GEN_CHECK_SIZE(ATATransferRequest);
     GEN_CHECK_OFF(ATATransferRequest, iIf);