VirtualBox

Changeset 90446 in vbox for trunk


Ignore:
Timestamp:
Jul 30, 2021 10:18:49 PM (3 years ago)
Author:
vboxsync
Message:

PDM: Mark the critsect enter functions with DECL_CHECK_RETURN_NOT_R3. bugref:6695

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/VBox/vmm/pdmcritsect.h

    r90435 r90446  
    7272#endif
    7373
    74 VMMDECL(int)        PDMCritSectEnter(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy);
    75 VMMDECL(int)        PDMCritSectEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL);
    76 VMMDECL(int)        PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect);
    77 VMMDECL(int)        PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL);
     74VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
     75                    PDMCritSectEnter(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy);
     76VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
     77                    PDMCritSectEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL);
     78VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
     79                    PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect);
     80VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
     81                    PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL);
    7882VMMDECL(int)        PDMCritSectLeave(PVMCC pVM, PPDMCRITSECT pCritSect);
    7983
     
    114118 * Helper for PDMCritSectEnter w/ rcBusy VINF_SUCCESS when there is no way
    115119 * to forward failures to the caller, driver edition. */
    116 #define PDM_CRITSECT_RELEASE_ASSERT_RC_DRV(a_pDevIns, a_pCritSect, a_rc) \
     120#define PDM_CRITSECT_RELEASE_ASSERT_RC_DRV(a_pDrvIns, a_pCritSect, a_rc) \
    117121    AssertReleaseMsg(RT_SUCCESS(a_rc), ("pDrvIns=%p pCritSect=%p: %Rrc\n", (a_pDrvIns), (a_pCritSect), (a_rc)))
    118122
  • trunk/include/VBox/vmm/pdmdev.h

    r90433 r90446  
    78977897 * @sa      PDMCritSectEnter
    78987898 */
    7899 DECLINLINE(int) PDMDevHlpCritSectEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy)
     7899DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int)) PDMDevHlpCritSectEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy)
    79007900{
    79017901    return pDevIns->CTX_SUFF(pHlp)->pfnCritSectEnter(pDevIns, pCritSect, rcBusy);
     
    79227922 * @sa      PDMCritSectEnterDebug
    79237923 */
    7924 DECLINLINE(int) PDMDevHlpCritSectEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL)
     7924DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int))
     7925PDMDevHlpCritSectEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    79257926{
    79267927    return pDevIns->CTX_SUFF(pHlp)->pfnCritSectEnterDebug(pDevIns, pCritSect, rcBusy, uId, RT_SRC_POS_ARGS);
     
    79407941 * @sa      PDMCritSectTryEnter
    79417942 */
    7942 DECLINLINE(int)      PDMDevHlpCritSectTryEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect)
     7943DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int))
     7944PDMDevHlpCritSectTryEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect)
    79437945{
    79447946    return pDevIns->CTX_SUFF(pHlp)->pfnCritSectTryEnter(pDevIns, pCritSect);
     
    79627964 * @sa      PDMCritSectTryEnterDebug
    79637965 */
    7964 DECLINLINE(int)      PDMDevHlpCritSectTryEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL)
     7966DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int))
     7967PDMDevHlpCritSectTryEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    79657968{
    79667969    return pDevIns->CTX_SUFF(pHlp)->pfnCritSectTryEnterDebug(pDevIns, pCritSect, uId, RT_SRC_POS_ARGS);
  • trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

    r90433 r90446  
    525525 *          function.
    526526 */
    527 VMMDECL(int) PDMCritSectEnter(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy)
     527VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) PDMCritSectEnter(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy)
    528528{
    529529#ifndef PDMCRITSECT_STRICT
     
    555555 *                              acquired from.  Optional.
    556556 */
    557 VMMDECL(int) PDMCritSectEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL)
     557VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
     558PDMCritSectEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    558559{
    559560#ifdef PDMCRITSECT_STRICT
     
    644645 * @param   pCritSect   The critical section.
    645646 */
    646 VMMDECL(int) PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect)
     647VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect)
    647648{
    648649#ifndef PDMCRITSECT_STRICT
     
    671672 *                              acquired from.  Optional.
    672673 */
    673 VMMDECL(int) PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL)
     674VMMDECL(DECL_CHECK_RETURN_NOT_R3(int))
     675PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    674676{
    675677#ifdef PDMCRITSECT_STRICT
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette