Changeset 20040 in vbox for trunk/src

Timestamp:

May 26, 2009 1:40:35 PM (16 years ago)

Author:

vboxsync

Message:

VMM/EM: accept EMSTATE_HALTED, it's normal when resuming execution of a VM with saved state

File:

• trunk/src/VBox/VMM/EM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -3657 +3657 @@
              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_WAIT_SIPI || 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 || pVCpu->em.s.enmState == EMSTATE_HALTED);
 
     int rc = setjmp(pVCpu->em.s.u.FatalLongJump);