Changeset 92713 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 2, 2021 5:34:56 PM (3 years ago)

Author:

vboxsync

Message:

VMM: More driverless mode adjustments. bugref:10138

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PDMAllQueue.cpp (modified) (1 diff)
• VMMR3/GVMMR3.cpp (modified) (1 diff)
• VMMR3/VMM.cpp (modified) (7 diffs)

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

@@ -161 +161 @@
 {
     AssertPtr(pQueue);
-    Assert(pQueue->pVMR3 && pQueue->pVMR0);
+    Assert(pQueue->pVMR3);
 #ifdef IN_RING0
+    AssertPtr(pQueue->pVMR0);
     return pQueue;
 #else
+    Assert(pQueue->pVMR0 || SUPR3IsDriverless());
     return MMHyperCCToR0(pQueue->CTX_SUFF(pVM), pQueue);
 #endif

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

@@ -90 +90 @@
         /* CPUs: */
         PVMCPU pVCpu = (PVMCPU)((uintptr_t)pVM + sizeof(VM) + PAGE_SIZE);
-        for (VMCPUID idxCpu = 0; idxCpu < cCpus; idxCpu++, pVCpu++)
+        for (VMCPUID idxCpu = 0; idxCpu < cCpus; idxCpu++)
         {
             pVM->apCpusR3[idxCpu] = pVCpu;

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

@@ -275 +275 @@
      * Register the Ring-0 VM handle with the session for fast ioctl calls.
      */
-    rc = SUPR3SetVMForFastIOCtl(VMCC_GET_VMR0_FOR_CALL(pVM));
-    if (RT_FAILURE(rc))
-        return rc;
+    bool const fDriverless = SUPR3IsDriverless();
+    if (!fDriverless)
+    {
+        rc = SUPR3SetVMForFastIOCtl(VMCC_GET_VMR0_FOR_CALL(pVM));
+        if (RT_FAILURE(rc))
+            return rc;
+    }
 
 #ifdef VBOX_WITH_NMI
@@ -291 +295 @@
          * Start the log flusher thread.
          */
-        rc = RTThreadCreate(&pVM->vmm.s.hLogFlusherThread, vmmR3LogFlusher, pVM, 0 /*cbStack*/,
-                            RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "R0LogWrk");
+        if (!fDriverless)
+            rc = RTThreadCreate(&pVM->vmm.s.hLogFlusherThread, vmmR3LogFlusher, pVM, 0 /*cbStack*/,
+                                RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "R0LogWrk");
         if (RT_SUCCESS(rc))
         {
@@ -320 +325 @@
 {
     RT_NOREF_PV(pVM);
+
+    /* Nothing to do here in driverless mode. */
+    if (SUPR3IsDriverless())
+        return;
 
     /*
@@ -453 +462 @@
 
     /*
+     * Nothing to do here in driverless mode.
+     */
+    if (SUPR3IsDriverless())
+        return VINF_SUCCESS;
+
+    /*
      * Make sure the ring-0 loggers are up to date.
      */
@@ -558 +573 @@
              * knowledge/information from HM initialization.
              */
+/** @todo r=bird: This shouldn't be done from here, but rather from VM.cpp. There is no dependency on VMM here. */
             rc = GIMR3InitCompleted(pVM);
             AssertRCReturn(rc, rc);
@@ -590 +606 @@
      * Call Ring-0 entry with termination code.
      */
-#ifdef NO_SUPCALLR0VMM
-    //rc = VERR_GENERAL_FAILURE;
     int rc = VINF_SUCCESS;
-#else
-    int rc = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), 0 /*idCpu*/, VMMR0_DO_VMMR0_TERM, 0, NULL);
-#endif
+    if (!SUPR3IsDriverless())
+    {
+#ifndef NO_SUPCALLR0VMM
+        rc = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), 0 /*idCpu*/, VMMR0_DO_VMMR0_TERM, 0, NULL);
+#endif
+    }
 
     /*
@@ -723 +740 @@
 VMMR3_INT_DECL(int) VMMR3UpdateLoggers(PVM pVM)
 {
-    VM_ASSERT_EMT(pVM);
+    /* Nothing to do here if we're in driverless mode: */
+    if (SUPR3IsDriverless())
+        return VINF_SUCCESS;
+
     PVMCPU pVCpu = VMMGetCpu(pVM);
     AssertReturn(pVCpu, VERR_VM_THREAD_NOT_EMT);