Changeset 19426 in vbox for trunk/src/VBox/VMM

Timestamp:

May 6, 2009 1:02:34 PM (16 years ago)

Author:

vboxsync

Message:

EMSTATE_WAIT_SIPI changes

File:

• trunk/src/VBox/VMM/EM.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -162 +162 @@
         pVCpu->em.s.offVMCPU = RT_OFFSETOF(VMCPU, em.s);
 
-        pVCpu->em.s.enmState     = EMSTATE_NONE;
+        pVCpu->em.s.enmState     = (i == 0) ? EMSTATE_NONE : EMSTATE_WAIT_SIPI;
         pVCpu->em.s.fForceRAW    = false;
 
@@ -634 +634 @@
         case EMSTATE_PARAV:             return "EMSTATE_PARAV";
         case EMSTATE_HALTED:            return "EMSTATE_HALTED";
+        case EMSTATE_WAIT_SIPI:         return "EMSTATE_WAIT_SIPI";
         case EMSTATE_SUSPENDED:         return "EMSTATE_SUSPENDED";
         case EMSTATE_TERMINATING:       return "EMSTATE_TERMINATING";
@@ -3103 +3104 @@
         return EMSTATE_RAW;
 
+    /*
+     * We stay in the wait for SIPI state unless explicitly told otherwise. 
+     */
+    if (pVCpu->em.s.enmState == EMSTATE_WAIT_SIPI)
+        return EMSTATE_WAIT_SIPI;
+
     /* !!! THIS MUST BE IN SYNC WITH remR3CanExecuteRaw !!! */
     /* !!! THIS MUST BE IN SYNC WITH remR3CanExecuteRaw !!! */
@@ -3588 +3595 @@
              pVCpu->em.s.enmState, EMR3GetStateName(pVCpu->em.s.enmState), pVCpu->em.s.fForceRAW));
     VM_ASSERT_EMT(pVM);
-    Assert(pVCpu->em.s.enmState == EMSTATE_NONE || pVCpu->em.s.enmState == EMSTATE_SUSPENDED);
+    Assert(pVCpu->em.s.enmState == EMSTATE_NONE || pVCpu->em.s.enmState == EMSTATE_WAIT_SIPI || pVCpu->em.s.enmState == EMSTATE_SUSPENDED);
 
     int rc = setjmp(pVCpu->em.s.u.FatalLongJump);
@@ -3731 +3738 @@
                     else
                     {
-                        /* All other VCPUs go into the halted state until woken up again. */
-                        pVCpu->em.s.enmState = EMSTATE_HALTED;
+                        /* All other VCPUs go into the wait for SIPI state. */
+                        pVCpu->em.s.enmState = EMSTATE_WAIT_SIPI;
                     }
                     break;
@@ -3880 +3887 @@
 
                 /*
+                 * Application processor execution halted until SIPI.
+                 */
+                case EMSTATE_WAIT_SIPI:
+                    Assert(!(CPUMGetGuestEFlags(pVCpu) & X86_EFL_IF));
+                    /* no break */
+                /*
                  * hlt - execution halted until interrupt.
                  */