Changeset 42671 in vbox for trunk

Timestamp:

Aug 8, 2012 6:01:09 AM (12 years ago)

Author:

vboxsync

Message:

VMM/HWVMXR0: More info. on debug assertion, LogRel tidying.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWACCMR0A.asm (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)
• VMMR3/HWACCM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm

@@ -855 +855 @@
     and         edi, 0ffffffffh
     xor         rax, rax
-    ;invvpid     rdi, qword [rsi]
+;    invvpid     rdi, qword [rsi]
     DB          0x66, 0x0F, 0x38, 0x81, 0x3E
  %else

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

@@ -5023 +5023 @@
     {
         AssertPtr(pVCpu);
-        Assert(pVCpu->hwaccm.s.uCurrentASID != 0);
-        Assert(pVCpu->hwaccm.s.uCurrentASID <= UINT16_MAX);
+        AssertMsg(pVCpu->hwaccm.s.uCurrentASID != 0, ("VMXR0InvVPID invalid ASID %lu\n", pVCpu->hwaccm.s.uCurrentASID));
+        AssertMsg(pVCpu->hwaccm.s.uCurrentASID <= UINT16_MAX, ("VMXR0InvVPID invalid ASID %lu\n", pVCpu->hwaccm.s.uCurrentASID));
         descriptor[0] = pVCpu->hwaccm.s.uCurrentASID;
         descriptor[1] = GCPtr;

trunk/src/VBox/VMM/VMMR3/HWACCM.cpp

@@ -1113 +1113 @@
             for (VMCPUID i = 0; i < pVM->cCpus; i++)
             {
-                LogRel(("HWACCM: VCPU%d: MSR bitmap physaddr      = %RHp\n", i, pVM->aCpus[i].hwaccm.s.vmx.pMSRBitmapPhys));
-                LogRel(("HWACCM: VCPU%d: VMCS physaddr            = %RHp\n", i, pVM->aCpus[i].hwaccm.s.vmx.HCPhysVMCS));
+                LogRel(("HWACCM: VCPU%d: MSR bitmap physaddr    = %RHp\n", i, pVM->aCpus[i].hwaccm.s.vmx.pMSRBitmapPhys));
+                LogRel(("HWACCM: VCPU%d: VMCS physaddr          = %RHp\n", i, pVM->aCpus[i].hwaccm.s.vmx.HCPhysVMCS));
             }
 
@@ -1223 +1223 @@
                     LogRel(("HWACCM: Enabled nested paging\n"));
                     LogRel(("HWACCM: EPT root page                 = %RHp\n", PGMGetHyperCR3(VMMGetCpu(pVM))));
+                    if (pVM->hwaccm.s.vmx.enmFlushEPT == VMX_FLUSH_EPT_SINGLE_CONTEXT)
+                        LogRel(("HWACCM: enmFlushEPT                   = VMX_FLUSH_EPT_SINGLE_CONTEXT\n"));
+                    else if (pVM->hwaccm.s.vmx.enmFlushEPT == VMX_FLUSH_EPT_ALL_CONTEXTS)
+                        LogRel(("HWACCM: enmFlushEPT                   = VMX_FLUSH_EPT_ALL_CONTEXTS\n"));
+                    else if (pVM->hwaccm.s.vmx.enmFlushEPT == VMX_FLUSH_EPT_NOT_SUPPORTED)
+                        LogRel(("HWACCM: enmFlushEPT                   = VMX_FLUSH_EPT_NOT_SUPPORTED\n"));
+                    else
+                        LogRel(("HWACCM: enmFlushEPT                   = %d\n", pVM->hwaccm.s.vmx.enmFlushEPT));
+
                     if (pVM->hwaccm.s.vmx.fUnrestrictedGuest)
                         LogRel(("HWACCM: Unrestricted guest execution enabled!\n"));
@@ -1234 +1243 @@
                     }
 #endif
-                    LogRel(("HWACCM: enmFlushEPT    %d\n", pVM->hwaccm.s.vmx.enmFlushEPT));
                 }
                 else
@@ -1242 +1250 @@
                 {
                     LogRel(("HWACCM: Enabled VPID\n"));
-                    LogRel(("HWACCM: enmFlushVPID   %d\n", pVM->hwaccm.s.vmx.enmFlushVPID));
+                    if (pVM->hwaccm.s.vmx.enmFlushVPID == VMX_FLUSH_VPID_INDIV_ADDR)
+                        LogRel(("HWACCM: enmFlushVPID                  = VMX_FLUSH_VPID_INDIV_ADDR\n"));
+                    else if (pVM->hwaccm.s.vmx.enmFlushVPID == VMX_FLUSH_VPID_SINGLE_CONTEXT)
+                        LogRel(("HWACCM: enmFlushVPID                  = VMX_FLUSH_VPID_SINGLE_CONTEXT\n"));
+                    else if (pVM->hwaccm.s.vmx.enmFlushVPID == VMX_FLUSH_VPID_ALL_CONTEXTS)
+                        LogRel(("HWACCM: enmFlushVPID                  = VMX_FLUSH_VPID_ALL_CONTEXTS\n"));
+                    else if (pVM->hwaccm.s.vmx.enmFlushVPID == VMX_FLUSH_VPID_SINGLE_CONTEXT_RETAIN_GLOBALS)
+                        LogRel(("HWACCM: enmFlushVPID                  = VMX_FLUSH_VPID_SINGLE_CONTEXT_RETAIN_GLOBALS\n"));
+                    else
+                        LogRel(("HWACCM: enmFlushVPID                  = %d\n", pVM->hwaccm.s.vmx.enmFlushVPID));
                 }
                 else if (pVM->hwaccm.s.vmx.enmFlushVPID == VMX_FLUSH_VPID_NOT_SUPPORTED)