Changeset 19226 in vbox for trunk/src/VBox/VMM/EM.cpp

Timestamp:

Apr 28, 2009 7:19:13 AM (16 years ago)

Author:

vboxsync

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

46605

Message:

Fixed action flag splitup regression (#3869)

File:

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

trunk/src/VBox/VMM/EM.cpp

@@ -3391 +3391 @@
      */
     if (    VM_FF_ISPENDING(pVM, VM_FF_HIGH_PRIORITY_PRE_MASK)
-        ||  VMCPU_FF_ISPENDING(pVCpu, VM_FF_HIGH_PRIORITY_PRE_MASK))
+        ||  VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_HIGH_PRIORITY_PRE_MASK))
     {
         /*
@@ -3578 +3578 @@
                 && rc != VINF_EM_TERMINATE
                 && rc != VINF_EM_OFF
-                && VM_FF_ISPENDING(pVM, VM_FF_ALL_BUT_RAW_MASK))
+                && (   VM_FF_ISPENDING(pVM, VM_FF_ALL_BUT_RAW_MASK)
+                    || VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_ALL_BUT_RAW_MASK)))
             {
                 rc = emR3ForcedActions(pVM, pVCpu, rc);