Changeset 70685 in vbox

Timestamp:

Jan 22, 2018 7:27:21 PM (7 years ago)

Author:

vboxsync

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

120421

Message:

pdmstorageifs.h,DevAHCI,DrvHostDVD: Restore ability to overwrite the INQUIRY data of attached CD/DVD drives (was lost when converting the AHCI emulation to make use of the VSCSI driver instead of using its own ATAPI emulation)

Location:

trunk

Files:

• include/VBox/vmm/pdmstorageifs.h (modified) (1 diff)
• src/VBox/Devices/Storage/DevAHCI.cpp (modified) (5 diffs)
• src/VBox/Devices/Storage/DrvHostDVD.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/pdmstorageifs.h

@@ -227 +227 @@
                                                        uint32_t *piInstance, uint32_t *piLUN));
 
+
+    /**
+     * Queries the vendor and product ID and revision to report for INQUIRY commands in underlying devices.
+     *
+     * @returns VBox status code.
+     * @param   pInterface      Pointer to this interface.
+     * @param   ppszVendorId    Where to store the pointer to the vendor ID string to report.
+     * @param   ppszProductId   Where to store the pointer to the product ID string to report.
+     * @param   ppszRevision    Where to store the pointer to the revision string to report.
+     *
+     * @note The strings for the inquiry data are stored in the storage controller rather than in the device
+     *       because if device attachments change (virtual CD/DVD drive versus host drive) there is currently no
+     *       way to keep the INQUIRY data in extradata keys without causing trouble when the attachment is changed.
+     *       Also Main currently doesn't has any settings for the attachment to store such information in the settings
+     *       properly. Last reason (but not the most important one) is to stay compatible with older versions
+     *       where the drive emulation was in AHCI but it now uses VSCSI and the settings overwrite should still work.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnQueryScsiInqStrings, (PPDMIMEDIAPORT pInterface, const char **ppszVendorId,
+                                                       const char **ppszProductId, const char **ppszRevision));
+
 } PDMIMEDIAPORT;
 /** PDMIMEDIAPORT interface ID. */
-#define PDMIMEDIAPORT_IID                           "9f7e8c9e-6d35-4453-bbef-1f78033174d6"
+#define PDMIMEDIAPORT_IID                           "77180ab8-6485-454f-b440-efca322b7bd7"
 
 /** Pointer to a media interface. */

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

@@ -128 +128 @@
 #define AHCI_FIRMWARE_REVISION_LENGTH         8
 #define AHCI_MODEL_NUMBER_LENGTH             40
+#define AHCI_ATAPI_INQUIRY_VENDOR_ID_LENGTH   8
+#define AHCI_ATAPI_INQUIRY_PRODUCT_ID_LENGTH 16
+#define AHCI_ATAPI_INQUIRY_REVISION_LENGTH    4
 
 /** ATAPI sense info size. */
@@ -431 +434 @@
     /** The model number to use for IDENTIFY DEVICE commands. */
     char                            szModelNumber[AHCI_MODEL_NUMBER_LENGTH+1]; /** < one extra byte for termination */
+    /** The vendor identification string for SCSI INQUIRY commands. */
+    char                            szInquiryVendorId[AHCI_ATAPI_INQUIRY_VENDOR_ID_LENGTH+1];
+    /** The product identification string for SCSI INQUIRY commands. */
+    char                            szInquiryProductId[AHCI_ATAPI_INQUIRY_PRODUCT_ID_LENGTH+1];
+    /** The revision string for SCSI INQUIRY commands. */
+    char                            szInquiryRevision[AHCI_ATAPI_INQUIRY_REVISION_LENGTH+1];
     /** Error counter */
     uint32_t                        cErrors;
@@ -2615 +2624 @@
     *piLUN = pAhciPort->iLUN;
 
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{PDMIMEDIAPORT,pfnQueryScsiInqStrings}
+ */
+static DECLCALLBACK(int) ahciR3PortQueryScsiInqStrings(PPDMIMEDIAPORT pInterface, const char **ppszVendorId,
+                                                       const char **ppszProductId, const char **ppszRevision)
+{
+    PAHCIPort pAhciPort = PDMIMEDIAPORT_2_PAHCIPORT(pInterface);
+
+    if (ppszVendorId)
+        *ppszVendorId = &pAhciPort->szInquiryVendorId[0];
+    if (ppszProductId)
+        *ppszProductId = &pAhciPort->szInquiryProductId[0];
+    if (ppszRevision)
+        *ppszRevision = &pAhciPort->szInquiryRevision[0];
     return VINF_SUCCESS;
 }
@@ -5510 +5536 @@
                     N_("AHCI configuration error: \"LogicalSectorsPerPhysical\" must be between 0 and 15"));
 
