Changeset 93717 in vbox for trunk/src/VBox

Timestamp:

Feb 14, 2022 10:55:27 AM (3 years ago)

Author:

vboxsync

Message:

VMM/TM: Internal timers never have a critical section set, so tmRZTimerGetCritSect doesn't need to do anything special and can just return NULL. bugref:10093 bugref:9943

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/TMAll.cpp (modified) (1 diff)
• VMMR3/TM.cpp (modified) (1 diff)

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

@@ -141 +141 @@
             return (PPDMCRITSECT)((uintptr_t)pDevInsR0->pvInstanceDataR0 + offCritSect);
     }
-    return (PPDMCRITSECT)MMHyperR3ToCC(pVM, pTimer->pCritSect);
+    RT_NOREF(pVM);
+    Assert(pTimer->pCritSect == NULL);
+    return NULL;
 }
 #endif /* VBOX_STRICT && IN_RING0 */

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

@@ -3099 +3099 @@
     AssertReturn(!pTimer->pCritSect, VERR_ALREADY_EXISTS);
     AssertReturn(pTimer->enmState == TMTIMERSTATE_STOPPED, VERR_INVALID_STATE);
+    AssertReturn(   pTimer->enmType == TMTIMERTYPE_DEV
+                 || pTimer->enmType == TMTIMERTYPE_DRV
+                 || pTimer->enmType == TMTIMERTYPE_USB,
+                 VERR_NOT_SUPPORTED); /* Not supported on internal timers, see tmRZTimerGetCritSect. */
     LogFlow(("pTimer=%p (%s) pCritSect=%p (%s)\n", pTimer, pTimer->szName, pCritSect, pszName));