VirtualBox

Changeset 90784 in vbox


Ignore:
Timestamp:
Aug 23, 2021 9:42:32 AM (3 years ago)
Author:
vboxsync
Message:

VMM: VALID_PTR -> RT_VALID_PTR.

Location:
trunk/src/VBox/VMM
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/VMMAll/PDMAllNetShaper.cpp

    r90437 r90784  
    4040{
    4141    AssertPtrReturn(pFilter, true);
    42     if (!VALID_PTR(pFilter->CTX_SUFF(pBwGroup)))
     42    if (!RT_VALID_PTR(pFilter->CTX_SUFF(pBwGroup)))
    4343        return true;
    4444

  • trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp

    r87766 r90784  
    4545VMMDECL(PPDMQUEUEITEMCORE) PDMQueueAlloc(PPDMQUEUE pQueue)
    4646{
    47     Assert(VALID_PTR(pQueue) && pQueue->CTX_SUFF(pVM));
     47    Assert(RT_VALID_PTR(pQueue) && pQueue->CTX_SUFF(pVM));
    4848    PPDMQUEUEITEMCORE pNew;
    4949    uint32_t iNext;
    … …  
    9292VMMDECL(void) PDMQueueInsert(PPDMQUEUE pQueue, PPDMQUEUEITEMCORE pItem)
    9393{
    94     Assert(VALID_PTR(pQueue) && pQueue->CTX_SUFF(pVM));
    95     Assert(VALID_PTR(pItem));
     94    Assert(RT_VALID_PTR(pQueue) && pQueue->CTX_SUFF(pVM));
     95    AssertPtr(pItem);
    9696
    9797#if 0 /* the paranoid android version: */
    … …  
    159159VMMDECL(RCPTRTYPE(PPDMQUEUE)) PDMQueueRCPtr(PPDMQUEUE pQueue)
    160160{
    161     Assert(VALID_PTR(pQueue));
     161    AssertPtr(pQueue);
    162162    Assert(pQueue->pVMR3 && pQueue->pVMRC);
    163163#ifdef IN_RC
    … …  
    178178VMMDECL(R0PTRTYPE(PPDMQUEUE)) PDMQueueR0Ptr(PPDMQUEUE pQueue)
    179179{
    180     Assert(VALID_PTR(pQueue));
     180    AssertPtr(pQueue);
    181181    Assert(pQueue->pVMR3 && pQueue->pVMR0);
    182182#ifdef IN_RING0

  • trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

    r90439 r90784  
    36443644    size_t              cch;
    36453645    PGMRAMRANGE const  *pRam = (PGMRAMRANGE const *)pvValue;
    3646     if (VALID_PTR(pRam))
     3646    if (RT_VALID_PTR(pRam))
    36473647    {
    36483648        char szTmp[80];

  • trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

    r82992 r90784  
    933933     */
    934934    PGMM pGMM = g_pGMM;
    935     if (!VALID_PTR(pGMM))
     935    if (!RT_VALID_PTR(pGMM))
    936936        return;
    937937    if (pGMM->u32Magic != GMM_MAGIC)

  • trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

    r90380 r90784  
    27012701     */
    27022702    PVMMR0LOGGER pR0Logger = (PVMMR0LOGGER)((uintptr_t)pLogger - RT_UOFFSETOF(VMMR0LOGGER, Logger));
    2703     if (    !VALID_PTR(pR0Logger)
    2704         ||  !VALID_PTR(pR0Logger + 1)
     2703    if (    !RT_VALID_PTR(pR0Logger)
     2704        ||  !RT_VALID_PTR(pR0Logger + 1)
    27052705        ||  pLogger->u32Magic != RTLOGGER_MAGIC)
    27062706    {
    … …  
    27142714
    27152715    PVMCC pVM = pR0Logger->pVM;
    2716     if (   !VALID_PTR(pVM)
     2716    if (   !RT_VALID_PTR(pVM)
    27172717        || pVM->pSelf != pVM)
    27182718    {

  • trunk/src/VBox/VMM/VMMR3/DBGFAddr.cpp

    r82968 r90784  
    210210{
    211211    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
    212     if (!VALID_PTR(pAddress))
     212    if (!RT_VALID_PTR(pAddress))
    213213        return false;
    214214    if (!DBGFADDRESS_IS_VALID(pAddress))

  • trunk/src/VBox/VMM/VMMR3/DBGFMem.cpp

    r85418 r90784  
    6161    if (!DBGFR3AddrIsValid(pUVM, pAddress))
    6262        return VERR_INVALID_POINTER;
    63     if (!VALID_PTR(pHitAddress))
     63    if (!RT_VALID_PTR(pHitAddress))
    6464        return VERR_INVALID_POINTER;
    6565
    … …  
    155155    if (!DBGFR3AddrIsValid(pUVM, pAddress))
    156156        return VERR_INVALID_POINTER;
    157     if (!VALID_PTR(pvBuf))
     157    if (!RT_VALID_PTR(pvBuf))
    158158        return VERR_INVALID_POINTER;
    159159
    … …  
    227227    if (!DBGFR3AddrIsValid(pUVM, pAddress))
    228228        return VERR_INVALID_POINTER;
    229     if (!VALID_PTR(pszBuf))
     229    if (!RT_VALID_PTR(pszBuf))
    230230        return VERR_INVALID_POINTER;
    231231
    … …  
    273273     * Validate and zero output.
    274274     */
    275     if (!VALID_PTR(pszBuf))
     275    if (!RT_VALID_PTR(pszBuf))
    276276        return VERR_INVALID_POINTER;
    277277    if (cchBuf <= 0)
    … …  
    306306    if (!DBGFR3AddrIsValid(pUVM, pAddress))
    307307        return VERR_INVALID_POINTER;
    308     if (!VALID_PTR(pvBuf))
     308    if (!RT_VALID_PTR(pvBuf))
    309309        return VERR_INVALID_POINTER;
    310310    PVM pVM = pUVM->pVM;

  • trunk/src/VBox/VMM/VMMR3/DBGFR3Flow.cpp

    r88366 r90784  
    13361336 * @param   fFlags              Combination of DBGF_DISAS_FLAGS_*.
    13371337 */
    1338 static int dbgfR3FlowPopulate(PUVM pUVM, VMCPUID idCpu, PDBGFFLOWINT pThis,
    1339                              uint32_t cbDisasmMax, uint32_t fFlags)
     1338static int dbgfR3FlowPopulate(PUVM pUVM, VMCPUID idCpu, PDBGFFLOWINT pThis, uint32_t cbDisasmMax, uint32_t fFlags)
    13401339{
    13411340    int rc = VINF_SUCCESS;
    13421341    PDBGFFLOWBBINT pFlowBb = dbgfR3FlowGetUnpopulatedBb(pThis);
    13431342
    1344     while (VALID_PTR(pFlowBb))
     1343    while (pFlowBb != NULL)
    13451344    {
    13461345        rc = dbgfR3FlowBbProcess(pUVM, idCpu, pThis, pFlowBb, cbDisasmMax, fFlags);

  • trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp

    r82968 r90784  
    15101510
    15111511    /* Sanity checks. */
    1512     AssertReturnVoid(VALID_PTR(pEndpoint));
     1512    AssertReturnVoid(RT_VALID_PTR(pEndpoint));
    15131513
    15141514    PPDMASYNCCOMPLETIONEPCLASS pEndpointClass = pEndpoint->pEpClass;

  • trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp

    r82968 r90784  
    191191                {
    192192                    PPDMASYNCCOMPLETIONENDPOINTFILE pEndpointNew = pAioMgr->BlockingEventData.AddEndpoint.pEndpoint;
    193                     AssertMsg(VALID_PTR(pEndpointNew), ("Adding endpoint event without a endpoint to add\n"));
     193                    AssertMsg(RT_VALID_PTR(pEndpointNew), ("Adding endpoint event without a endpoint to add\n"));
    194194
    195195                    pEndpointNew->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_ACTIVE;
    … …  
    214214                {
    215215                    PPDMASYNCCOMPLETIONENDPOINTFILE pEndpointRemove = pAioMgr->BlockingEventData.RemoveEndpoint.pEndpoint;
    216                     AssertMsg(VALID_PTR(pEndpointRemove), ("Removing endpoint event without a endpoint to remove\n"));
     216                    AssertMsg(RT_VALID_PTR(pEndpointRemove), ("Removing endpoint event without a endpoint to remove\n"));
    217217
    218218                    pEndpointRemove->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_REMOVING;
    … …  
    235235                {
    236236                    PPDMASYNCCOMPLETIONENDPOINTFILE pEndpointClose = pAioMgr->BlockingEventData.CloseEndpoint.pEndpoint;
    237                     AssertMsg(VALID_PTR(pEndpointClose), ("Close endpoint event without a endpoint to Close\n"));
     237                    AssertMsg(RT_VALID_PTR(pEndpointClose), ("Close endpoint event without a endpoint to Close\n"));
    238238
    239239                    pEndpointClose->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_CLOSING;

  • trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp

    r82968 r90784  
    10041004        pCurr->pNext = NULL;
    10051005
    1006         AssertMsg(VALID_PTR(pCurr->pEndpoint) && (pCurr->pEndpoint == pEndpoint),
     1006        AssertMsg(RT_VALID_PTR(pCurr->pEndpoint) && pCurr->pEndpoint == pEndpoint,
    10071007                  ("Endpoints do not match\n"));
    10081008
    … …  
    11981198        {
    11991199            PPDMASYNCCOMPLETIONENDPOINTFILE pEndpointNew = ASMAtomicReadPtrT(&pAioMgr->BlockingEventData.AddEndpoint.pEndpoint, PPDMASYNCCOMPLETIONENDPOINTFILE);
    1200             AssertMsg(VALID_PTR(pEndpointNew), ("Adding endpoint event without a endpoint to add\n"));
     1200            AssertMsg(RT_VALID_PTR(pEndpointNew), ("Adding endpoint event without a endpoint to add\n"));
    12011201
    12021202            pEndpointNew->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_ACTIVE;
    … …  
    12171217        {
    12181218            PPDMASYNCCOMPLETIONENDPOINTFILE pEndpointRemove = ASMAtomicReadPtrT(&pAioMgr->BlockingEventData.RemoveEndpoint.pEndpoint, PPDMASYNCCOMPLETIONENDPOINTFILE);
    1219             AssertMsg(VALID_PTR(pEndpointRemove), ("Removing endpoint event without a endpoint to remove\n"));
     1219            AssertMsg(RT_VALID_PTR(pEndpointRemove), ("Removing endpoint event without a endpoint to remove\n"));
    12201220
    12211221            pEndpointRemove->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_REMOVING;
    … …  
    12261226        {
    12271227            PPDMASYNCCOMPLETIONENDPOINTFILE pEndpointClose = ASMAtomicReadPtrT(&pAioMgr->BlockingEventData.CloseEndpoint.pEndpoint, PPDMASYNCCOMPLETIONENDPOINTFILE);
    1228             AssertMsg(VALID_PTR(pEndpointClose), ("Close endpoint event without a endpoint to close\n"));
     1228            AssertMsg(RT_VALID_PTR(pEndpointClose), ("Close endpoint event without a endpoint to close\n"));
    12291229
    12301230            if (pEndpointClose->enmState == PDMASYNCCOMPLETIONENDPOINTFILESTATE_ACTIVE)

  • trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp

    r90348 r90784  
    286286                    ("%s: %.*s\n", pReg->szName, sizeof(pReg->szRCMod), pReg->szRCMod),
    287287                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    288     AssertMsgReturn(VALID_PTR(pReg->pszDescription),
     288    AssertMsgReturn(RT_VALID_PTR(pReg->pszDescription),
    289289                    ("%s: %p\n", pReg->szName, pReg->pszDescription),
    290290                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    … …  
    301301                    ("%s: %#x\n", pReg->szName, pReg->cbInstance),
    302302                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    303     AssertMsgReturn(VALID_PTR(pReg->pfnConstruct),
     303    AssertMsgReturn(RT_VALID_PTR(pReg->pfnConstruct),
    304304                    ("%s: %p\n", pReg->szName, pReg->pfnConstruct),
    305305                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    306     AssertMsgReturn(VALID_PTR(pReg->pfnRelocate) || !(pReg->fFlags & PDM_DRVREG_FLAGS_RC),
     306    AssertMsgReturn(RT_VALID_PTR(pReg->pfnRelocate) || !(pReg->fFlags & PDM_DRVREG_FLAGS_RC),
    307307                    ("%s: %#x\n", pReg->szName, pReg->cbInstance),
    308308                    VERR_PDM_INVALID_DRIVER_REGISTRATION);

  • trunk/src/VBox/VMM/VMMR3/VMEmt.cpp

    r88346 r90784  
    7575    RT_NOREF_PV(hThreadSelf);
    7676
    77     AssertReleaseMsg(VALID_PTR(pUVM) && pUVM->u32Magic == UVM_MAGIC,
     77    AssertReleaseMsg(RT_VALID_PTR(pUVM) && pUVM->u32Magic == UVM_MAGIC,
    7878                     ("Invalid arguments to the emulation thread!\n"));
    7979

  • trunk/src/VBox/VMM/VMMR3/VMReq.cpp

    r85121 r90784  
    811811     */
    812812    AssertMsgReturn(pReq->enmState == VMREQSTATE_ALLOCATED, ("%d\n", pReq->enmState), VERR_VM_REQUEST_STATE);
    813     AssertMsgReturn(    VALID_PTR(pReq->pUVM)
     813    AssertMsgReturn(    RT_VALID_PTR(pReq->pUVM)
    814814                    &&  !pReq->pNext
    815815                    &&  pReq->EventSem != NIL_RTSEMEVENT,
    … …  
    970970                    ("Invalid state %d\n", pReq->enmState),
    971971                    VERR_VM_REQUEST_STATE);
    972     AssertMsgReturn(    VALID_PTR(pReq->pUVM)
     972    AssertMsgReturn(    RT_VALID_PTR(pReq->pUVM)
    973973                    &&  pReq->EventSem != NIL_RTSEMEVENT,
    974974                    ("Invalid request package! Anyone cooking their own packages???\n"),
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