+    /* There are three other identification strings for CD drives used for INQUIRY */
+    if (pAhciPort->fATAPI)
+    {
+        rc = CFGMR3QueryStringDef(pCfgNode, "ATAPIVendorId", pAhciPort->szInquiryVendorId, sizeof(pAhciPort->szInquiryVendorId),
+                                  "VBOX");
+        if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
+                return PDMDEV_SET_ERROR(pDevIns, VERR_INVALID_PARAMETER,
+                                N_("AHCI configuration error: \"ATAPIVendorId\" is longer than 16 bytes"));
+            return PDMDEV_SET_ERROR(pDevIns, rc,
+                    N_("AHCI configuration error: failed to read \"ATAPIVendorId\" as string"));
+        }
+
+        rc = CFGMR3QueryStringDef(pCfgNode, "ATAPIProductId", pAhciPort->szInquiryProductId, sizeof(pAhciPort->szInquiryProductId),
+                                  "CD-ROM");
+        if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
+                return PDMDEV_SET_ERROR(pDevIns, VERR_INVALID_PARAMETER,
+                                N_("AHCI configuration error: \"ATAPIProductId\" is longer than 16 bytes"));
+            return PDMDEV_SET_ERROR(pDevIns, rc,
+                    N_("AHCI configuration error: failed to read \"ATAPIProductId\" as string"));
+        }
+
+        rc = CFGMR3QueryStringDef(pCfgNode, "ATAPIRevision", pAhciPort->szInquiryRevision, sizeof(pAhciPort->szInquiryRevision),
+                                  "1.0");
+        if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
+                return PDMDEV_SET_ERROR(pDevIns, VERR_INVALID_PARAMETER,
+                                N_("AHCI configuration error: \"ATAPIRevision\" is longer than 4 bytes"));
+            return PDMDEV_SET_ERROR(pDevIns, rc,
+                    N_("AHCI configuration error: failed to read \"ATAPIRevision\" as string"));
+        }
+    }
+
     return rc;
 }
@@ -6052 +6115 @@
         pAhciPort->IMediaExPort.pfnMediumEjected           = ahciR3MediumEjected;
         pAhciPort->IPort.pfnQueryDeviceLocation            = ahciR3PortQueryDeviceLocation;
+        pAhciPort->IPort.pfnQueryScsiInqStrings            = ahciR3PortQueryScsiInqStrings;
         pAhciPort->fWrkThreadSleeping                      = true;
 

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

@@ -53 +53 @@
     /** ATAPI sense data. */
     uint8_t                 abATAPISense[ATAPI_SENSE_SIZE];
+    /** Flag whether to overwrite the inquiry data with our emulated settings. */
+    bool                    fInquiryOverwrite;
 } DRVHOSTDVD;
 /** Pointer to the host DVD driver instance data. */
@@ -347 +349 @@
                Assert(cbXferCur <= cbXfer);
 
-                if (pbCdb[0] == SCSI_INQUIRY)
+                if (   pbCdb[0] == SCSI_INQUIRY
+                    && pThis->fInquiryOverwrite)
                 {
+                    const char *pszInqVendorId  = "VBOX";
+                    const char *pszInqProductId = "CD-ROM";
+                    const char *pszInqRevision  = "1.0";
+
+                    if (pThis->Core.pDrvMediaPort->pfnQueryScsiInqStrings)
+                    {
+                        rc = pThis->Core.pDrvMediaPort->pfnQueryScsiInqStrings(pThis->Core.pDrvMediaPort, &pszInqVendorId,
+                                                                               &pszInqProductId, &pszInqRevision);
+                        AssertRC(rc);
+                    }
                     /* Make sure that the real drive cannot be identified.
                      * Motivation: changing the VM configuration should be as
                      *             invisible as possible to the guest. */
                     if (cbXferCur >= 8 + 8)
-                        scsiPadStr((uint8_t *)pvBuf + 8, "VBOX", 8);
+                        scsiPadStr((uint8_t *)pvBuf + 8, pszInqVendorId, 8);
                     if (cbXferCur >= 16 + 16)
-                        scsiPadStr((uint8_t *)pvBuf + 16, "CD-ROM", 16);
+                        scsiPadStr((uint8_t *)pvBuf + 16, pszInqProductId, 16);
                     if (cbXferCur >= 32 + 4)
-                        scsiPadStr((uint8_t *)pvBuf + 32, "1.0", 4);
+                        scsiPadStr((uint8_t *)pvBuf + 32, pszInqRevision, 4);
                 }
 
@@ -433 +446 @@
     LogFlow(("drvHostDvdConstruct: iInstance=%d\n", pDrvIns->iInstance));
 
+    int rc = CFGMR3QueryBoolDef(pCfg, "InquiryOverwrite", &pThis->fInquiryOverwrite, true);
+    if (RT_FAILURE(rc))
+        return PDMDRV_SET_ERROR(pDrvIns, rc,
+                                N_("HostDVD configuration error: failed to read \"InquiryOverwrite\" as boolean"));
+
     bool fPassthrough;
-    int rc = CFGMR3QueryBool(pCfg, "Passthrough", &fPassthrough);
+    rc = CFGMR3QueryBool(pCfg, "Passthrough", &fPassthrough);
     if (RT_SUCCESS(rc) && fPassthrough)
     {
@@ -448 +466 @@
      * Init instance data.
      */
-    rc = DRVHostBaseInit(pDrvIns, pCfg, "Path\0Interval\0Locked\0BIOSVisible\0AttachFailError\0Passthrough\0",
+    rc = DRVHostBaseInit(pDrvIns, pCfg, "Path\0Interval\0Locked\0BIOSVisible\0AttachFailError\0Passthrough\0InquiryOverwrite\0",
                          PDMMEDIATYPE_DVD);
     LogFlow(("drvHostDvdConstruct: returns %Rrc\n", rc));