Changeset 15736 in vbox for trunk/src/VBox

Timestamp:

Dec 23, 2008 3:55:23 PM (16 years ago)

Author:

vboxsync

Message:

Corrected max time spent in VT-x guest mode

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (4 diffs)

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

@@ -3400 +3400 @@
     {
         int         rc;
-        RTCCUINTREG exitReason, instrError, val;
+        RTCCUINTREG exitReason, instrError;
 
         rc  = VMXReadVMCS(VMX_VMCS32_RO_EXIT_REASON, &exitReason);
@@ -3414 +3414 @@
 
 #ifdef VBOX_STRICT
-            RTGDTR     gdtr;
-            PX86DESCHC pDesc;
+            RTGDTR      gdtr;
+            PX86DESCHC  pDesc;
+            RTCCUINTREG val;
 
             ASMGetGDTR(&gdtr);
@@ -3585 +3586 @@
         &&  MSR_IA32_VMX_MISC_PREEMPT_TSC_BIT(pVM->hwaccm.s.vmx.msr.vmx_misc))
     {
-        uint32_t val;
+        uint32_t uBit, val;
 
         rc = VMXReadVMCS32(VMX_VMCS_CTRL_PIN_EXEC_CONTROLS, &val);
@@ -3593 +3594 @@
         AssertRC(rc);
 
-        val = MSR_IA32_VMX_MISC_PREEMPT_TSC_BIT(pVM->hwaccm.s.vmx.msr.vmx_misc);
-        val = 1000000 / val;
+        uBit = MSR_IA32_VMX_MISC_PREEMPT_TSC_BIT(pVM->hwaccm.s.vmx.msr.vmx_misc);
+        val = 1000000 / RT_BIT(uBit);
         VMXWriteVMCS(VMX_VMCS32_GUEST_PREEMPTION_TIMER_VALUE, val);
     }