Changeset 64409 in vbox for trunk/src/VBox

Timestamp:

Oct 25, 2016 11:54:49 AM (8 years ago)

Author:

vboxsync

Message:

BusLogic,LsiLogic: Implement medium ejected callbacks properly so Main gets notified when the guest ejected a medium

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevBusLogic.cpp (modified) (5 diffs)
• Storage/DevLsiLogicSCSI.cpp (modified) (5 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (2 diffs)

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

@@ -453 +453 @@
     /** Partner of ILeds. */
     R3PTRTYPE(PPDMILEDCONNECTORS)   pLedsConnector;
+    /** Status LUN: Media Notifys. */
+    R3PTRTYPE(PPDMIMEDIANOTIFY)     pMediaNotify;
 
 #if HC_ARCH_BITS == 64
@@ -1456 +1458 @@
  * Copy from guest to host memory worker.
  *
- * @copydoc{BUSLOGICR3MEMCOPYCALLBACK}
+ * @copydoc BUSLOGICR3MEMCOPYCALLBACK
  */
 static DECLCALLBACK(void) buslogicR3CopyBufferFromGuestWorker(PBUSLOGIC pThis, RTGCPHYS GCPhys, PRTSGBUF pSgBuf,
@@ -1481 +1483 @@
  * Copy from host to guest memory worker.
  *
- * @copydoc{BUSLOGICR3MEMCOPYCALLBACK}
+ * @copydoc BUSLOGICR3MEMCOPYCALLBACK
  */
 static DECLCALLBACK(void) buslogicR3CopyBufferToGuestWorker(PBUSLOGIC pThis, RTGCPHYS GCPhys, PRTSGBUF pSgBuf,
@@ -2995 +2997 @@
     PBUSLOGIC pThis = pTgtDev->CTX_SUFF(pBusLogic);
 
-    RT_NOREF(pThis); /** @todo */
+    if (pThis->pMediaNotify)
+    {
+        int rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pThis->CTX_SUFF(pDevIns)), VMCPUID_ANY,
+                                   (PFNRT)pThis->pMediaNotify->pfnEjected, 2,
+                                   pThis->pMediaNotify, pTgtDev->iLUN);
+        AssertRC(rc);
+    }
 }
 
@@ -4184 +4192 @@
     rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pThis->IBase, &pBase, "Status Port");
     if (RT_SUCCESS(rc))
+    {
         pThis->pLedsConnector = PDMIBASE_QUERY_INTERFACE(pBase, PDMILEDCONNECTORS);
+        pThis->pMediaNotify = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIANOTIFY);
+    }
     else if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
     {

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

@@ -343 +343 @@
     /** Status LUN: Partner of ILeds. */
     R3PTRTYPE(PPDMILEDCONNECTORS)  pLedsConnector;
+    /** Status LUN: Media Notifys. */
+    R3PTRTYPE(PPDMIMEDIANOTIFY)    pMediaNotify;
     /** Pointer to the configuration page area. */
     R3PTRTYPE(PMptConfigurationPagesSupported) pConfigurationPages;
@@ -1861 +1863 @@
  * Copy from guest to host memory worker.
  *
- * @copydoc{LSILOGICR3MEMCOPYCALLBACK}
+ * @copydoc LSILOGICR3MEMCOPYCALLBACK
  */
 static DECLCALLBACK(void) lsilogicR3CopyBufferFromGuestWorker(PLSILOGICSCSI pThis, RTGCPHYS GCPhys, PRTSGBUF pSgBuf,
@@ -1886 +1888 @@
  * Copy from host to guest memory worker.
  *
- * @copydoc{LSILOGICR3MEMCOPYCALLBACK}
+ * @copydoc LSILOGICR3MEMCOPYCALLBACK
  */
 static DECLCALLBACK(void) lsilogicR3CopyBufferToGuestWorker(PLSILOGICSCSI pThis, RTGCPHYS GCPhys, PRTSGBUF pSgBuf,
@@ -2417 +2419 @@
     PLSILOGICSCSI pThis = pTgtDev->CTX_SUFF(pLsiLogic);
 
-    RT_NOREF(pThis); /** @todo */
+    if (pThis->pMediaNotify)
+    {
+        int rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pThis->CTX_SUFF(pDevIns)), VMCPUID_ANY,
+                                   (PFNRT)pThis->pMediaNotify->pfnEjected, 2,
+                                   pThis->pMediaNotify, pTgtDev->iLUN);
+        AssertRC(rc);
+    }
 }
 
@@ -5619 +5627 @@
     rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pThis->IBase, &pBase, "Status Port");
     if (RT_SUCCESS(rc))
+    {
         pThis->pLedsConnector = PDMIBASE_QUERY_INTERFACE(pBase, PDMILEDCONNECTORS);
+        pThis->pMediaNotify = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIANOTIFY);
+    }
     else if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
     {

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

@@ -1781 +1781 @@
     GEN_CHECK_OFF(BUSLOGIC, ILeds);
     GEN_CHECK_OFF(BUSLOGIC, pLedsConnector);
+    GEN_CHECK_OFF(BUSLOGIC, pMediaNotify);
     GEN_CHECK_OFF(BUSLOGIC, fSignalIdle);
     GEN_CHECK_OFF(BUSLOGIC, fWrkThreadSleeping);
@@ -1856 +1857 @@
     GEN_CHECK_OFF(LSILOGICSCSI, ILeds);
     GEN_CHECK_OFF(LSILOGICSCSI, pLedsConnector);
+    GEN_CHECK_OFF(LSILOGICSCSI, pMediaNotify);
     GEN_CHECK_OFF(LSILOGICSCSI, pConfigurationPages);
     GEN_CHECK_OFF(LSILOGICSCSI, fSignalIdle);