Changeset 4932 in vbox

Timestamp:

Sep 20, 2007 2:12:41 PM (17 years ago)

Author:

vboxsync

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

24680

Message:

Always use the ioctl path for hwaccm code execution.

Location:

trunk/src/VBox/VMM

Files:

• VMM.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)
• VMMR0/VMMR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMM.cpp

@@ -1957 +1957 @@
             rc = VERR_GENERAL_FAILURE;
 #else
-            //rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_HWACC_RUN, NULL, 0);
-# if !defined(RT_OS_LINUX) /* Alternative for debugging - currently untested on linux. */
             rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_HWACC_RUN);
-# else
-            rc = SUPCallVMMR0(pVM->pVMR0, VMMR0_DO_HWACC_RUN, NULL);
-# endif
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);

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

@@ -1036 +1036 @@
     /* All done! Let's start VM execution. */
     STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatInGC, x);
-    Assert(!(ASMGetFlags() & X86_EFL_IF));
     if (pVM->hwaccm.s.vmx.fResumeVM == false)
         rc = VMXStartVM(pCtx);
     else
         rc = VMXResumeVM(pCtx);
-    Assert(!(ASMGetFlags() & X86_EFL_IF));
 
     /* In case we execute a goto ResumeExecution later on. */
@@ -1958 +1956 @@
         return rc;
     }
-    Assert(!(ASMGetFlags() & X86_EFL_IF));
     pVM->hwaccm.s.vmx.fResumeVM = false;
     return VINF_SUCCESS;
@@ -1974 +1971 @@
     Assert(pVM->hwaccm.s.vmx.fSupported);
 
-    Assert(!(ASMGetFlags() & X86_EFL_IF));
-
     /* Clear VM Control Structure. Marking it inactive, clearing implementation specific data and writing back VMCS data to memory. */
     int rc = VMXClearVMCS(pVM->hwaccm.s.vmx.pVMCSPhys);

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

@@ -489 +489 @@
 
         /*
-         * Run guest code using the available hardware acceleration technology.
-         */
-        case VMMR0_DO_HWACC_RUN:
-        {
-            STAM_COUNTER_INC(&pVM->vmm.s.StatRunGC);
-            int rc = HWACCMR0Enable(pVM);
-            if (VBOX_SUCCESS(rc))
-            {
-#ifdef DEBUG_NO_RING0_ASSERTIONS
-                g_pVMAssert = pVM;
-#endif
-                rc = vmmR0CallHostSetJmp(&pVM->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM); /* this may resume code. */
-#ifdef DEBUG_NO_RING0_ASSERTIONS
-                g_pVMAssert = 0;
-#endif
-                int rc2 = HWACCMR0Disable(pVM);
-                AssertRC(rc2);
-            }
-            pVM->vmm.s.iLastGCRc = rc;
-
-#ifdef VBOX_WITH_STATISTICS
-            vmmR0RecordRC(pVM, rc);
-#endif
-            /* No special action required for external interrupts, just return. */
-            return rc;
-        }
-
-        /*
          * Initialize the R0 part of a VM instance.
          */
@@ -534 +506 @@
             RTCCUINTREG fFlags = ASMIntDisableFlags();
             int rc = VMMR0Term(pVM);
-            ASMSetFlags(fFlags);
-            return rc;
-        }
-
-        /*
-         * Setup the hardware accelerated raw-mode session.
-         */
-        case VMMR0_DO_HWACC_SETUP_VM:
-        {
-            RTCCUINTREG fFlags = ASMIntDisableFlags();
-            int rc = HWACCMR0SetupVMX(pVM);
             ASMSetFlags(fFlags);
             return rc;
@@ -679 +640 @@
     switch (enmOperation)
     {
-#if 1 /* disable later? */
-        /*
-         * Alternative to the fast path, all we need to do is disable interrupts.
-         */
-        case VMMR0_DO_RAW_RUN:
-        case VMMR0_DO_HWACC_RUN:
-        {
-            RTCCUINTREG fFlags = ASMIntDisableFlags();
-            int rc = VMMR0EntryFast(pVM, enmOperation);
-            ASMSetFlags(fFlags);
-            return rc;
-        }
-#endif
-
         /*
          * Initialize the R0 part of a VM instance.