VirtualBox

Changeset 90447 in vbox for trunk/src/VBox/Devices/VMMDev


Ignore:
Timestamp:
Jul 31, 2021 12:44:13 AM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
146051
Message:

Dev*: Checked up all the PDMDevHlpCritSectEnter calls to make sure the status code is checked. bugref:6695

Location:
trunk/src/VBox/Devices/VMMDev
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

    r90332 r90447  
    383383       )
    384384    {
    385         PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     385        int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     386        PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSect, rcLock);
     387
    386388        vmmdevNotifyGuestWorker(pDevIns, pThis, pThisCC, fAddEvents);
     389
    387390        PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
    388391    }
    … …  
    409412void VMMDevCtlSetGuestFilterMask(PPDMDEVINS pDevIns, PVMMDEV pThis, PVMMDEVCC pThisCC, uint32_t fOrMask, uint32_t fNotMask)
    410413{
    411     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     414    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     415    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSect, rcLock);
    412416
    413417    const bool fHadEvents = (pThis->fHostEventFlags & pThis->fGuestFilterMask) != 0;
    … …  
    30683072                 */
    30693073                uint32_t fPostOptimize = 0;
    3070                 PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3074                int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3075                PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSect, rcLock);
     3076
    30713077                rcRet = vmmdevReqDispatcher(pDevIns, pThis, pThisCC, pRequestHeader, u32, tsArrival, &fPostOptimize, &pLock);
     3078
    30723079                PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
    30733080
    … …  
    35423549    PPDMDEVINS pDevIns = pThisCC->pDevIns;
    35433550    PVMMDEV    pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
    3544     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3551    int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3552    AssertRCReturn(rcLock, rcLock);
    35453553
    35463554    if (   pThis->xMouseAbs != xAbs
    … …  
    35793587    PPDMDEVINS pDevIns = pThisCC->pDevIns;
    35803588    PVMMDEV    pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
    3581     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3589    int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3590    AssertRCReturn(rcLock, rcLock);
    35823591
    35833592    uint32_t fOldCaps = pThis->fMouseCapabilities;
    … …  
    36383647    int         rc           = VINF_SUCCESS;
    36393648    bool        fNotifyGuest = false;
    3640 
    3641     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3649    int const   rcLock       = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3650    AssertRCReturn(rcLock, rcLock);
    36423651
    36433652    uint32_t i;
    … …  
    37053714    PPDMDEVINS pDevIns = pThisCC->pDevIns;
    37063715    PVMMDEV    pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
    3707     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3716    int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3717    AssertRCReturn(rcLock, rcLock);
    37083718
    37093719    /* Verify that the new resolution is different and that guest does not yet know about it. */
    … …  
    37333743    PPDMDEVINS pDevIns = pThisCC->pDevIns;
    37343744    PVMMDEV    pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
    3735     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3745    int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3746    AssertRCReturn(rcLock, rcLock);
    37363747
    37373748    /* Verify that the new resolution is different and that guest does not yet know about it. */
    … …  
    37583769    PPDMDEVINS pDevIns = pThisCC->pDevIns;
    37593770    PVMMDEV    pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
    3760     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3771    int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3772    AssertRCReturn(rcLock, rcLock);
    37613773
    37623774    bool fSame = (pThis->fVRDPEnabled == fVRDPEnabled);
    … …  
    37843796    PPDMDEVINS pDevIns = pThisCC->pDevIns;
    37853797    PVMMDEV    pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
    3786     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3798    int const  rcLock  = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3799    AssertRCReturn(rcLock, rcLock);
    37873800
    37883801    /* Verify that the new resolution is different and that guest does not yet know about it. */
    … …  
    38253838    AssertPtrReturn(pCredentials, VERR_NOT_SUPPORTED);
    38263839
    3827     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3840    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3841    AssertRCReturn(rcLock, rcLock);
    38283842
    38293843    /*
    … …  
    38853899    PPDMDEVINS  pDevIns = pThisCC->pDevIns;
    38863900    PVMMDEV     pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
    3887     int         rc      = VINF_SUCCESS;
    38883901
    38893902    Log(("vmmdevIPort_CpuHotUnplug: idCpuCore=%u idCpuPackage=%u\n", idCpuCore, idCpuPackage));
    38903903
    3891     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3904    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3905    AssertRCReturn(rc, rc);
    38923906
    38933907    if (pThis->fCpuHotPlugEventsEnabled)
    … …  
    39133927    PPDMDEVINS  pDevIns = pThisCC->pDevIns;
    39143928    PVMMDEV     pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
    3915     int         rc      = VINF_SUCCESS;
    39163929
    39173930    Log(("vmmdevCpuPlug: idCpuCore=%u idCpuPackage=%u\n", idCpuCore, idCpuPackage));
    39183931
    3919     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3932    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3933    AssertRCReturn(rc, rc);
    39203934
    39213935    if (pThis->fCpuHotPlugEventsEnabled)
    … …  
    39613975    PVMMDEVCC       pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVMMDEVCC);
    39623976    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
    3963     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3977    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     3978    AssertRCReturn(rc, rc);
    39643979
    39653980    vmmdevLiveExec(pDevIns, pSSM, SSM_PASS_FINAL);
    … …  
    42444259    PVMMDEV   pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
    42454260    PVMMDEVCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVMMDEVCC);
    4246     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     4261    int const rcLock  = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     4262    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSect, rcLock);
    42474263
    42484264    /*

  • trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

    r90266 r90447  
    473473        AssertStmt(idx < RT_ELEMENTS(pThisCC->aHgcmAcc), idx %= RT_ELEMENTS(pThisCC->aHgcmAcc));
    474474
    475         PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     475        int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
     476        PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSect, rcLock);
    476477
    477478        Log5Func(("aHgcmAcc[%zu] %#RX64 += %#x (%p)\n", idx, pThisCC->aHgcmAcc[idx].cbHeapBudget, pCmd->cbHeapCost, pCmd));
Note: See TracChangeset for help on using the changeset viewer.

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