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

Timestamp:

Jul 12, 2018 7:15:10 PM (6 years ago)

Author:

vboxsync

Message:

Devices/Storage/DrvDiskIntegrity: Add some missing interfaces to handle being placed inside a driver chain for a CD/DVD drive

File:

• trunk/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp (modified) (6 diffs)

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

@@ -139 +139 @@
  *
  * @implements  PDMIMEDIA
+ * @implements  PDMIMEDIAPORT
+ * @implements  PDMIMEDIAEX
+ * @implements  PDMIMEDIAEXPORT
+ * @implements  PDMIMEDIAMOUNT
+ * @implements  PDMIMEDIAMOUNTNOTIFY
  */
 typedef struct DRVDISKINTEGRITY
@@ -164 +169 @@
     /** Our extended media interface */
     PDMIMEDIAEX             IMediaEx;
+
+    /** The mount interface below. */
+    PPDMIMOUNT              pDrvMount;
+    /** Our mount interface */
+    PDMIMOUNT               IMount;
+
+    /** The mount notify interface above. */
+    PPDMIMOUNTNOTIFY        pDrvMountNotify;
+    /** Our mount notify interface. */
+    PDMIMOUNTNOTIFY         IMountNotify;
 
     /** Flag whether consistency checks are enabled. */
@@ -1623 +1638 @@
 }
 
+/* -=-=-=-=- IMount -=-=-=-=- */
+
+/** @interface_method_impl{PDMIMOUNT,pfnUnmount} */
+static DECLCALLBACK(int) drvdiskintUnmount(PPDMIMOUNT pInterface, bool fForce, bool fEject)
+{
+    PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMount);
+    return pThis->pDrvMount->pfnUnmount(pThis->pDrvMount, fForce, fEject);
+}
+
+/** @interface_method_impl{PDMIMOUNT,pfnIsMounted} */
+static DECLCALLBACK(bool) drvdiskintIsMounted(PPDMIMOUNT pInterface)
+{
+    PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMount);
+    return pThis->pDrvMount->pfnIsMounted(pThis->pDrvMount);
+}
+
+/** @interface_method_impl{PDMIMOUNT,pfnLock} */
+static DECLCALLBACK(int) drvdiskintLock(PPDMIMOUNT pInterface)
+{
+    PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMount);
+    return pThis->pDrvMount->pfnLock(pThis->pDrvMount);
+}
+
+/** @interface_method_impl{PDMIMOUNT,pfnUnlock} */
+static DECLCALLBACK(int) drvdiskintUnlock(PPDMIMOUNT pInterface)
+{
+    PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMount);
+    return pThis->pDrvMount->pfnUnlock(pThis->pDrvMount);
+}
+
+/** @interface_method_impl{PDMIMOUNT,pfnIsLocked} */
+static DECLCALLBACK(bool) drvdiskintIsLocked(PPDMIMOUNT pInterface)
+{
+    PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMount);
+    return pThis->pDrvMount->pfnIsLocked(pThis->pDrvMount);
+}
+
+/* -=-=-=-=- IMountNotify -=-=-=-=- */
+
+/** @interface_method_impl{PDMIMOUNTNOTIFY,pfnMountNotify} */
+static DECLCALLBACK(void) drvdiskintMountNotify(PPDMIMOUNTNOTIFY pInterface)
+{
+    PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMountNotify);
+    pThis->pDrvMountNotify->pfnMountNotify(pThis->pDrvMountNotify);
+}
+
+/** @interface_method_impl{PDMIMOUNTNOTIFY,pfnUnmountNotify} */
+static DECLCALLBACK(void) drvdiskintUnmountNotify(PPDMIMOUNTNOTIFY pInterface)
+{
+    PDRVDISKINTEGRITY pThis = RT_FROM_MEMBER(pInterface, DRVDISKINTEGRITY, IMountNotify);
+    pThis->pDrvMountNotify->pfnUnmountNotify(pThis->pDrvMountNotify);
+}
+
 /* -=-=-=-=- IBase -=-=-=-=- */
 
@@ -1638 +1706 @@
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMEDIAEXPORT, &pThis->IMediaExPort);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMEDIAEX, pThis->pDrvMediaEx ? &pThis->IMediaEx : NULL);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMOUNT, pThis->pDrvMount ? &pThis->IMount : NULL);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMOUNTNOTIFY, &pThis->IMountNotify);
     return NULL;
 }
@@ -1841 +1911 @@
     pThis->IMediaExPort.pfnIoReqStateChanged       = drvdiskintIoReqStateChanged;
 
+    /* IMount */
+    pThis->IMount.pfnUnmount                       = drvdiskintUnmount;
+    pThis->IMount.pfnIsMounted                     = drvdiskintIsMounted;
+    pThis->IMount.pfnLock                          = drvdiskintLock;
+    pThis->IMount.pfnUnlock                        = drvdiskintUnlock;
+    pThis->IMount.pfnIsLocked                      = drvdiskintIsLocked;
+
+    /* IMountNotify */
+    pThis->IMountNotify.pfnMountNotify             = drvdiskintMountNotify;
+    pThis->IMountNotify.pfnUnmountNotify           = drvdiskintUnmountNotify;
+
     /* Query the media port interface above us. */
     pThis->pDrvMediaPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIMEDIAPORT);
@@ -1871 +1952 @@
 
     pThis->pDrvMediaEx = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIAEX);
+    pThis->pDrvMount   = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMOUNT);
 
     if (pThis->pDrvMedia->pfnDiscard)