Changeset 32459 in vbox

Timestamp:

Sep 13, 2010 4:36:11 PM (14 years ago)

Author:

vboxsync

Message:

VMM/raw: Heed VM_FF_REQUEST and VMCPU_FF_REQUEST before checking for interrupts and synccr3 actions since these two might not return to ring-3.

File:

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

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -209 +209 @@
         else if (VM_FF_ISPENDING(pVM, VM_FF_PDM_DMA))
             rc = VINF_EM_RAW_TO_R3;
+        /* Pending request packets might contain actions that need immediate
+           attention, such as pending hardware interrupts. */
+        else if (   VM_FF_ISPENDING(pVM, VM_FF_REQUEST)
+                 || VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_REQUEST))
+            rc = VINF_EM_PENDING_REQUEST;
         /* Pending interrupt: dispatch it. */
         else if (    VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
@@ -246 +251 @@
 #endif
         }
-        /** @todo move up before SyncCR3 */
-        /* Pending request packets might contain actions that need immediate attention, such as pending hardware interrupts. */
-        else if (   VM_FF_ISPENDING(pVM, VM_FF_REQUEST)
-                 || VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_REQUEST))
-            rc = VINF_EM_PENDING_REQUEST;
     }