Changeset 47670 in vbox

Timestamp:

Aug 12, 2013 11:12:40 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0, HMSVMR0: Fix typo in checking invalid guest state, nits.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (4 diffs)

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

@@ -4575 +4575 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestDB);
 
-    /* If we sat the trap flag above, we have to clear it. */ /** @todo HM should remember what it does and possibly do this elsewhere! */
+    /* If we set the trap flag above, we have to clear it. */
+    /** @todo HM should remember what it does and possibly do this elsewhere! */
     if (pVCpu->hm.s.fSingleInstruction || DBGFIsStepping(pVCpu))
         pCtx->eflags.Bits.u1TF = 0;

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

@@ -6048 +6048 @@
     Assert(!CPUMIsGuestDebugStateActive(pVCpu));
     Assert(!CPUMIsHyperDebugStateActive(pVCpu));
-
 
     STAM_PROFILE_ADV_SET_STOPPED(&pVCpu->hm.s.StatEntry);
@@ -7882 +7881 @@
                           VMX_IGS_INTERRUPTIBILITY_STATE_STI_MOVSS_INVALID);
         HMVMX_CHECK_BREAK(   (u32EFlags & X86_EFL_IF)
-                          || (u32IntrState & VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE_BLOCK_STI),
+                          || !(u32IntrState & VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE_BLOCK_STI),
                           VMX_IGS_INTERRUPTIBILITY_STATE_STI_EFL_INVALID);
         if (VMX_ENTRY_INTERRUPTION_INFO_VALID(u32EntryInfo))
@@ -9114 +9113 @@
         {
             /*
-             * If any I/O breakpoints are armed, then we should check if a
-             * debug trap needs to be generated.
+             * If any I/O breakpoints are armed, then we should check if a debug trap needs to be generated.
              * Note that the I/O breakpoint type is undefined if CR4.DE is 0.
              */
@@ -9139 +9137 @@
                  *        bootsector testcase for asserting the correct behavior (as well as
                  *        correctness of this code). */
-                /** @todo r=bird: DR0-3 are normally in host registes when the guest is using
+                /** @todo r=bird: DR0-3 are normally in host registers when the guest is using
                  *        them, so we're testing against potentially stale values here! */
                 STAM_COUNTER_INC(&pVCpu->hm.s.StatDRxIoCheck);