Changeset 51741 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 27, 2014 8:05:01 AM (10 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Load guest-state after injection of events; simplifies state-handling a tiny bit.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -8328 +8328 @@
 #endif /* !IEM_VERIFICATION_MODE_FULL */
 
-    /* Load the guest state bits, we can handle longjmps/getting preempted here. */
-    hmR0VmxLoadGuestStateOptimal(pVM, pVCpu, pMixedCtx);
-
     /*
      * Evaluate events as pending-for-injection into the guest. Toggling of force-flags here is safe as long as
@@ -8350 +8347 @@
         return rc;
     }
+
+    /*
+     * Load the guest state bits, we can handle longjmps/getting preempted here.
+     *
+     * If we are injecting events to a real-on-v86 mode guest, we will have to update
+     * RIP and some segment registers, i.e. hmR0VmxInjectPendingEvent()->hmR0VmxInjectEventVmcs().
+     * Hence, this needs to be done -after- injection of events.
+     */
+    hmR0VmxLoadGuestStateOptimal(pVM, pVCpu, pMixedCtx);
 
     /*
@@ -8418 +8424 @@
     VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);            /* Indicate the start of guest execution. */
-
-    /*
-     * If we are injecting events to a real-on-v86 mode guest, we may have to update
-     * RIP and some other registers, i.e. hmR0VmxInjectPendingEvent()->hmR0VmxInjectEventVmcs().
-     * Reload only the necessary state, the assertion will catch if other parts of the code
-     * change.
-     */
-    if (pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
-    {
-        hmR0VmxLoadGuestRipRspRflags(pVCpu, pMixedCtx);
-        hmR0VmxLoadGuestSegmentRegs(pVCpu, pMixedCtx);
-    }
 
 #ifdef HMVMX_ALWAYS_SWAP_FPU_STATE