Changeset 87774 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 16, 2021 11:40:35 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142830

Message:

VMM/TM: Removed pVMR3, pVMR0 and pVMRC from TMTIMER. [build fix] bugref:9943

File:

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

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

@@ -450 +450 @@
  * Links a timer into the active list of a timer queue.
  *
+ * @param   pVM             The cross context VM structure.
  * @param   pQueue          The queue.
  * @param   pTimer          The timer.
@@ -456 +457 @@
  * @remarks Called while owning the relevant queue lock.
  */
-DECL_FORCE_INLINE(void) tmTimerQueueLinkActive(PTMTIMERQUEUE pQueue, PTMTIMER pTimer, uint64_t u64Expire)
+DECL_FORCE_INLINE(void) tmTimerQueueLinkActive(PVMCC pVM, PTMTIMERQUEUE pQueue, PTMTIMER pTimer, uint64_t u64Expire)
 {
     Assert(!pTimer->offNext);
     Assert(!pTimer->offPrev);
     Assert(pTimer->enmState == TMTIMERSTATE_ACTIVE || pTimer->enmClock != TMCLOCK_VIRTUAL_SYNC); /* (active is not a stable state) */
+    RT_NOREF(pVM);
 
     PTMTIMER pCur = TMTIMER_GET_HEAD(pQueue);
@@ -478 +480 @@
                     TMTIMER_SET_HEAD(pQueue, pTimer);
                     ASMAtomicWriteU64(&pQueue->u64Expire, u64Expire);
-                    DBGFTRACE_U64_TAG2(pTimer->CTX_SUFF(pVM), u64Expire, "tmTimerQueueLinkActive head", pTimer->szName);
+                    DBGFTRACE_U64_TAG2(pVM, u64Expire, "tmTimerQueueLinkActive head", pTimer->szName);
                 }
                 TMTIMER_SET_PREV(pCur, pTimer);
@@ -487 +489 @@
                 TMTIMER_SET_NEXT(pCur, pTimer);
                 TMTIMER_SET_PREV(pTimer, pCur);
-                DBGFTRACE_U64_TAG2(pTimer->CTX_SUFF(pVM), u64Expire, "tmTimerQueueLinkActive tail", pTimer->szName);
+                DBGFTRACE_U64_TAG2(pVM, u64Expire, "tmTimerQueueLinkActive tail", pTimer->szName);
                 return;
             }
@@ -496 +498 @@
         TMTIMER_SET_HEAD(pQueue, pTimer);
         ASMAtomicWriteU64(&pQueue->u64Expire, u64Expire);
-        DBGFTRACE_U64_TAG2(pTimer->CTX_SUFF(pVM), u64Expire, "tmTimerQueueLinkActive empty", pTimer->szName);
+        DBGFTRACE_U64_TAG2(pVM, u64Expire, "tmTimerQueueLinkActive empty", pTimer->szName);
     }
 }
@@ -531 +533 @@
                 if (RT_UNLIKELY(!tmTimerTry(pTimer, TMTIMERSTATE_PENDING_SCHEDULE, TMTIMERSTATE_PENDING_RESCHEDULE)))
                     break; /* retry */
-                tmTimerQueueUnlinkActive(pQueue, pTimer);
+                tmTimerQueueUnlinkActive(pVM, pQueue, pTimer);
                 RT_FALL_THRU();
 
@@ -541 +543 @@
                 if (RT_UNLIKELY(!tmTimerTry(pTimer, TMTIMERSTATE_ACTIVE, TMTIMERSTATE_PENDING_SCHEDULE)))
                     break; /* retry */
-                tmTimerQueueLinkActive(pQueue, pTimer, pTimer->u64Expire);
+                tmTimerQueueLinkActive(pVM, pQueue, pTimer, pTimer->u64Expire);
                 return;
 
@@ -550 +552 @@
                 if (RT_UNLIKELY(!tmTimerTry(pTimer, TMTIMERSTATE_PENDING_STOP_SCHEDULE, TMTIMERSTATE_PENDING_STOP)))
                     break; /* retry */
