Changeset 80025 in vbox

Timestamp:

Jul 28, 2019 2:23:22 PM (5 years ago)

Author:

vboxsync

Message:

VMM: Kicking out raw-mode (work in progress) - VM,VMM. bugref:9517

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• VM.cpp (modified) (6 diffs)
• VMM.cpp (modified) (3 diffs)

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

@@ -862 +862 @@
     {
         ASMCompilerBarrier(); /* HMR3Init will have modified bMainExecutionEngine */
-#ifdef VBOX_WITH_RAW_MODE
-        Assert(   pVM->bMainExecutionEngine == VM_EXEC_ENGINE_HW_VIRT
-               || pVM->bMainExecutionEngine == VM_EXEC_ENGINE_RAW_MODE
-               || pVM->bMainExecutionEngine == VM_EXEC_ENGINE_NATIVE_API);
-#else
         Assert(   pVM->bMainExecutionEngine == VM_EXEC_ENGINE_HW_VIRT
                || pVM->bMainExecutionEngine == VM_EXEC_ENGINE_NATIVE_API);
-#endif
         rc = MMR3Init(pVM);
         if (RT_SUCCESS(rc))
@@ -932 +926 @@
                                                                             if (RT_SUCCESS(rc))
                                                                                 rc = MMR3HyperInitFinalize(pVM);
-#ifdef VBOX_WITH_RAW_MODE
-                                                                            if (RT_SUCCESS(rc))
-                                                                                rc = PATMR3InitFinalize(pVM);
-#endif
                                                                             if (RT_SUCCESS(rc))
                                                                                 rc = PGMR3InitFinalize(pVM);
@@ -1050 +1040 @@
 
 
-#ifdef VBOX_WITH_RAW_MODE
-/**
- * Initializes all RC components of the VM
- */
-static int vmR3InitRC(PVM pVM)
-{
-    LogFlow(("vmR3InitRC:\n"));
-
-    /*
-     * Check for FAKE suplib mode.
-     */
-    int rc = VINF_SUCCESS;
-    const char *psz = RTEnvGet("VBOX_SUPLIB_FAKE");
-    if (!psz || strcmp(psz, "fake"))
-    {
-        /*
-         * Call the VMMR0 component and let it do the init.
-         */
-        rc = VMMR3InitRC(pVM);
-    }
-    else
-        Log(("vmR3InitRC: skipping because of VBOX_SUPLIB_FAKE=fake\n"));
-
-    /*
-     * Do notifications and return.
-     */
-    if (RT_SUCCESS(rc))
-        rc = vmR3InitDoCompleted(pVM, VMINITCOMPLETED_RC);
-    LogFlow(("vmR3InitRC: returns %Rrc\n", rc));
-    return rc;
-}
-#endif /* VBOX_WITH_RAW_MODE */
-
-
 /**
  * Do init completed notifications.
@@ -1144 +1100 @@
     SELMR3Relocate(pVM);                /* !hack! fix stack! */
     TRPMR3Relocate(pVM, offDelta);
-#ifdef VBOX_WITH_RAW_MODE
-    PATMR3Relocate(pVM, (RTRCINTPTR)offDelta);
-    CSAMR3Relocate(pVM, offDelta);
-#endif
     IOMR3Relocate(pVM, offDelta);
     EMR3Relocate(pVM);
@@ -2392 +2344 @@
         rc = IOMR3Term(pVM);
         AssertRC(rc);
-#ifdef VBOX_WITH_RAW_MODE
-        rc = CSAMR3Term(pVM);
-        AssertRC(rc);
-        rc = PATMR3Term(pVM);
-        AssertRC(rc);
-#endif
         rc = TRPMR3Term(pVM);
         AssertRC(rc);
@@ -2786 +2732 @@
     if (pVCpu->idCpu == 0)
     {
-#ifdef VBOX_WITH_RAW_MODE
-        PATMR3Reset(pVM);
-        CSAMR3Reset(pVM);
-#endif
         GIMR3Reset(pVM);                /* This must come *before* PDM and TM. */
         PDMR3Reset(pVM);

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

@@ -348 +348 @@
             pVCpu->vmm.s.pbEMTStackR3 += PAGE_SIZE;
 #endif
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-            /* MMHyperR3ToR0 returns R3 when not doing hardware assisted virtualization. */
-            if (VM_IS_RAW_MODE_ENABLED(pVM))
-                pVCpu->vmm.s.CallRing3JmpBufR0.pvSavedStack = NIL_RTR0PTR;
-            else
-#endif
-                pVCpu->vmm.s.CallRing3JmpBufR0.pvSavedStack = MMHyperR3ToR0(pVM, pVCpu->vmm.s.pbEMTStackR3);
+            pVCpu->vmm.s.CallRing3JmpBufR0.pvSavedStack = MMHyperR3ToR0(pVM, pVCpu->vmm.s.pbEMTStackR3);
 
         }
@@ -870 +864 @@
 VMMR3DECL(const char *) VMMR3GetRZAssertMsg1(PVM pVM)
 {
-    if (!VM_IS_RAW_MODE_ENABLED(pVM))
-        return pVM->vmm.s.szRing0AssertMsg1;
-
-    RTRCPTR RCPtr;
-    int rc = PDMR3LdrGetSymbolRC(pVM, NULL, "g_szRTAssertMsg1", &RCPtr);
-    if (RT_SUCCESS(rc))
-        return (const char *)MMHyperRCToR3(pVM, RCPtr);
-
-    return NULL;
+    return pVM->vmm.s.szRing0AssertMsg1;
 }
 
@@ -907 +893 @@
 VMMR3DECL(const char *) VMMR3GetRZAssertMsg2(PVM pVM)
 {
-    if (!VM_IS_RAW_MODE_ENABLED(pVM))
-        return pVM->vmm.s.szRing0AssertMsg2;
-
-    RTRCPTR RCPtr;
-    int rc = PDMR3LdrGetSymbolRC(pVM, NULL, "g_szRTAssertMsg2", &RCPtr);
-    if (RT_SUCCESS(rc))
-        return (const char *)MMHyperRCToR3(pVM, RCPtr);
-
-    return NULL;
+    return pVM->vmm.s.szRing0AssertMsg2;
 }