Changeset 81877 in vbox for trunk/src/VBox

Timestamp:

Nov 15, 2019 3:09:00 PM (5 years ago)

Author:

vboxsync

Message:

DevAHCI: Use the device helpers for critical sections and thread destruction. bugref:9218

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (14 diffs)

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

@@ -891 +891 @@
     Log(("P%u: %s: Setting interrupt\n", iPort, __FUNCTION__));
 
-    int rc = PDMCritSectEnter(&pAhci->lock, rcBusy);
+    int rc = PDMDevHlpCritSectEnter(pAhci->CTX_SUFF(pDevIns), &pAhci->lock, rcBusy);
     if (rc != VINF_SUCCESS)
         return rc;
@@ -930 +930 @@
     }
 
-    PDMCritSectLeave(&pAhci->lock);
+    PDMDevHlpCritSectLeave(pAhci->CTX_SUFF(pDevIns), &pAhci->lock);
     return VINF_SUCCESS;
 }
@@ -1612 +1612 @@
     Log(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
 
-    int rc = PDMCritSectEnter(&pAhci->lock, VINF_IOM_R3_MMIO_WRITE);
+    int rc = PDMDevHlpCritSectEnter(pAhci->CTX_SUFF(pDevIns), &pAhci->lock, VINF_IOM_R3_MMIO_WRITE);
     if (rc != VINF_SUCCESS)
         return rc;
@@ -1664 +1664 @@
     }
 
-    PDMCritSectLeave(&pAhci->lock);
+    PDMDevHlpCritSectLeave(pAhci->CTX_SUFF(pDevIns), &pAhci->lock);
     return VINF_SUCCESS;
 }
@@ -1675 +1675 @@
     RT_NOREF1(iReg);
 
-    int rc = PDMCritSectEnter(&pAhci->lock, VINF_IOM_R3_MMIO_READ);
+    int rc = PDMDevHlpCritSectEnter(pAhci->CTX_SUFF(pDevIns), &pAhci->lock, VINF_IOM_R3_MMIO_READ);
     if (rc != VINF_SUCCESS)
         return rc;
@@ -1681 +1681 @@
     uint32_t u32PortsInterrupted = ASMAtomicXchgU32(&pAhci->u32PortsInterrupted, 0);
 
-    PDMCritSectLeave(&pAhci->lock);
+    PDMDevHlpCritSectLeave(pAhci->CTX_SUFF(pDevIns), &pAhci->lock);
     Log(("%s: read regHbaIs=%#010x u32PortsInterrupted=%#010x\n", __FUNCTION__, pAhci->regHbaIs, u32PortsInterrupted));
 
@@ -4553 +4553 @@
 }
 
-/* The async IO thread for one port. */
+/**
+ * @callback_method_impl{FNPDMTHREADDEV, The async IO thread for one port.}
+ */
 static DECLCALLBACK(int) ahciAsyncIOLoop(PPDMDEVINS pDevIns, PPDMTHREAD pThread)
 {
@@ -4690 +4692 @@
 
 /**
- * Unblock the async I/O thread so it can respond to a state change.
- *
- * @returns VBox status code.
- * @param   pDevIns     The device instance.
- * @param   pThread     The send thread.
+ * @callback_method_impl{FNPDMTHREADWAKEUPDEV}
  */
 static DECLCALLBACK(int) ahciAsyncIOLoopWakeUp(PPDMDEVINS pDevIns, PPDMTHREAD pThread)
@@ -5556 +5554 @@
         int rcThread;
         /* Destroy the thread. */
-        rc = PDMR3ThreadDestroy(pAhciPort->pAsyncIOThread, &rcThread);
+        rc = PDMDevHlpThreadDestroy(pDevIns, pAhciPort->pAsyncIOThread, &rcThread);
         if (RT_FAILURE(rc) || RT_FAILURE(rcThread))
             AssertMsgFailed(("%s Failed to destroy async IO thread rc=%Rrc rcThread=%Rrc\n", __FUNCTION__, rc, rcThread));
@@ -5764 +5762 @@
 static DECLCALLBACK(int) ahciR3Destruct(PPDMDEVINS pDevIns)
 {
+    PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
     PAHCI       pThis = PDMDEVINS_2_DATA(pDevIns, PAHCI);
     int         rc    = VINF_SUCCESS;
-    PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
 
     /*
@@ -5773 +5771 @@
      * will take care of terminating and cleaning up the thread.
      */
-    if (PDMCritSectIsInitialized(&pThis->lock))
+    if (PDMDevHlpCritSectIsInitialized(pDevIns, &pThis->lock))
     {
         TMR3TimerDestroy(pThis->CTX_SUFF(pHbaCccTimer));
@@ -5793 +5791 @@
         }
 
-        PDMR3CritSectDelete(&pThis->lock);
+        PDMDevHlpCritSectDelete(pDevIns, &pThis->lock);
     }
 
@@ -5804 +5802 @@
 static DECLCALLBACK(int) ahciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     PAHCI           pThis = PDMDEVINS_2_DATA(pDevIns, PAHCI);
     PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
@@ -5810 +5809 @@
     unsigned        i = 0;
     uint32_t        cbTotalBufferSize = 0;
-    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
     LogFlowFunc(("pThis=%#p\n", pThis));