Changeset 93654 in vbox for trunk/src/VBox

Timestamp:

Feb 8, 2022 12:26:36 PM (3 years ago)

Author:

vboxsync

Message:

TM: Set up the tm.s.VirtualGetRawDataR0 pointers in ring-0. bugref:10094

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/TMR0.cpp (modified) (1 diff)
• VMMR3/TM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/TMR0.cpp

@@ -51 +51 @@
         pGVM->tmr0.s.aTimerQueues[idxQueue].hMapObj = NIL_RTR0MEMOBJ;
     }
+
+    pGVM->tm.s.VirtualGetRawDataR0.pu64Prev       = &pGVM->tm.s.u64VirtualRawPrev;
+    pGVM->tm.s.VirtualGetRawDataR0.pfnBad         = tmVirtualNanoTSBad;
+    pGVM->tm.s.VirtualGetRawDataR0.pfnBadCpuIndex = tmVirtualNanoTSBadCpuIndex;
+    pGVM->tm.s.VirtualGetRawDataR0.pfnRediscover  = tmVirtualNanoTSRediscover;
+    pGVM->tm.s.pfnVirtualGetRawR0                 = tmVirtualNanoTSRediscover;
 }
 

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

@@ -292 +292 @@
     pVM->tm.s.VirtualGetRawDataR3.pfnBadCpuIndex = tmVirtualNanoTSBadCpuIndex;
     pVM->tm.s.VirtualGetRawDataR3.pu64Prev       = &pVM->tm.s.u64VirtualRawPrev;
-    if (!SUPR3IsDriverless())
-    {
-        pVM->tm.s.VirtualGetRawDataR0.pu64Prev   = MMHyperR3ToR0(pVM, (void *)&pVM->tm.s.u64VirtualRawPrev);
-        AssertRelease(pVM->tm.s.VirtualGetRawDataR0.pu64Prev);
-    }
-    /* The rest is done in TMR3InitFinalize() since it's too early to call PDM. */
 
     /*
@@ -1072 +1066 @@
     int rc;
 
-    /*
-     * Resolve symbols, unless we're in driverless mode.
-     */
-    if (!SUPR3IsDriverless())
-    {
-        rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBad",           &pVM->tm.s.VirtualGetRawDataR0.pfnBad);
-        AssertRCReturn(rc, rc);
-        rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBadCpuIndex",   &pVM->tm.s.VirtualGetRawDataR0.pfnBadCpuIndex);
-        AssertRCReturn(rc, rc);
-        rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSRediscover",    &pVM->tm.s.VirtualGetRawDataR0.pfnRediscover);
-        AssertRCReturn(rc, rc);
-        pVM->tm.s.pfnVirtualGetRawR0 = pVM->tm.s.VirtualGetRawDataR0.pfnRediscover;
-    }
-
 #ifndef VBOX_WITHOUT_NS_ACCOUNTING
     /*