Changeset 87760 in vbox for trunk/src/VBox/VMM/VMMAll/TMAll.cpp

Timestamp:

Feb 15, 2021 10:45:27 PM (4 years ago)

Author:

vboxsync

Message:

VMM/TM,VMM/DevHlp: Require flag on timers that are to be used in ring-0 (and while refactoring a counte flag to check that all timers have been checked). Removed obsolete timer device helpers. bugref:9943

File:

• trunk/src/VBox/VMM/VMMAll/TMAll.cpp (modified) (20 diffs)

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

@@ -1109 +1109 @@
 VMMDECL(PTMTIMERR3) TMTimerR3Ptr(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     return (PTMTIMERR3)MMHyperCCToR3(pTimer->CTX_SUFF(pVM), pTimer);
 }
@@ -1121 +1124 @@
 VMMDECL(PTMTIMERR0) TMTimerR0Ptr(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     return (PTMTIMERR0)MMHyperCCToR0(pTimer->CTX_SUFF(pVM), pTimer);
 }
@@ -1133 +1139 @@
 VMMDECL(PTMTIMERRC) TMTimerRCPtr(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     return (PTMTIMERRC)MMHyperCCToRC(pTimer->CTX_SUFF(pVM), pTimer);
 }
@@ -1152 +1161 @@
 VMMDECL(int) TMTimerLock(PTMTIMER pTimer, int rcBusy)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     AssertPtr(pTimer);
     AssertReturn(pTimer->enmClock == TMCLOCK_VIRTUAL_SYNC, VERR_NOT_SUPPORTED);
@@ -1165 +1177 @@
 VMMDECL(void) TMTimerUnlock(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     AssertPtr(pTimer);
     AssertReturnVoid(pTimer->enmClock == TMCLOCK_VIRTUAL_SYNC);
@@ -1179 +1194 @@
 VMMDECL(bool) TMTimerIsLockOwner(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     AssertPtr(pTimer);
     AssertReturn(pTimer->enmClock == TMCLOCK_VIRTUAL_SYNC, false);
@@ -1306 +1324 @@
 VMMDECL(int) TMTimerSet(PTMTIMER pTimer, uint64_t u64Expire)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     PVMCC pVM = pTimer->CTX_SUFF(pVM);
     STAM_COUNTER_INC(&pTimer->StatSetAbsolute);
@@ -1613 +1634 @@
 VMMDECL(int) TMTimerSetRelative(PTMTIMER pTimer, uint64_t cTicksToNext, uint64_t *pu64Now)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     PVMCC pVM = pTimer->CTX_SUFF(pVM);
     STAM_COUNTER_INC(&pTimer->StatSetRelative);
@@ -1841 +1865 @@
 VMMDECL(int) TMTimerSetFrequencyHint(PTMTIMER pTimer, uint32_t uHzHint)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     TMTIMER_ASSERT_CRITSECT(pTimer);
 
@@ -1936 +1963 @@
 VMMDECL(int) TMTimerStop(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     PVMCC pVM = pTimer->CTX_SUFF(pVM);
     STAM_COUNTER_INC(&pTimer->StatStop);
@@ -2044 +2074 @@
 VMMDECL(uint64_t) TMTimerGet(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     PVMCC pVM = pTimer->CTX_SUFF(pVM);
     STAM_COUNTER_INC(&pTimer->StatGet);
@@ -2077 +2110 @@
 VMMDECL(uint64_t) TMTimerGetFreq(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     switch (pTimer->enmClock)
     {
@@ -2102 +2138 @@
 VMMDECL(uint64_t) TMTimerGetExpire(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     TMTIMER_ASSERT_CRITSECT(pTimer);
     int cRetries = 1000;
@@ -2164 +2203 @@
 VMMDECL(bool) TMTimerIsActive(PTMTIMER pTimer)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     TMTIMERSTATE enmState = pTimer->enmState;
     switch (enmState)
@@ -2341 +2383 @@
 VMMDECL(uint64_t) TMTimerToNano(PTMTIMER pTimer, uint64_t u64Ticks)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     switch (pTimer->enmClock)
     {
@@ -2370 +2415 @@
 VMMDECL(uint64_t) TMTimerToMicro(PTMTIMER pTimer, uint64_t u64Ticks)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     switch (pTimer->enmClock)
     {
@@ -2399 +2447 @@
 VMMDECL(uint64_t) TMTimerToMilli(PTMTIMER pTimer, uint64_t u64Ticks)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     switch (pTimer->enmClock)
     {
@@ -2427 +2478 @@
 VMMDECL(uint64_t) TMTimerFromNano(PTMTIMER pTimer, uint64_t cNanoSecs)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     switch (pTimer->enmClock)
     {
@@ -2455 +2509 @@
 VMMDECL(uint64_t) TMTimerFromMicro(PTMTIMER pTimer, uint64_t cMicroSecs)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     switch (pTimer->enmClock)
     {
@@ -2483 +2540 @@
 VMMDECL(uint64_t) TMTimerFromMilli(PTMTIMER pTimer, uint64_t cMilliSecs)
 {
+#ifdef IN_RING0
+    Assert(pTimer->fFlags & TMTIMER_FLAGS_RING0);
+#endif
     switch (pTimer->enmClock)
     {