Changeset 19440 in vbox

Timestamp:

May 6, 2009 3:19:56 PM (16 years ago)

Author:

vboxsync

Message:

Deal with pause/resume for pause & wait for sipi states.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (3 diffs)
• EMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -163 +163 @@
 
         pVCpu->em.s.enmState     = (i == 0) ? EMSTATE_NONE : EMSTATE_WAIT_SIPI;
+        pVCpu->em.s.enmPrevState = EMSTATE_NONE;
         pVCpu->em.s.fForceRAW    = false;
 
@@ -3615 +3616 @@
         /* Reschedule right away to start in the right state. */
         rc = VINF_SUCCESS;
-        pVCpu->em.s.enmState = emR3Reschedule(pVM, pVCpu, pVCpu->em.s.pCtx);
+
+        /** @todo doesn't work for the save/restore case */
+        if (    pVCpu->em.s.enmState == EMSTATE_SUSPENDED
+            &&  (   pVCpu->em.s.enmPrevState == EMSTATE_WAIT_SIPI
+                 || pVCpu->em.s.enmPrevState == EMSTATE_HALTED))
+        {
+            /* Pause->Resume: Restore the old wait state or else we'll start executing code. */
+            pVCpu->em.s.enmState = pVCpu->em.s.enmPrevState;
+        }
+        else
+            pVCpu->em.s.enmState = emR3Reschedule(pVM, pVCpu, pVCpu->em.s.pCtx);
 
         STAM_REL_PROFILE_ADV_START(&pVCpu->em.s.StatTotal, x);
@@ -3721 +3732 @@
                 case VINF_EM_SUSPEND:
                     Log2(("EMR3ExecuteVM: VINF_EM_SUSPEND: %d -> %d\n", pVCpu->em.s.enmState, EMSTATE_SUSPENDED));
-                    pVCpu->em.s.enmState = EMSTATE_SUSPENDED;
+                    pVCpu->em.s.enmPrevState = pVCpu->em.s.enmState;
+                    pVCpu->em.s.enmState     = EMSTATE_SUSPENDED;
                     break;
 

trunk/src/VBox/VMM/EMInternal.h

@@ -44 +44 @@
 /** The saved state version. */
 #define EM_SAVED_STATE_VERSION                      2
-
-/** Enable for tracing in raw mode.
- * @remark SvL: debugging help primarily for myself. */
-#define DEBUG_TRACING_ENABLED
 
 /**
@@ -314 +310 @@
     /** Execution Manager State. */
     EMSTATE volatile        enmState;
+
+    /** Previous Execution Manager State. */
+    EMSTATE                 enmPrevState;
+
     /** Force raw-mode execution.
      * This is used to prevent REM from trying to execute patch code.
@@ -319 +319 @@
     bool                    fForceRAW;
 
-#ifdef DEBUG_TRACING_ENABLED
-    /** @see DEBUG_TRACING_ENABLED */
-    bool                    fTracing;
-#endif
-
-    uint8_t                 u8Padding[GC_ARCH_BITS == 64 ? 6 : 2];
+    uint8_t                 u8Padding[3];
 
     /** Inhibit interrupts for this instruction. Valid only when VM_FF_INHIBIT_INTERRUPTS is set. */
     RTGCUINTPTR             GCPtrInhibitInterrupts;
-
 
     /** Pointer to the PATM status structure. (R3 Ptr) */