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

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/Input

Files:

• DevPS2K.cpp (modified) (2 diffs)
• DevPS2M.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Input/DevPS2K.cpp

@@ -1046 +1046 @@
 
     /* Grab the lock to avoid races with event delivery or EMTs. */
-    int rc = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
-    AssertReleaseRC(rc);
+    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
 
     /* If data is available, poke the KBC. Once the data
@@ -1222 +1222 @@
     PPDMDEVINS  pDevIns = pThisCC->pDevIns;
     PPS2K       pThis   = &PDMDEVINS_2_DATA(pDevIns, PKBDSTATE)->Kbd;
-    int         rc;
 
     LogRelFlowFunc(("key code %08X\n", idUsage));
 
-    rc = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
-    AssertReleaseRC(rc);
+    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
 
     /* The 'BAT fail' scancode is reused as a signal to release keys. No actual

trunk/src/VBox/Devices/Input/DevPS2M.cpp

@@ -873 +873 @@
     PPDMDEVINS  pDevIns = pThisCC->pDevIns;
     PPS2M       pThis   = &PDMDEVINS_2_DATA(pDevIns, PKBDSTATE)->Aux;
-    int rc = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
-    AssertReleaseRC(rc);
+    int const   rcLock  = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, pDevIns->pCritSectRoR3, rcLock);
 
     LogRelFlowFunc(("dX=%d dY=%d dZ=%d dW=%d buttons=%02X\n", dx, dy, dz, dw, fButtons));