-                tmTimerQueueUnlinkActive(pQueue, pTimer);
+                tmTimerQueueUnlinkActive(pVM, pQueue, pTimer);
                 RT_FALL_THRU();
 
@@ -1167 +1169 @@
  * @param   u64Expire       The new expire time.
  */
-static int tmTimerSetOptimizedStart(PVM pVM, PTMTIMER pTimer, uint64_t u64Expire)
+static int tmTimerSetOptimizedStart(PVMCC pVM, PTMTIMER pTimer, uint64_t u64Expire)
 {
     Assert(!pTimer->offPrev);
@@ -1191 +1193 @@
      * Link the timer into the active list.
      */
-    tmTimerQueueLinkActive(&pVM->tm.s.CTX_SUFF(paTimerQueues)[enmClock], pTimer, u64Expire);
+    tmTimerQueueLinkActive(pVM, &pVM->tm.s.CTX_SUFF(paTimerQueues)[enmClock], pTimer, u64Expire);
 
     STAM_COUNTER_INC(&pVM->tm.s.StatTimerSetOpt);
@@ -1233 +1235 @@
             pTimer->u64Expire = u64Expire;
             TM_SET_STATE(pTimer, TMTIMERSTATE_ACTIVE);
-            tmTimerQueueLinkActive(pQueue, pTimer, u64Expire);
+            tmTimerQueueLinkActive(pVM, pQueue, pTimer, u64Expire);
             rc = VINF_SUCCESS;
             break;
@@ -1239 +1241 @@
         case TMTIMERSTATE_ACTIVE:
             STAM_COUNTER_INC(&pVM->tm.s.StatTimerSetVsStActive);
-            tmTimerQueueUnlinkActive(pQueue, pTimer);
+            tmTimerQueueUnlinkActive(pVM, pQueue, pTimer);
             pTimer->u64Expire = u64Expire;
-            tmTimerQueueLinkActive(pQueue, pTimer, u64Expire);
+            tmTimerQueueLinkActive(pVM, pQueue, pTimer, u64Expire);
             rc = VINF_SUCCESS;
             break;
@@ -1492 +1494 @@
      */
     DBGFTRACE_U64_TAG2(pVM, u64Expire, "tmTimerSetRelativeOptimizedStart", pTimer->szName);
-    tmTimerQueueLinkActive(&pVM->tm.s.CTX_SUFF(paTimerQueues)[enmClock], pTimer, u64Expire);
+    tmTimerQueueLinkActive(pVM, &pVM->tm.s.CTX_SUFF(paTimerQueues)[enmClock], pTimer, u64Expire);
 
     STAM_COUNTER_INC(&pVM->tm.s.StatTimerSetRelativeOpt);
@@ -1540 +1542 @@
             pTimer->u64Expire = u64Expire;
             TM_SET_STATE(pTimer, TMTIMERSTATE_ACTIVE);
-            tmTimerQueueLinkActive(pQueue, pTimer, u64Expire);
+            tmTimerQueueLinkActive(pVM, pQueue, pTimer, u64Expire);
             rc = VINF_SUCCESS;
             break;
@@ -1546 +1548 @@
         case TMTIMERSTATE_ACTIVE:
             STAM_COUNTER_INC(&pVM->tm.s.StatTimerSetRelativeVsStActive);
-            tmTimerQueueUnlinkActive(pQueue, pTimer);
+            tmTimerQueueUnlinkActive(pVM, pQueue, pTimer);
             pTimer->u64Expire = u64Expire;
-            tmTimerQueueLinkActive(pQueue, pTimer, u64Expire);
+            tmTimerQueueLinkActive(pVM, pQueue, pTimer, u64Expire);
             rc = VINF_SUCCESS;
             break;
@@ -1882 +1884 @@
     {
         case TMTIMERSTATE_ACTIVE:
-            tmTimerQueueUnlinkActive(pQueue, pTimer);
+            tmTimerQueueUnlinkActive(pVM, pQueue, pTimer);
             TM_SET_STATE(pTimer, TMTIMERSTATE_STOPPED);
             rc = VINF_SUCCESS;