Changeset 37687 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 29, 2011 3:22:11 PM (13 years ago)

Author:

vboxsync

Message:

Main/Console+Machine: add notification for guest triggered eject, which right now results in updating the VM config
Devices/Storage/ATA+AHCI: trigger the eject notification

Location:

trunk/src/VBox/Devices/Storage

Files:

• ATAController.cpp (modified) (5 diffs)
• ATAController.h (modified) (3 diffs)
• DevAHCI.cpp (modified) (4 diffs)
• DevATA.cpp (modified) (5 diffs)

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

@@ -2402 +2402 @@
                         break;
                     case 2: /* 10 - Eject media */
+                    {
                         /* This must be done from EMT. */
-                        {
                         PAHCIATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
                         PPDMDEVINS pDevIns = ATADEVSTATE_2_DEVINS(s);
@@ -2412 +2412 @@
                                              false /*=fForce*/, true /*=fEeject*/);
                         Assert(RT_SUCCESS(rc) || (rc == VERR_PDM_MEDIA_LOCKED) || (rc = VERR_PDM_MEDIA_NOT_MOUNTED));
+                        if (RT_SUCCESS(rc) && pCtl->pMediaNotify)
+                        {
+                            rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
+                                                   (PFNRT)pCtl->pMediaNotify->pfnEjected, 2,
+                                                   pCtl->pMediaNotify, s->iLUN);
+                            AssertRC(rc);
+                        }
                         {
                             STAM_PROFILE_START(&pCtl->StatLockWait, a);
@@ -2417 +2424 @@
                             STAM_PROFILE_STOP(&pCtl->StatLockWait, a);
                         }
-                        }
                         break;
+                    }
                     case 3: /* 11 - Load media */
                         /** @todo rc = s->pDrvMount->pfnLoadMedia(s->pDrvMount) */
@@ -5567 +5574 @@
 
 int ataControllerInit(PPDMDEVINS pDevIns, PAHCIATACONTROLLER pCtl,
+                      PPDMIMEDIANOTIFY pMediaNotify,
                       unsigned iLUNMaster, PPDMIBASE pDrvBaseMaster, PPDMLED pLedMaster,
                       PSTAMCOUNTER pStatBytesReadMaster, PSTAMCOUNTER pStatBytesWrittenMaster,
@@ -5588 +5596 @@
     pCtl->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
     pCtl->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
+    pCtl->pMediaNotify = pMediaNotify;
     pCtl->AsyncIOSem = NIL_RTSEMEVENT;
     pCtl->SuspendIOSem = NIL_RTSEMEVENT;

trunk/src/VBox/Devices/Storage/ATAController.h

@@ -387 +387 @@
     /** The event semaphore the thread is waiting on during suspended I/O. */
     RTSEMEVENT          SuspendIOSem;
+    /** Pointer to Media Notify interface. */
+    R3PTRTYPE(PPDMIMEDIANOTIFY) pMediaNotify;
 #if 0 /*HC_ARCH_BITS == 32*/
     uint32_t            Alignment0;
@@ -429 +431 @@
  * @param   pDevIns Pointer to the device instance which creates a controller.
  * @param   pCtl    Pointer to the unitialized ATA controller structure.
+ * @param   pMediaNotify   Pointer to PDM interface for media eject.
  * @param   iLUNMaster     Port number of the master device.
  * @param   pDrvBaseMaster Pointer to the base driver interface which acts as the master.
@@ -457 +460 @@
  */
 int ataControllerInit(PPDMDEVINS pDevIns, PAHCIATACONTROLLER pCtl,
+                      PPDMIMEDIANOTIFY pMediaNotify,
                       unsigned iLUNMaster, PPDMIBASE pDrvBaseMaster, PPDMLED pLedMaster,
                       PSTAMCOUNTER pStatBytesReadMaster, PSTAMCOUNTER pStatBytesWrittenMaster,

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

@@ -575 +575 @@
     /** Status LUN: Partner of ILeds. */
     R3PTRTYPE(PPDMILEDCONNECTORS)   pLedsConnector;
+    /** Status LUN: Media Notifys. */
+    R3PTRTYPE(PPDMIMEDIANOTIFY)     pMediaNotify;
 
 #if HC_ARCH_BITS == 64
@@ -4383 +4385 @@
                         break;
                     case 2: /* 10 - Eject media */
+                    {
                         /* This must be done from EMT. */
+                        PAHCI pAhci = pAhciPort->CTX_SUFF(pAhci);
+                        PPDMDEVINS pDevIns = pAhci->CTX_SUFF(pDevIns);
+
+                        rc2 = VMR3ReqCallWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
+                                              (PFNRT)pAhciPort->pDrvMount->pfnUnmount, 3,
+                                              pAhciPort->pDrvMount, false/*=fForce*/, true/*=fEject*/);
+                        Assert(RT_SUCCESS(rc2) || (rc2 == VERR_PDM_MEDIA_LOCKED) || (rc2 = VERR_PDM_MEDIA_NOT_MOUNTED));
+                        if (RT_SUCCESS(rc) && pAhci->pMediaNotify)
                         {
-                            PAHCI pAhci = pAhciPort->CTX_SUFF(pAhci);
-                            PPDMDEVINS pDevIns = pAhci->CTX_SUFF(pDevIns);
-
-                            rc2 = VMR3ReqCallWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
-                                                  (PFNRT)pAhciPort->pDrvMount->pfnUnmount, 3,
-                                                  pAhciPort->pDrvMount, false/*=fForce*/, true/*=fEject*/);
-                            Assert(RT_SUCCESS(rc2) || (rc2 == VERR_PDM_MEDIA_LOCKED) || (rc2 = VERR_PDM_MEDIA_NOT_MOUNTED));
+                            rc2 = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
+                                                    (PFNRT)pAhci->pMediaNotify->pfnEjected, 2,
+                                                    pAhci->pMediaNotify, pAhciPort->iLUN);
+                            AssertRC(rc);
                         }
                         break;
