Changeset 48041 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Aug 24, 2013 12:04:14 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Don't play safe when we have assertions to catch things.

File:

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

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

@@ -6802 +6802 @@
                     pMixedCtx->cr2 = GCPtrFaultAddress;
                 }
+
+                /* If any other guest-state bits are changed here, make sure to update
+                   hmR0VmxPreRunGuestCommitted() when thread-context hooks are used. */
                 pVCpu->hm.s.fContextUseFlags |=   HM_CHANGED_GUEST_SEGMENT_REGS
                                                 | HM_CHANGED_GUEST_RIP
@@ -7417 +7420 @@
          * If we are injecting events real-on-v86 mode guest then we potentially have to update
          * RIP and other registers, i.e. hmR0VmxPreRunGuest()->hmR0VmxInjectPendingEvent().
-         * Just reload the state here if we're in real-on-v86 mode.
+         * Reload only the necessary state, the assertion will catch if other parts of the code
+         * change.
          */
         if (pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
-            hmR0VmxLoadGuestStateOptimal(pVM, pVCpu, pMixedCtx);
+        {
+            hmR0VmxLoadGuestRipRspRflags(pVCpu, pMixedCtx);
+            hmR0VmxLoadGuestSegmentRegs(pVCpu, pMixedCtx);
+        }
     }