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

Timestamp:

Jan 22, 2018 7:38:45 PM (7 years ago)

Author:

vboxsync

Message:

VSCSI,DrvSCSI: Add method to query INQUIRY related data from the outside to overwrite defaults

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvSCSI.cpp (modified) (2 diffs)
• VSCSI/VSCSIInternal.h (modified) (2 diffs)
• VSCSI/VSCSILunMmc.cpp (modified) (1 diff)
• VSCSI/VSCSILunSbc.cpp (modified) (1 diff)

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

@@ -444 +444 @@
 }
 
+/**
+ * @interface_method_impl{VSCSILUNIOCALLBACKS,pfnVScsiLunQueryInqStrings}
+ */
+static DECLCALLBACK(int) drvscsiQueryInqStrings(VSCSILUN hVScsiLun, void *pvScsiLunUser, const char **ppszVendorId,
+                                                const char **ppszProductId, const char **ppszProductLevel)
+{
+    RT_NOREF(hVScsiLun);
+    PDRVSCSI pThis = (PDRVSCSI)pvScsiLunUser;
+
+    if (pThis->pDevMediaPort->pfnQueryScsiInqStrings)
+        return pThis->pDevMediaPort->pfnQueryScsiInqStrings(pThis->pDevMediaPort, ppszVendorId,
+                                                            ppszProductId, ppszProductLevel);
+
+    return VERR_NOT_FOUND;
+}
 
 /* -=-=-=-=- IPortEx -=-=-=-=- */
@@ -1416 +1431 @@
     pThis->VScsiIoCallbacks.pfnVScsiLunGetFeatureFlags                   = drvscsiGetFeatureFlags;
     pThis->VScsiIoCallbacks.pfnVScsiLunMediumSetLock                     = drvscsiSetLock;
+    pThis->VScsiIoCallbacks.pfnVScsiLunQueryInqStrings                   = drvscsiQueryInqStrings;
 
     rc = VSCSIDeviceCreate(&pThis->hVScsiDevice, drvscsiIoReqVScsiReqCompleted, pThis);

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

@@ -629 +629 @@
  * @returns VBox status code.
  * @param   pVScsiLun   The LUN.
- * @param   pVScsiIoReq The I/O request to enqueue.
+ * @param   pfFeatures  Where to sthre supported flags on success.
  */
 DECLINLINE(int) vscsiLunGetFeatureFlags(PVSCSILUNINT pVScsiLun, uint64_t *pfFeatures)
@@ -639 +639 @@
 
 /**
+ * Wrapper for the query INQUIRY strings I/O callback.
+ *
+ * @returns VBox status code.
+ * @param   pVScsiLun   The LUN.
+ * @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   ppszProductLevel Where to store the pointer to the revision string to report.
+ */
+DECLINLINE(int) vscsiLunQueryInqStrings(PVSCSILUNINT pVScsiLun, const char **ppszVendorId,
+                                        const char **ppszProductId, const char **ppszProductLevel)
+{
+    if (pVScsiLun->pVScsiLunIoCallbacks->pfnVScsiLunQueryInqStrings)
+    {
+        return pVScsiLun->pVScsiLunIoCallbacks->pfnVScsiLunQueryInqStrings(pVScsiLun,
+                                                                           pVScsiLun->pvVScsiLunUser,
+                                                                           ppszVendorId, ppszProductId,
+                                                                           ppszProductLevel);
+    }
+
+    return VERR_NOT_FOUND;
+}
+
+/**
  * Wrapper around vscsiReqSenseOkSet()
  */

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

@@ -1103 +1103 @@
                 ScsiInquiryReply.fCmdQue                = 1;    /* Command queuing supported. */
                 ScsiInquiryReply.fWBus16                = 1;
-                scsiPadStrS(ScsiInquiryReply.achVendorId, "VBOX", 8);
-                scsiPadStrS(ScsiInquiryReply.achProductId, "CD-ROM", 16);
-                scsiPadStrS(ScsiInquiryReply.achProductLevel, "1.0", 4);
+
+                const char *pszVendorId = "VBOX";
+                const char *pszProductId = "CD-ROM";
+                const char *pszProductLevel = "1.0";
+                int rcTmp = vscsiLunQueryInqStrings(pVScsiLun, &pszVendorId, &pszProductId, &pszProductLevel);
+                Assert(RT_SUCCESS(rcTmp) || rcTmp == VERR_NOT_FOUND);
+
+                scsiPadStrS(ScsiInquiryReply.achVendorId, pszVendorId, 8);
+                scsiPadStrS(ScsiInquiryReply.achProductId, pszProductId, 16);
+                scsiPadStrS(ScsiInquiryReply.achProductLevel, pszProductLevel, 4);
 
                 RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, (uint8_t *)&ScsiInquiryReply, sizeof(SCSIINQUIRYDATA));

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

@@ -231 +231 @@
                 ScsiInquiryReply.fCmdQue                = 1;    /* Command queuing supported. */
                 ScsiInquiryReply.fWBus16                = 1;
-                scsiPadStrS(ScsiInquiryReply.achVendorId, "VBOX", 8);
-                scsiPadStrS(ScsiInquiryReply.achProductId, "HARDDISK", 16);
-                scsiPadStrS(ScsiInquiryReply.achProductLevel, "1.0", 4);
+
+                const char *pszVendorId = "VBOX";
+                const char *pszProductId = "HARDDISK";
+                const char *pszProductLevel = "1.0";
+                int rcTmp = vscsiLunQueryInqStrings(pVScsiLun, &pszVendorId, &pszProductId, &pszProductLevel);
+                Assert(RT_SUCCESS(rcTmp) || rcTmp == VERR_NOT_FOUND);
+
+                scsiPadStrS(ScsiInquiryReply.achVendorId, pszVendorId, 8);
+                scsiPadStrS(ScsiInquiryReply.achProductId, pszProductId, 16);
+                scsiPadStrS(ScsiInquiryReply.achProductLevel, pszProductLevel, 4);
 
                 RTSgBufCopyFromBuf(&pVScsiReq->SgBuf, (uint8_t *)&ScsiInquiryReply, sizeof(SCSIINQUIRYDATA));