+                    }
                     case 3: /* 11 - Load media */
                         /** @todo rc = s->pDrvMount->pfnLoadMedia(s->pDrvMount) */
@@ -8607 +8616 @@
     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)
     {
@@ -8659 +8671 @@
             char szName[24];
             RTStrPrintf(szName, sizeof(szName), "EmulatedATA%d", i);
-            rc = ataControllerInit(pDevIns, pCtl,
+            rc = ataControllerInit(pDevIns, pCtl, pThis->pMediaNotify,
                                    iPortMaster, pThis->ahciPort[iPortMaster].pDrvBase,
                                    &pThis->ahciPort[iPortMaster].Led,

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

@@ -476 +476 @@
     /** Status LUN: Partner of ILeds. */
     R3PTRTYPE(PPDMILEDCONNECTORS)   pLedsConnector;
+    /** Status LUN: Media Notify. */
+    R3PTRTYPE(PPDMIMEDIANOTIFY)     pMediaNotify;
     /** Flag whether GC is enabled. */
     bool                fGCEnabled;
@@ -3116 +3118 @@
                         break;
                     case 2: /* 10 - Eject media */
+                    {
                         /* This must be done from EMT. */
-                        {
                         PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
                         PPDMDEVINS pDevIns = ATADEVSTATE_2_DEVINS(s);
+                        PCIATAState *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
 
                         PDMCritSectLeave(&pCtl->lock);
@@ -3126 +3129 @@
                                              s->pDrvMount, false /*=fForce*/, true /*=fEject*/);
                         Assert(RT_SUCCESS(rc) || (rc == VERR_PDM_MEDIA_LOCKED) || (rc = VERR_PDM_MEDIA_NOT_MOUNTED));
+                        if (RT_SUCCESS(rc) && pThis->pMediaNotify)
+                        {
+                            rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
+                                                   (PFNRT)pThis->pMediaNotify->pfnEjected, 2,
+                                                   pThis->pMediaNotify, s->iLUN);
+                            AssertRC(rc);
+                        }
                         {
                             STAM_PROFILE_START(&pCtl->StatLockWait, a);
@@ -3131 +3141 @@
                             STAM_PROFILE_STOP(&pCtl->StatLockWait, a);
                         }
-                        }
                         break;
+                    }
                     case 3: /* 11 - Load media */
                         /** @todo rc = s->pDrvMount->pfnLoadMedia(s->pDrvMount) */
@@ -7042 +7052 @@
     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)
     {