Changeset 44259 in vbox for trunk/src/VBox/VMM

Timestamp:

Jan 9, 2013 11:02:53 AM (12 years ago)

Author:

vboxsync

Message:

VMM: STAM counter naming.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWVMXR0.cpp (modified) (3 diffs)
• VMMR3/HM.cpp (modified) (3 diffs)
• include/HMInternal.h (modified) (3 diffs)

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

@@ -4364 +4364 @@
             {
                 Log2(("VMX: lmsw %x\n", VMX_EXIT_QUALIFICATION_CRX_LMSW_DATA(exitQualification)));
-                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitLMSW);
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitLmsw);
                 rc = EMInterpretLMSW(pVM, pVCpu, CPUMCTX2CORE(pCtx), VMX_EXIT_QUALIFICATION_CRX_LMSW_DATA(exitQualification));
                 pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0;
@@ -4626 +4626 @@
     }
 
-    case VMX_EXIT_TPR:                  /* 43 TPR below threshold. Guest software executed MOV to CR8. */
-        LogFlow(("VMX_EXIT_TPR\n"));
+    case VMX_EXIT_TPR_BELOW_THRESHOLD:  /* 43 TPR below threshold. Guest software executed MOV to CR8. */
+        LogFlow(("VMX_EXIT_TPR_BELOW_THRESHOLD\n"));
         /* RIP is already set to the next instruction and the TPR has been synced back. Just resume. */
         goto ResumeExecution;
@@ -4805 +4805 @@
         break;
 
-    case VMX_EXIT_TPR:                  /* 43 TPR below threshold. Guest software executed MOV to CR8. */
+    case VMX_EXIT_TPR_BELOW_THRESHOLD:  /* 43 TPR below threshold. Guest software executed MOV to CR8. */
     case VMX_EXIT_RDMSR:                /* 31 RDMSR. Guest software attempted to execute RDMSR. */
     case VMX_EXIT_WRMSR:                /* 32 WRMSR. Guest software attempted to execute WRMSR. */

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

@@ -523 +523 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitInvd,               "/HM/CPU%d/Exit/Instr/Invd");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitWbinvd,             "/HM/CPU%d/Exit/Instr/Wbinvd");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatExitPause,              "/HM/CPU%d/Exit/Instr/Pause");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitCpuid,              "/HM/CPU%d/Exit/Instr/Cpuid");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitRdtsc,              "/HM/CPU%d/Exit/Instr/Rdtsc");
@@ -535 +536 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitDRxRead,            "/HM/CPU%d/Exit/Instr/DR/Read");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitClts,               "/HM/CPU%d/Exit/Instr/CLTS");
-        HM_REG_COUNTER(&pVCpu->hm.s.StatExitLMSW,               "/HM/CPU%d/Exit/Instr/LMSW");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatExitLmsw,               "/HM/CPU%d/Exit/Instr/LMSW");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitCli,                "/HM/CPU%d/Exit/Instr/Cli");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitSti,                "/HM/CPU%d/Exit/Instr/Sti");
@@ -552 +553 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitPreemptPending,     "/HM/CPU%d/Exit/PreemptPending");
         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.StatExitMtf,                "/HM/CPU%d/Exit/MonitorTrapFlag");
 

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

@@ -756 +756 @@
     STAMCOUNTER             StatExitInvd;
     STAMCOUNTER             StatExitWbinvd;
+    STAMCOUNTER             StatExitPause;
     STAMCOUNTER             StatExitCpuid;
     STAMCOUNTER             StatExitRdtsc;
@@ -778 +779 @@
     STAMCOUNTER             StatExitMwait;
     STAMCOUNTER             StatExitMonitor;
-    STAMCOUNTER             StatExitLMSW;
+    STAMCOUNTER             StatExitLmsw;
     STAMCOUNTER             StatExitIOWrite;
     STAMCOUNTER             StatExitIORead;
@@ -787 +788 @@
     STAMCOUNTER             StatExitPreemptPending;
     STAMCOUNTER             StatExitPreemptTimer;
+    STAMCOUNTER             StatExitTprBelowThreshold;
     STAMCOUNTER             StatExitMtf;
     STAMCOUNTER             StatIntReinject;