Changeset 90437 in vbox for trunk

Timestamp:

Jul 30, 2021 4:18:25 PM (4 years ago)

Author:

vboxsync

Message:

VMM: More PDMCritSectEnter return code checks. bugref:6695

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PDMAllNetShaper.cpp (modified) (1 diff)
• VMMR3/PDMCritSect.cpp (modified) (1 diff)

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

@@ -45 +45 @@
     PPDMNSBWGROUP pBwGroup = ASMAtomicReadPtrT(&pFilter->CTX_SUFF(pBwGroup), PPDMNSBWGROUP);
     int rc = PDMCritSectEnter(pVM, &pBwGroup->Lock, VERR_SEM_BUSY); AssertRC(rc);
-    if (RT_UNLIKELY(rc == VERR_SEM_BUSY))
-        return true;
+    if (RT_SUCCESS(rc))
+    { /* likely */ }
+    else
+    {
+        if (rc == VERR_SEM_BUSY)
+            return true;
+        PDM_CRITSECT_RELEASE_ASSERT_RC(pVM, &pBwGroup->Lock, rc);
+        return false;
+    }
 
     bool fAllowed = true;

trunk/src/VBox/VMM/VMMR3/PDMCritSect.cpp

@@ -870 +870 @@
     int rc = PDMCritSectEnter(pVM, pCritSect, VERR_IGNORED);
 #endif
-    AssertLogRelRC(rc);
+    PDM_CRITSECT_RELEASE_ASSERT_RC(pVM, pCritSect, rc);
     return true;
 }