- Timestamp:
- Jul 30, 2021 10:18:49 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
include/VBox/vmm/pdmcritsect.h (modified) (2 diffs)
-
include/VBox/vmm/pdmdev.h (modified) (4 diffs)
-
src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/vmm/pdmcritsect.h
r90435 r90446 72 72 #endif 73 73 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); 74 VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) 75 PDMCritSectEnter(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy); 76 VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) 77 PDMCritSectEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL); 78 VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) 79 PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect); 80 VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) 81 PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL); 78 82 VMMDECL(int) PDMCritSectLeave(PVMCC pVM, PPDMCRITSECT pCritSect); 79 83 … … 114 118 * Helper for PDMCritSectEnter w/ rcBusy VINF_SUCCESS when there is no way 115 119 * to forward failures to the caller, driver edition. */ 116 #define PDM_CRITSECT_RELEASE_ASSERT_RC_DRV(a_pD evIns, a_pCritSect, a_rc) \120 #define PDM_CRITSECT_RELEASE_ASSERT_RC_DRV(a_pDrvIns, a_pCritSect, a_rc) \ 117 121 AssertReleaseMsg(RT_SUCCESS(a_rc), ("pDrvIns=%p pCritSect=%p: %Rrc\n", (a_pDrvIns), (a_pCritSect), (a_rc))) 118 122 -
trunk/include/VBox/vmm/pdmdev.h
r90433 r90446 7897 7897 * @sa PDMCritSectEnter 7898 7898 */ 7899 DECLINLINE( int) PDMDevHlpCritSectEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy)7899 DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int)) PDMDevHlpCritSectEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy) 7900 7900 { 7901 7901 return pDevIns->CTX_SUFF(pHlp)->pfnCritSectEnter(pDevIns, pCritSect, rcBusy); … … 7922 7922 * @sa PDMCritSectEnterDebug 7923 7923 */ 7924 DECLINLINE(int) PDMDevHlpCritSectEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL) 7924 DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int)) 7925 PDMDevHlpCritSectEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL) 7925 7926 { 7926 7927 return pDevIns->CTX_SUFF(pHlp)->pfnCritSectEnterDebug(pDevIns, pCritSect, rcBusy, uId, RT_SRC_POS_ARGS); … … 7940 7941 * @sa PDMCritSectTryEnter 7941 7942 */ 7942 DECLINLINE(int) PDMDevHlpCritSectTryEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect) 7943 DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int)) 7944 PDMDevHlpCritSectTryEnter(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect) 7943 7945 { 7944 7946 return pDevIns->CTX_SUFF(pHlp)->pfnCritSectTryEnter(pDevIns, pCritSect); … … 7962 7964 * @sa PDMCritSectTryEnterDebug 7963 7965 */ 7964 DECLINLINE(int) PDMDevHlpCritSectTryEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL) 7966 DECLINLINE(DECL_CHECK_RETURN_NOT_R3(int)) 7967 PDMDevHlpCritSectTryEnterDebug(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL) 7965 7968 { 7966 7969 return pDevIns->CTX_SUFF(pHlp)->pfnCritSectTryEnterDebug(pDevIns, pCritSect, uId, RT_SRC_POS_ARGS); -
trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp
r90433 r90446 525 525 * function. 526 526 */ 527 VMMDECL( int) PDMCritSectEnter(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy)527 VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) PDMCritSectEnter(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy) 528 528 { 529 529 #ifndef PDMCRITSECT_STRICT … … 555 555 * acquired from. Optional. 556 556 */ 557 VMMDECL(int) PDMCritSectEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL) 557 VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) 558 PDMCritSectEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL) 558 559 { 559 560 #ifdef PDMCRITSECT_STRICT … … 644 645 * @param pCritSect The critical section. 645 646 */ 646 VMMDECL( int) PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect)647 VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) PDMCritSectTryEnter(PVMCC pVM, PPDMCRITSECT pCritSect) 647 648 { 648 649 #ifndef PDMCRITSECT_STRICT … … 671 672 * acquired from. Optional. 672 673 */ 673 VMMDECL(int) PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL) 674 VMMDECL(DECL_CHECK_RETURN_NOT_R3(int)) 675 PDMCritSectTryEnterDebug(PVMCC pVM, PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL) 674 676 { 675 677 #ifdef PDMCRITSECT_STRICT
Note:
See TracChangeset
for help on using the changeset viewer.

