Changeset 44267 in vbox for trunk/src/VBox

Timestamp:

Jan 10, 2013 11:43:26 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83147

Message:

VMM/VMMR0: HM bits.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWVMXR0.cpp (modified) (6 diffs)
• VMMR0/HWVMXR0.h (modified) (1 diff)
• VMMR3/HM.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)

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

@@ -762 +762 @@
         VMXSetupCachedReadVmcs(pCache, VMX_VMCS32_RO_VM_INSTR_ERROR);
         VMXSetupCachedReadVmcs(pCache, VMX_VMCS32_RO_EXIT_INSTR_LENGTH);
-        VMXSetupCachedReadVmcs(pCache, VMX_VMCS32_RO_EXIT_INTERRUPTION_ERRCODE);
+        VMXSetupCachedReadVmcs(pCache, VMX_VMCS32_RO_EXIT_INTERRUPTION_ERROR_CODE);
         VMXSetupCachedReadVmcs(pCache, VMX_VMCS32_RO_EXIT_INTERRUPTION_INFO);
         VMXSetupCachedReadVmcs(pCache, VMX_VMCS32_RO_EXIT_INSTR_INFO);
         VMXSetupCachedReadVmcs(pCache, VMX_VMCS_RO_EXIT_QUALIFICATION);
         VMXSetupCachedReadVmcs(pCache, VMX_VMCS32_RO_IDT_INFO);
-        VMXSetupCachedReadVmcs(pCache, VMX_VMCS32_RO_IDT_ERRCODE);
+        VMXSetupCachedReadVmcs(pCache, VMX_VMCS32_RO_IDT_ERROR_CODE);
 
         if (pVM->hm.s.fNestedPaging)
@@ -1178 +1178 @@
             break;
         case VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT:
-        case VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT:
+        case VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_XCPT: /** @todo Is classifying #BP, #OF as TRPM_SOFTWARE_INT correct? */
         case VMX_EXIT_INTERRUPTION_INFO_TYPE_DB_XCPT:
             enmTrapType = TRPM_SOFTWARE_INT;
@@ -3309 +3309 @@
     rc2 |= VMXReadCachedVmcs(VMX_VMCS32_RO_EXIT_INTERRUPTION_INFO, &intInfo);
     /* might not be valid; depends on VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID. */
-    rc2 |= VMXReadCachedVmcs(VMX_VMCS32_RO_EXIT_INTERRUPTION_ERRCODE, &errCode);
+    rc2 |= VMXReadCachedVmcs(VMX_VMCS32_RO_EXIT_INTERRUPTION_ERROR_CODE, &errCode);
     rc2 |= VMXReadCachedVmcs(VMX_VMCS32_RO_EXIT_INSTR_INFO, &instrInfo);
     rc2 |= VMXReadCachedVmcs(VMX_VMCS_RO_EXIT_QUALIFICATION, &exitQualification);
@@ -3344 +3344 @@
         if (VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID(pVCpu->hm.s.Event.u64IntrInfo))
         {
-            rc2 = VMXReadCachedVmcs(VMX_VMCS32_RO_IDT_ERRCODE, &val);
+            rc2 = VMXReadCachedVmcs(VMX_VMCS32_RO_IDT_ERROR_CODE, &val);
             AssertRC(rc2);
             pVCpu->hm.s.Event.u32ErrCode  = val;
@@ -4276 +4276 @@
         STAM_COUNTER_INC((exitReason == VMX_EXIT_RDMSR) ? &pVCpu->hm.s.StatExitRdmsr : &pVCpu->hm.s.StatExitWrmsr);
 
-        /*
-         * Note: The Intel spec. claims there's an REX version of RDMSR that's slightly different,
-         * so we play safe by completely disassembling the instruction.
-         */
         Log2(("VMX: %s\n", (exitReason == VMX_EXIT_RDMSR) ? "rdmsr" : "wrmsr"));
         rc = EMInterpretInstruction(pVCpu, CPUMCTX2CORE(pCtx), 0);
@@ -5433 +5429 @@
         case VMX_VMCS32_RO_VM_INSTR_ERROR:
         case VMX_VMCS32_RO_EXIT_INSTR_LENGTH:
-        case VMX_VMCS32_RO_EXIT_INTERRUPTION_ERRCODE:
+        case VMX_VMCS32_RO_EXIT_INTERRUPTION_ERROR_CODE:
         case VMX_VMCS32_RO_EXIT_INTERRUPTION_INFO:
         case VMX_VMCS32_RO_EXIT_INSTR_INFO:
         case VMX_VMCS_RO_EXIT_QUALIFICATION:
         case VMX_VMCS32_RO_IDT_INFO:
-        case VMX_VMCS32_RO_IDT_ERRCODE:
+        case VMX_VMCS32_RO_IDT_ERROR_CODE:
         case VMX_VMCS_GUEST_CR3:
         case VMX_VMCS64_EXIT_GUEST_PHYS_ADDR_FULL:

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

@@ -88 +88 @@
 #define VMX_VMCS32_RO_VM_INSTR_ERROR_CACHE_IDX                              49
 #define VMX_VMCS32_RO_EXIT_INSTR_LENGTH_CACHE_IDX                           50
-#define VMX_VMCS32_RO_EXIT_INTERRUPTION_ERRCODE_CACHE_IDX                   51
+#define VMX_VMCS32_RO_EXIT_INTERRUPTION_ERROR_CODE_CACHE_IDX                51
 #define VMX_VMCS32_RO_EXIT_INSTR_INFO_CACHE_IDX                             52
 #define VMX_VMCS32_RO_EXIT_INTERRUPTION_INFO_CACHE_IDX                      53
 #define VMX_VMCS_RO_EXIT_QUALIFICATION_CACHE_IDX                            54
 #define VMX_VMCS32_RO_IDT_INFO_CACHE_IDX                                    55
-#define VMX_VMCS32_RO_IDT_ERRCODE_CACHE_IDX                                 56
-#define VMX_VMCS_MAX_CACHE_IDX                                              (VMX_VMCS32_RO_IDT_ERRCODE_CACHE_IDX + 1)
+#define VMX_VMCS32_RO_IDT_ERROR_CODE_CACHE_IDX                              56
+#define VMX_VMCS_MAX_CACHE_IDX                                              (VMX_VMCS32_RO_IDT_ERROR_CODE_CACHE_IDX + 1)
 #define VMX_VMCS_GUEST_CR3_CACHE_IDX                                        57
 #define VMX_VMCS64_EXIT_GUEST_PHYS_ADDR_FULL_CACHE_IDX                      58

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

@@ -554 +554 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitPreemptTimer,       "/HM/CPU%d/Exit/PreemptTimer");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitTprBelowThreshold,  "/HM/CPU%d/Exit/TprBelowThreshold");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatExitTaskSwitch,         "/HM/CPU%d/Exit/TaskSwitch");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitMtf,                "/HM/CPU%d/Exit/MonitorTrapFlag");
 

trunk/src/VBox/VMM/include/HMInternal.h

@@ -789 +789 @@
     STAMCOUNTER             StatExitPreemptTimer;
     STAMCOUNTER             StatExitTprBelowThreshold;
+    STAMCOUNTER             StatExitTaskSwitch;
     STAMCOUNTER             StatExitMtf;
     STAMCOUNTER             StatIntReinject;