Changeset 46918 in vbox

Timestamp:

Jul 2, 2013 5:45:04 PM (12 years ago)

Author:

vboxsync

Message:

EM.cpp: fIemExecutesAll fixes.

File:

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

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

@@ -1838 +1838 @@
                 /** @todo this really isn't nice, should properly handle this */
                 rc2 = TRPMR3InjectEvent(pVM, pVCpu, TRPM_HARDWARE_INT);
+                if (pVM->em.s.fIemExecutesAll && rc2 == VINF_EM_RESCHEDULE_REM)
+                    rc2 = VINF_EM_RESCHEDULE;
 #ifdef VBOX_STRICT
                 rcIrq = rc2;
@@ -1849 +1851 @@
             else if (REMR3QueryPendingInterrupt(pVM, pVCpu) != REM_NO_PENDING_IRQ)
             {
+                Log2(("REMR3QueryPendingInterrupt -> %#x\n", REMR3QueryPendingInterrupt(pVM, pVCpu)));
                 rc2 = VINF_EM_RESCHEDULE_REM;
                 UPDATE_RC();
@@ -2050 +2053 @@
         else
             pVCpu->em.s.enmState = emR3Reschedule(pVM, pVCpu, pVCpu->em.s.pCtx);
+        Log(("EMR3ExecuteVM: enmState=%s\n", emR3GetStateName(pVCpu->em.s.enmState)));
 
         STAM_REL_PROFILE_ADV_START(&pVCpu->em.s.StatTotal, x);
@@ -2097 +2101 @@
                 case VINF_EM_RESCHEDULE_RAW:
                     Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_RAW: %d -> %d (EMSTATE_RAW)\n", enmOldState, EMSTATE_RAW));
-                    pVCpu->em.s.enmState = EMSTATE_RAW;
+                    Assert(!pVM->em.s.fIemExecutesAll || pVCpu->em.s.enmState != EMSTATE_IEM);
                     break;
 
@@ -2105 +2109 @@
                 case VINF_EM_RESCHEDULE_HM:
                     Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_HM: %d -> %d (EMSTATE_HM)\n", enmOldState, EMSTATE_HM));
+                    Assert(!pVM->em.s.fIemExecutesAll || pVCpu->em.s.enmState != EMSTATE_IEM);
                     Assert(!pVCpu->em.s.fForceRAW);
                     pVCpu->em.s.enmState = EMSTATE_HM;
@@ -2114 +2119 @@
                 case VINF_EM_RESCHEDULE_REM:
                     Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_REM: %d -> %d (EMSTATE_REM)\n", enmOldState, EMSTATE_REM));
+                    Assert(!pVM->em.s.fIemExecutesAll || pVCpu->em.s.enmState != EMSTATE_IEM);
                     pVCpu->em.s.enmState = EMSTATE_REM;
                     break;