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

Timestamp:

Nov 13, 2019 5:00:55 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134627

Message:

DevATA: Operate SUPSemEvent* thru the device helpers. bugref:9218

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (9 diffs)

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

@@ -526 +526 @@
     /** The event semaphore the thread is waiting on for requests. */
     SUPSEMEVENT         hAsyncIOSem;
-    /** The support driver session handle. */
-    PSUPDRVSESSION      pSupDrvSession;
     /** The request queue for the AIO thread. One element is always unused. */
     ATARequest          aAsyncIORequests[4];
@@ -847 +845 @@
     if (RT_FAILURE(rc))
     {
-        rc = SUPSemEventSignal(pCtl->pSupDrvSession, pCtl->hAsyncIOSem);
+        rc = PDMDevHlpSUPSemEventSignal(pCtl->CTX_SUFF(pDevIns), pCtl->hAsyncIOSem);
         AssertRC(rc);
     }
@@ -5501 +5499 @@
     RT_NOREF1(hThreadSelf);
     const ATARequest *pReq;
-    uint64_t        u64TS = 0; /* shut up gcc */
+    uint64_t        u64TS   = 0; /* shut up gcc */
     uint64_t        uWait;
-    int             rc   = VINF_SUCCESS;
-    PATACONTROLLER  pCtl = (PATACONTROLLER)pvUser;
+    PATACONTROLLER  pCtl    = (PATACONTROLLER)pvUser;
+    PPDMDEVINSR3    pDevIns = pCtl->CTX_SUFF(pDevIns);
+    int             rc      = VINF_SUCCESS;
     ATADevState     *s;
 
@@ -5533 +5532 @@
             if (pCtl->fSignalIdle)
                 ataR3AsyncSignalIdle(pCtl);
-            rc = SUPSemEventWaitNoResume(pCtl->pSupDrvSession, pCtl->hAsyncIOSem, RT_INDEFINITE_WAIT);
+            rc = PDMDevHlpSUPSemEventWaitNoResume(pDevIns, pCtl->hAsyncIOSem, RT_INDEFINITE_WAIT);
             /* Continue if we got a signal by RTThreadPoke().
              * We will get notified if there is a request to process.
@@ -5981 +5980 @@
     RTThreadUserSignal(pCtl->AsyncIOThread);
     if (pCtl->fSignalIdle)
-        PDMDevHlpAsyncNotificationCompleted(pCtl->pDevInsR3);
+        PDMDevHlpAsyncNotificationCompleted(pDevIns);
 
     /* Cleanup the state.  */
@@ -7403 +7402 @@
         {
             ASMAtomicWriteU32(&pThis->aCts[i].fShutdown, true);
-            rc = SUPSemEventSignal(pThis->aCts[i].pSupDrvSession, pThis->aCts[i].hAsyncIOSem);
+            rc = PDMDevHlpSUPSemEventSignal(pDevIns, pThis->aCts[i].hAsyncIOSem);
             AssertRC(rc);
             rc = RTSemEventSignal(pThis->aCts[i].SuspendIOSem);
@@ -7436 +7435 @@
         if (pThis->aCts[i].hAsyncIOSem != NIL_SUPSEMEVENT)
         {
-            SUPSemEventClose(pThis->aCts[i].pSupDrvSession, pThis->aCts[i].hAsyncIOSem);
+            PDMDevHlpSUPSemEventClose(pDevIns, pThis->aCts[i].hAsyncIOSem);
             pThis->aCts[i].hAsyncIOSem = NIL_SUPSEMEVENT;
         }
@@ -7754 +7753 @@
          */
         pCtl->uAsyncIOState = ATA_AIO_NEW;
-        pCtl->pSupDrvSession = PDMDevHlpGetSupDrvSession(pDevIns);
-        rc = SUPSemEventCreate(pCtl->pSupDrvSession, &pCtl->hAsyncIOSem);
+        rc = PDMDevHlpSUPSemEventCreate(pDevIns, &pCtl->hAsyncIOSem);
         AssertLogRelRCReturn(rc, rc);
         rc = RTSemEventCreate(&pCtl->SuspendIOSem);
@@ -7982 +7980 @@
             if (pDevIns->fR0Enabled)
             {
-    #if 0
+#if 0
                 rc = PDMDevHlpIOPortRegisterR0(pDevIns, pThis->aCts[i].IOPortBase1, 1, (RTR0PTR)i,
                                                "ataIOPortWrite1Data", "ataIOPortRead1Data", NULL, NULL, "ATA I/O Base 1 - Data");
-    #else
+#else
                 rc = PDMDevHlpIOPortRegisterR0(pDevIns, pThis->aCts[i].IOPortBase1, 1, (RTR0PTR)i,
                                                "ataIOPortWrite1Data", "ataIOPortRead1Data",
                                                "ataIOPortWriteStr1Data", "ataIOPortReadStr1Data", "ATA I/O Base 1 - Data");
-    #endif
+#endif
                 AssertLogRelRCReturn(rc, rc);
                 rc = PDMDevHlpIOPortRegisterR0(pDevIns, pThis->aCts[i].IOPortBase1 + 1, 7, (RTR0PTR)i,