Changeset 92723 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Dec 2, 2021 11:08:59 PM (3 years ago)

Author:

vboxsync

Message:

VMM: More driverless adjustments. bugref:10138

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• DBGFR3Tracer.cpp (modified) (1 diff)
• GMM.cpp (modified) (1 diff)
• NEMR3Native-win.cpp (modified) (1 diff)
• PDMDevice.cpp (modified) (1 diff)
• STAM.cpp (modified) (2 diffs)

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

@@ -922 +922 @@
      * Allocate the tracer instance.
      */
-    if (fR0Enabled /*|| fRCEnabled*/)
+    if ((fR0Enabled /*|| fRCEnabled*/) && !SUPR3IsDriverless())
     {
         AssertLogRel(fR0Enabled /* not possible to just enabled raw-mode atm. */);

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

@@ -289 +289 @@
 
 /**
- * @see GMMR0QueryVMMMemoryStatsReq
+ * @note Caller does the driverless check.
+ * @see  GMMR0QueryVMMMemoryStatsReq
  */
 GMMR3DECL(int)  GMMR3QueryHypervisorMemoryStats(PVM pVM, uint64_t *pcTotalAllocPages, uint64_t *pcTotalFreePages, uint64_t *pcTotalBalloonPages, uint64_t *puTotalBalloonSize)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -1432 +1432 @@
                         }
 
-                        PUVM pUVM = pVM->pUVM;
-                        STAMR3RegisterRefresh(pUVM, &pVM->nem.s.R0Stats.cPagesAvailable, STAMTYPE_U64, STAMVISIBILITY_ALWAYS,
-                                              STAMUNIT_PAGES, STAM_REFRESH_GRP_NEM, "Free pages available to the hypervisor",
-                                              "/NEM/R0Stats/cPagesAvailable");
-                        STAMR3RegisterRefresh(pUVM, &pVM->nem.s.R0Stats.cPagesInUse,     STAMTYPE_U64, STAMVISIBILITY_ALWAYS,
-                                              STAMUNIT_PAGES, STAM_REFRESH_GRP_NEM, "Pages in use by hypervisor",
-                                              "/NEM/R0Stats/cPagesInUse");
+                        if (!SUPR3IsDriverless())
+                        {
+                            PUVM pUVM = pVM->pUVM;
+                            STAMR3RegisterRefresh(pUVM, &pVM->nem.s.R0Stats.cPagesAvailable, STAMTYPE_U64, STAMVISIBILITY_ALWAYS,
+                                                  STAMUNIT_PAGES, STAM_REFRESH_GRP_NEM, "Free pages available to the hypervisor",
+                                                  "/NEM/R0Stats/cPagesAvailable");
+                            STAMR3RegisterRefresh(pUVM, &pVM->nem.s.R0Stats.cPagesInUse,     STAMTYPE_U64, STAMVISIBILITY_ALWAYS,
+                                                  STAMUNIT_PAGES, STAM_REFRESH_GRP_NEM, "Pages in use by hypervisor",
+                                                  "/NEM/R0Stats/cPagesInUse");
+                        }
 
                     }

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

@@ -282 +282 @@
             && !PGMR3IsNemModeEnabled(pVM) /* No ring-0 in simplified memory mode. */
 #endif
-           )
+            && !SUPR3IsDriverless())
         {
             if (pReg->fFlags & PDM_DEVREG_FLAGS_R0)

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

@@ -313 +313 @@
      * Register the ring-0 statistics (GVMM/GMM).
      */
-    stamR3Ring0StatsRegisterU(pUVM);
+    if (!SUPR3IsDriverless())
+        stamR3Ring0StatsRegisterU(pUVM);
 
 #ifdef VBOX_WITH_DEBUGGER
@@ -1857 +1858 @@
     GVMMRESETSTATISTICSSREQ GVMMReq;
     GMMRESETSTATISTICSSREQ  GMMReq;
-    bool fGVMMMatched = !pszPat || !*pszPat;
+    bool fGVMMMatched = (!pszPat || !*pszPat) && !SUPR3IsDriverless();
     bool fGMMMatched  = fGVMMMatched;
     if (fGVMMMatched)