Changeset 41326 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

May 16, 2012 8:51:28 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77996

Message:

EM: don't miss the wakeup after an interrupt was injected in certain cases, in particular when suspending

File:

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

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

@@ -1648 +1648 @@
          * Interrupts.
          */
+        bool fWakeupPending = false;
         if (    !VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY)
             &&  !VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
@@ -1665 +1666 @@
 #endif
                 UPDATE_RC();
+                /* Reschedule required: We must not miss the wakeup below! */
+                fWakeupPending = true;
             }
 #ifdef VBOX_WITH_REM
@@ -1697 +1700 @@
          * EMT Rendezvous (must be serviced before termination).
          */
-        if (VM_FF_ISPENDING(pVM, VM_FF_EMT_RENDEZVOUS))
+        if (   !fWakeupPending /* don't miss the wakeup from EMSTATE_HALTED! */
+            && VM_FF_ISPENDING(pVM, VM_FF_EMT_RENDEZVOUS))
         {
             rc2 = VMMR3EmtRendezvousFF(pVM, pVCpu);
@@ -1716 +1720 @@
          * State change request (cleared by vmR3SetStateLocked).
          */
-        if (VM_FF_ISPENDING(pVM, VM_FF_CHECK_VM_STATE))
+        if (   !fWakeupPending /* don't miss the wakeup from EMSTATE_HALTED! */
+            && VM_FF_ISPENDING(pVM, VM_FF_CHECK_VM_STATE))
         {
             VMSTATE enmState = VMR3GetState(pVM);