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

Timestamp:

Aug 5, 2011 2:02:53 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt,FE/BFE,MachineDebugger,EM: Added execution scheduling options to the Qt GUI and reworked the main/VMM interface.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (2 diffs)
• EMRaw.cpp (modified) (2 diffs)

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

@@ -586 +586 @@
 
 /**
+ * Argument packet for emR3SetExecutionPolicy.
+ */
+struct EMR3SETEXECPOLICYARGS
+{
+    EMEXECPOLICY    enmPolicy;
+    bool            fEnforce;
+};
+
+
+/**
+ * @callback_method_impl{FNVMMEMTRENDEZVOUS, Rendezvous callback for EMR3SetExecutionPolicy.}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) emR3SetExecutionPolicy(PVM pVM, PVMCPU pVCpu, void *pvUser)
+{
+    /*
+     * Only the first CPU changes the variables.
+     */
+    if (pVCpu->idCpu == 0)
+    {
+        struct EMR3SETEXECPOLICYARGS *pArgs = (struct EMR3SETEXECPOLICYARGS *)pvUser;
+        switch (pArgs->enmPolicy)
+        {
+            case EMEXECPOLICY_RECOMPILE_RING0:
+                pVM->fRawR0Enabled = !pArgs->fEnforce;
+                break;
+            case EMEXECPOLICY_RECOMPILE_RING3:
+                pVM->fRawR3Enabled = !pArgs->fEnforce;
+                break;
+            default:
+                AssertFailedReturn(VERR_INVALID_PARAMETER);
+        }
+        Log(("emR3SetExecutionPolicy: fRawR3Enabled=%RTbool fRawR0Enabled=%RTbool\n",
+              pVM->fRawR3Enabled, pVM->fRawR0Enabled));
+    }
+
+    /*
+     * Force rescheduling if in RAW, HWACCM or REM.
+     */
+    return    pVCpu->em.s.enmState == EMSTATE_RAW
+           || pVCpu->em.s.enmState == EMSTATE_HWACC
+           || pVCpu->em.s.enmState == EMSTATE_REM
+         ? VINF_EM_RESCHEDULE
+         : VINF_SUCCESS;
+}
+
+
+/**
+ * Changes a the execution scheduling policy.
+ *
+ * This is used to enable or disable raw-mode / hardware-virtualization
+ * execution of user and supervisor code.
+ *
+ * @returns VINF_SUCCESS on success.
+ * @returns VINF_RESCHEDULE if a rescheduling might be required.
+ * @returns VERR_INVALID_PARAMETER on an invalid enmMode value.
+ *
+ * @param   pVM             The VM to operate on.
+ * @param   enmPolicy       The scheduling policy to change.
+ * @param   fEnforce        Whether to enforce the policy or not.
+ */
+VMMR3DECL(int) EMR3SetExecutionPolicy(PVM pVM, EMEXECPOLICY enmPolicy, bool fEnforce)
+{
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    AssertReturn(enmPolicy > EMEXECPOLICY_INVALID && enmPolicy < EMEXECPOLICY_END, VERR_INVALID_PARAMETER);
+
+    struct EMR3SETEXECPOLICYARGS Args = { enmPolicy, fEnforce };
+    return VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_DESCENDING, emR3SetExecutionPolicy, &Args);
+}
+
+
+/**
  * Raise a fatal error.
  *
@@ -616 +687 @@
         case EMSTATE_HWACC:             return "EMSTATE_HWACC";
         case EMSTATE_REM:               return "EMSTATE_REM";
-        case EMSTATE_PARAV:             return "EMSTATE_PARAV";
         case EMSTATE_HALTED:            return "EMSTATE_HALTED";
         case EMSTATE_WAIT_SIPI:         return "EMSTATE_WAIT_SIPI";

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

@@ -68 +68 @@
 
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-
 
 /*******************************************************************************
@@ -87 +83 @@
 #define EMHANDLERC_WITH_PATM
 #include "EMHandleRCTmpl.h"
-
-/**
- * Enables or disables a set of raw-mode execution modes.
- *
- * @returns VINF_SUCCESS on success.
- * @returns VINF_RESCHEDULE if a rescheduling might be required.
- * @returns VERR_INVALID_PARAMETER on an invalid enmMode value.
- *
- * @param   pVM         The VM to operate on.
- * @param   enmMode     The execution mode change.
- * @thread  The emulation thread.
- */
-VMMR3DECL(int) EMR3RawSetMode(PVM pVM, EMRAWMODE enmMode)
-{
-    switch (enmMode)
-    {
-        case EMRAW_NONE:
-            pVM->fRawR3Enabled = false;
-            pVM->fRawR0Enabled = false;
-            break;
-        case EMRAW_RING3_ENABLE:
-            pVM->fRawR3Enabled = true;
-            break;
-        case EMRAW_RING3_DISABLE:
-            pVM->fRawR3Enabled = false;
-            break;
-        case EMRAW_RING0_ENABLE:
-            pVM->fRawR0Enabled = true;
-            break;
-        case EMRAW_RING0_DISABLE:
-            pVM->fRawR0Enabled = false;
-            break;
-        default:
-            AssertMsgFailed(("Invalid enmMode=%d\n", enmMode));
-            return VERR_INVALID_PARAMETER;
-    }
-    Log(("EMR3SetRawMode: fRawR3Enabled=%RTbool fRawR0Enabled=%RTbool\n",
-          pVM->fRawR3Enabled, pVM->fRawR0Enabled));
-    return pVM->aCpus[0].em.s.enmState == EMSTATE_RAW ? VINF_EM_RESCHEDULE : VINF_SUCCESS;
-}