Changeset 43496 in vbox for trunk/src/VBox

Timestamp:

Oct 1, 2012 5:28:22 PM (12 years ago)

Author:

vboxsync

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

81061

Message:

VMM: build fix.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWSVMR0.cpp (modified) (3 diffs)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)
• VMMR3/HM.cpp (modified) (3 diffs)

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

@@ -1183 +1183 @@
              || pvVMCB->ctrl.TLBCtrl.n.u8TLBFlush == SVM_TLB_FLUSH_SINGLE_CONTEXT_RETAIN_GLOBALS)
     {
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushASID);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushAsid);
     }
     else
@@ -1520 +1520 @@
                              pvVMCB->ctrl.u64TSCOffset - 0x400 /* guestimate of world switch overhead in clock ticks */);
     }
+
     TMNotifyEndOfExecution(pVCpu);
     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
@@ -3072 +3073 @@
     /* invlpga only invalidates TLB entries for guest virtual addresses; we have no choice but to force a TLB flush here. */
     VMCPU_FF_SET(pVCpu, VMCPU_FF_TLB_FLUSH);
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTLBInvlpga);
+    STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushTlbInvlpga);
     return VINF_SUCCESS;
 }

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

@@ -4319 +4319 @@
             {
                 Log2(("VMX: clts\n"));
-                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitCLTS);
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitClts);
                 rc = EMInterpretCLTS(pVM, pVCpu);
                 pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0;
@@ -4725 +4725 @@
         rc2 = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVCpu->hm.s.vmx.proc_ctls);
         AssertRC(rc2);
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitMTF);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitMtf);
 #if 0
         DBGFDoneStepping(pVCpu);
@@ -5036 +5036 @@
 #ifdef VBOX_WITH_STATISTICS
     if (pVCpu)
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushASID);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatFlushAsid);
 #endif
 }

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

@@ -522 +522 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitDRxWrite,           "/HM/CPU%d/Exit/Instr/DR/Write");
         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.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.StatExitCli,                "/HM/CPU%d/Exit/Instr/Cli");
@@ -538 +538 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitMaxResume,          "/HM/CPU%d/Exit/MaxResume");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitPreemptPending,     "/HM/CPU%d/Exit/PreemptPending");
-        HM_REG_COUNTER(&pVCpu->hm.s.StatExitMTF,                "/HM/CPU%d/Exit/MonitorTrapFlag");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatExitMtf,                "/HM/CPU%d/Exit/MonitorTrapFlag");
 
         HM_REG_COUNTER(&pVCpu->hm.s.StatSwitchGuestIrq,         "/HM/CPU%d/Switch/IrqPending");
@@ -556 +556 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatFlushTLBWorldSwitch,    "/HM/CPU%d/Flush/TLB/Switch");
         HM_REG_COUNTER(&pVCpu->hm.s.StatNoFlushTLBWorldSwitch,  "/HM/CPU%d/Flush/TLB/Skipped");
-        HM_REG_COUNTER(&pVCpu->hm.s.StatFlushASID,              "/HM/CPU%d/Flush/TLB/ASID");
-        HM_REG_COUNTER(&pVCpu->hm.s.StatFlushNP,                "/HM/CPU%d/Flush/TLB/NP");
-        HM_REG_COUNTER(&pVCpu->hm.s.StatFlushTLBInvlpga,        "/HM/CPU%d/Flush/TLB/PhysInvl");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatFlushAsid,              "/HM/CPU%d/Flush/TLB/ASID");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatFlushNestedPaging,      "/HM/CPU%d/Flush/TLB/NestedPaging");
+        HM_REG_COUNTER(&pVCpu->hm.s.StatFlushTlbInvlpga,        "/HM/CPU%d/Flush/TLB/PhysInvl");
         HM_REG_COUNTER(&pVCpu->hm.s.StatTlbShootdown,           "/HM/CPU%d/Flush/Shootdown/Page");
         HM_REG_COUNTER(&pVCpu->hm.s.StatTlbShootdownFlush,      "/HM/CPU%d/Flush/Shootdown/TLB");