Changeset 1976 in vbox for trunk

Timestamp:

Apr 6, 2007 4:55:59 PM (18 years ago)

Author:

vboxsync

Message:

Never inject interrupts or traps before we sync the GDT/IDT/LDT and TSS.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (5 diffs)
• EMInternal.h (modified) (2 diffs)
• TRPM.cpp (modified) (1 diff)
• VMMAll/TRPMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -373 +373 @@
 static DECLCALLBACK(int) emR3Save(PVM pVM, PSSMHANDLE pSSM)
 {
+    SSMR3PutBool(pSSM, pVM->em.s.fRawModeUsed);
+    SSMR3PutBool(pSSM, pVM->em.s.fHwAccModeUsed);
     return SSMR3PutBool(pSSM, pVM->em.s.fForceRAW);
 }
@@ -399 +401 @@
      * Load the saved state.
      */
-    int rc = SSMR3GetBool(pSSM, &pVM->em.s.fForceRAW);
+    int rc = SSMR3GetBool(pSSM, &pVM->em.s.fRawModeUsed);
+    if (VBOX_FAILURE(rc))
+        pVM->em.s.fRawModeUsed = false;
+
+    rc = SSMR3GetBool(pSSM, &pVM->em.s.fHwAccModeUsed);
+    if (VBOX_FAILURE(rc))
+        pVM->em.s.fHwAccModeUsed = false;
+
+    rc = SSMR3GetBool(pSSM, &pVM->em.s.fForceRAW);
     if (VBOX_FAILURE(rc))
         pVM->em.s.fForceRAW = false;
@@ -2430 +2440 @@
 }
 
+/**
+ * Check for pending raw actions
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ */
+EMR3DECL(int) EMR3CheckRawForcedActions(PVM pVM)
+{
+    int rc = VINF_SUCCESS;
+
+    /* Too early if we haven't entered raw or hw accelerated mode yet */
+    /** @todo fix this properly */
+    if (    pVM->em.s.fHwAccModeUsed 
+        ||  pVM->em.s.fRawModeUsed)
+    {
+        rc = emR3RawForcedActions(pVM, pVM->em.s.pCtx);
+    }
+
+    return rc;
+}
+
 
 /**
@@ -2628 +2659 @@
         LogFlow(("VMMR3RawRunGC returned %Vrc\n", rc));
 
+        /* Signal that we've used raw mode for the first time */
+        pVM->em.s.fRawModeUsed = true;
 
         /*
@@ -2839 +2872 @@
         STAM_PROFILE_STOP(&pVM->em.s.StatHwAccExec, x);
 
+        /* Signal that we've used hardware accelerated mode for the first time */
+        pVM->em.s.fHwAccModeUsed = true;
 
         /*

trunk/src/VBox/VMM/EMInternal.h

@@ -42 +42 @@
 
 /** The saved state version. */
-#define EM_SAVED_STATE_VERSION  2
+#define EM_SAVED_STATE_VERSION  3
 
 /** Enable for tracing in raw mode.
@@ -237 +237 @@
      * The flag is cleared upon entering emR3RawExecute() and updated in certain return paths. */
     bool                    fForceRAW;
+
+    /* Set when raw mode was used for the first time */
+    bool                    fRawModeUsed;
+    /* Set when hardware accelerated mode was used for the first time */
+    bool                    fHwAccModeUsed;
+
 #ifdef DEBUG_TRACING_ENABLED
     /** @see DEBUG_TRACING_ENABLED */

trunk/src/VBox/VMM/TRPM.cpp

@@ -1321 +1321 @@
             if (pVM->trpm.s.aGuestTrapHandler[u8Interrupt] != TRPM_INVALID_HANDLER)
             {
+                EMR3CheckRawForcedActions(pVM);
+                
                 /* There's a handler -> let's execute it in raw mode */
                 rc = TRPMForwardTrap(pVM, CPUMCTX2CORE(pCtx), u8Interrupt, 0, TRPM_TRAP_NO_ERRORCODE, enmEvent);
                 if (rc == VINF_SUCCESS /* Don't use VBOX_SUCCESS */)
                 {
+                    Assert(!VM_FF_ISPENDING(pVM, VM_FF_SELM_SYNC_GDT | VM_FF_SELM_SYNC_LDT | VM_FF_TRPM_SYNC_IDT | VM_FF_SELM_SYNC_TSS));
+
                     STAM_COUNTER_INC(&pVM->trpm.s.paStatForwardedIRQR3[u8Interrupt]);
                     return VINF_EM_RESCHEDULE_RAW;

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

@@ -433 +433 @@
 
         Assert(PATMAreInterruptsEnabledByCtxCore(pVM, pRegFrame));
+        Assert(!VM_FF_ISPENDING(pVM, VM_FF_SELM_SYNC_GDT | VM_FF_SELM_SYNC_LDT | VM_FF_TRPM_SYNC_IDT | VM_FF_SELM_SYNC_TSS));
 
         /* Get the current privilege level. */