Changeset 43517 in vbox for trunk/src/VBox

Timestamp:

Oct 2, 2012 4:34:27 PM (12 years ago)

Author:

vboxsync

Message:

DrvSCSI: Connect some of the dots for removable media change (not yet complete).

File:

• trunk/src/VBox/Devices/Storage/DrvSCSI.cpp (modified) (7 diffs)

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

@@ -71 +71 @@
     /** The optional block async port interface. */
     PDMIBLOCKASYNCPORT      IPortAsync;
-#if 0 /* these interfaces aren't implemented */
     /** The mount notify interface. */
     PDMIMOUNTNOTIFY         IMountNotify;
-#endif
     /** Fallback status LED state for this drive.
      * This is used in case the device doesn't has a LED interface. */
@@ -115 +113 @@
 /** Converts a pointer to DRVSCSI::IPortAsync to a PDRVSCSI. */
 #define PDMIBLOCKASYNCPORT_2_DRVSCSI(pInterface) ( (PDRVSCSI)((uintptr_t)pInterface - RT_OFFSETOF(DRVSCSI, IPortAsync)) )
+/** Converts a pointer to DRVSCSI::IMountNotify to PDRVSCSI. */
+#define PDMIMOUNTNOTIFY_2_DRVSCSI(pInterface)    ( (PDRVSCSI)((uintptr_t)pInterface - RT_OFFSETOF(DRVSCSI, IMountNotify)) )
 /** Converts a pointer to DRVSCSI::IPort to a PDRVSCSI. */
 #define PDMIBLOCKPORT_2_DRVSCSI(pInterface)      ( (PDRVSCSI)((uintptr_t)pInterface - RT_OFFSETOF(DRVSCSI, IPort)) )
@@ -636 +636 @@
     PDRVSCSI    pThis   = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
 
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMOUNT, pThis->pDrvMount);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMISCSICONNECTOR, &pThis->ISCSIConnector);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBLOCKPORT, &pThis->IPort);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMOUNTNOTIFY, &pThis->IMountNotify);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBLOCKASYNCPORT, &pThis->IPortAsync);
     return NULL;
@@ -650 +652 @@
     return pThis->pDevScsiPort->pfnQueryDeviceLocation(pThis->pDevScsiPort, ppcszController,
                                                        piInstance, piLUN);
+}
+
+/**
+ * Called when media is mounted.
+ *
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ */
+static DECLCALLBACK(void) drvscsiMountNotify(PPDMIMOUNTNOTIFY pInterface)
+{
+    PDRVSCSI pThis = PDMIMOUNTNOTIFY_2_DRVSCSI(pInterface);
+    LogFlowFunc(("mounting LUN#%p\n", pThis->hVScsiLun));
+
+    /* Ignore the call if we're called while being attached. */
+    if (!pThis->pDrvBlock)
+        return;
+
+    //@todo: Notify of media change? Update media size? 
+}
+
+/**
+ * Called when media is unmounted 
+ *  
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ */
+static DECLCALLBACK(void) drvscsiUnmountNotify(PPDMIMOUNTNOTIFY pInterface)
+{
+    PDRVSCSI pThis = PDMIMOUNTNOTIFY_2_DRVSCSI(pInterface);
+    LogFlowFunc(("unmounting LUN#%p\n", pThis->hVScsiLun));
+
+    //@todo: Notify of media change? Report that no media is present?
 }
 
@@ -832 +864 @@
     pDrvIns->IBase.pfnQueryInterface            = drvscsiQueryInterface;
 
+    pThis->IMountNotify.pfnMountNotify          = drvscsiMountNotify;
+    pThis->IMountNotify.pfnUnmountNotify        = drvscsiUnmountNotify;
     pThis->IPort.pfnQueryDeviceLocation         = drvscsiQueryDeviceLocation;
     pThis->IPortAsync.pfnTransferCompleteNotify = drvscsiTransferCompleteNotify;
@@ -897 +931 @@
 
     PDMBLOCKTYPE enmType = pThis->pDrvBlock->pfnGetType(pThis->pDrvBlock);
-    if (enmType != PDMBLOCKTYPE_HARD_DISK)
+    VSCSILUNTYPE enmLunType;
+    switch (enmType) 
+    {
+    case PDMBLOCKTYPE_HARD_DISK:
+        enmLunType = VSCSILUNTYPE_SBC;
+        break;
+    case PDMBLOCKTYPE_CDROM:
+    case PDMBLOCKTYPE_DVD:
+        enmLunType = VSCSILUNTYPE_MMC;
+        break;
+    default:
         return PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_UNSUPPORTED_BLOCK_TYPE, RT_SRC_POS,
-                                   N_("Only hard disks are currently supported as SCSI devices (enmType=%d)"),
+                                   N_("Only hard disks and CD/DVD-ROMs are currently supported as SCSI devices (enmType=%d)"),
                                    enmType);
+    }
+    if (    (   enmType == PDMBLOCKTYPE_DVD
+             || enmType == PDMBLOCKTYPE_CDROM)
+        &&  !pThis->pDrvMount)
+    {
+        AssertMsgFailed(("Internal error: cdrom without a mountable interface\n"));
+        return VERR_INTERNAL_ERROR;
+    }
 
     /* Create VSCSI device and LUN. */
@@ -909 +961 @@
     rc = VSCSIDeviceCreate(&pThis->hVScsiDevice, drvscsiVScsiReqCompleted, pThis);
     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI device rc=%Rrc\n"), rc);
-    rc = VSCSILunCreate(&pThis->hVScsiLun, VSCSILUNTYPE_SBC, &pThis->VScsiIoCallbacks,
+    rc = VSCSILunCreate(&pThis->hVScsiLun, enmLunType, &pThis->VScsiIoCallbacks,
                         pThis);
     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI LUN rc=%Rrc\n"), rc);