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

Timestamp:

Jul 31, 2021 12:44:13 AM (3 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Virtio.cpp (modified) (1 diff)
• Virtio.h (modified) (2 diffs)

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -931 +931 @@
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatIOWriteR0,   STAMTYPE_PROFILE, "IO/WriteR0",         STAMUNIT_TICKS_PER_CALL, "Profiling IO writes in R0");
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatIOWriteRC,   STAMTYPE_PROFILE, "IO/WriteRC",         STAMUNIT_TICKS_PER_CALL, "Profiling IO writes in RC");
-    PDMDevHlpSTAMRegister(pDevIns, &pThis->StatCsR3,        STAMTYPE_PROFILE, "Cs/CsR3",            STAMUNIT_TICKS_PER_CALL, "Profiling CS wait in R3");
-    PDMDevHlpSTAMRegister(pDevIns, &pThis->StatCsR0,        STAMTYPE_PROFILE, "Cs/CsR0",            STAMUNIT_TICKS_PER_CALL, "Profiling CS wait in R0");
-    PDMDevHlpSTAMRegister(pDevIns, &pThis->StatCsRC,        STAMTYPE_PROFILE, "Cs/CsRC",            STAMUNIT_TICKS_PER_CALL, "Profiling CS wait in RC");
 # endif /* VBOX_WITH_STATISTICS */
 

trunk/src/VBox/Devices/VirtIO/Virtio.h

@@ -218 +218 @@
     STAMPROFILEADV          StatIOWriteR0;
     STAMPROFILEADV          StatIOWriteRC;
-    STAMPROFILE             StatCsR3;
-    STAMPROFILE             StatCsR0;
-    STAMPROFILE             StatCsRC;
 #endif
 } VPCISTATE;
@@ -298 +295 @@
 
 #define VPCI_CS
+
+#ifdef VPCI_CS
+# define VPCI_R3_CS_ENTER_RETURN_VOID(a_pDevIns, a_pThis) do { \
+        int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &(a_pThis)->cs, VERR_IGNORED); \
+        PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &(a_pThis)->cs, rcLock); \
+    } while (0)
+#else
+# define VPCI_R3_CS_ENTER_RETURN_VOID(a_pDevIns, a_pThis) do { } while (0)
+#endif
+
 DECLINLINE(int) vpciCsEnter(PPDMDEVINS pDevIns, PVPCISTATE pThis, int rcBusy)
 {
 #ifdef VPCI_CS
-    STAM_PROFILE_START(&pThis->CTX_SUFF(StatCs), a);
-    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->cs, rcBusy);
-    STAM_PROFILE_STOP(&pThis->CTX_SUFF(StatCs), a);
-    return rc;
+    return PDMDevHlpCritSectEnter(pDevIns, &pThis->cs, rcBusy);
 #else
     RT_NOREF(pDevIns, pThis, rcBusy);