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

Timestamp:

Jul 10, 2008 10:17:02 AM (16 years ago)

Author:

vboxsync

Message:

More assertions

File:

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

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

@@ -281 +281 @@
         /* CR8 reads from the APIC shadow page; writes cause an exit is they lower the TPR below the threshold */
         val |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_TPR_SHADOW;
+        Assert(pVM->hwaccm.s.vmx.pAPIC);
     }
     else
@@ -463 +464 @@
     if (pVM->hwaccm.s.Event.fPending)
     {
-        Log(("Reinjecting event %VX64 %08x at %VGv\n", pVM->hwaccm.s.Event.intInfo, pVM->hwaccm.s.Event.errCode, pCtx->rip));
+        Log(("Reinjecting event %VX64 %08x at %VGv cr2=%RX64\n", pVM->hwaccm.s.Event.intInfo, pVM->hwaccm.s.Event.errCode, pCtx->rip, pCtx->cr2));
         STAM_COUNTER_INC(&pVM->hwaccm.s.StatIntReinject);
         rc = VMXR0InjectEvent(pVM, pCtx, pVM->hwaccm.s.Event.intInfo, 0, pVM->hwaccm.s.Event.errCode);
@@ -1794 +1795 @@
             case 8:
                 /* CR8 contains the APIC TPR */
+                Assert(!(pVM->hwaccm.s.vmx.msr.vmx_proc_ctls & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_TPR_SHADOW));
                 break;