Changeset 44197 in vbox

Timestamp:

Dec 21, 2012 5:52:16 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: HM bits.

Location:

trunk/src/VBox/VMM

Files:

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

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

@@ -522 +522 @@
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitInvlpg,             "/HM/CPU%d/Exit/Instr/Invlpg");
         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.StatExitCpuid,              "/HM/CPU%d/Exit/Instr/Cpuid");
         HM_REG_COUNTER(&pVCpu->hm.s.StatExitRdtsc,              "/HM/CPU%d/Exit/Instr/Rdtsc");
@@ -1328 +1329 @@
                 LogRel(("HM: VMX setup failed with rc=%Rrc!\n", rc));
                 for (VMCPUID i = 0; i < pVM->cCpus; i++)
-                    LogRel(("HM: CPU[%ld] Last instruction error %x\n", i, pVM->aCpus[0].hm.s.vmx.lasterror.u32InstrError));
+                    LogRel(("HM: CPU[%ld] Last instruction error %x\n", i, pVM->aCpus[i].hm.s.vmx.lasterror.u32InstrError));
                 pVM->fHMEnabled = false;
             }
@@ -2421 +2422 @@
                  *          work reliably without this.)
                  *  Update: Implemented in EM.cpp, see #ifdef EM_NOTIFY_HM.  */
-                pVM->aCpus[0].hm.s.fContextUseFlags |= HM_CHANGED_ALL_GUEST;
+                for (uint32_t i = 0; i < pVM->cCpus; i++)
+                    pVM->aCpus[i].hm.s.fContextUseFlags |= HM_CHANGED_ALL_GUEST;
 
                 if (    !pVM->hm.s.fNestedPaging        /* requires a fake PD for real *and* protected mode without paging - stored in the VMM device heap */

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

@@ -596 +596 @@
 #endif /* VBOX_WITH_AUTO_MSR_LOAD_RESTORE */
 
+        /* The cached APIC-base MSR used for identifying when to map the HC physical APIC-access page. */
+        uint64_t                    u64MsrApicBase;
         /* Last use TSC offset value. (cached) */
         uint64_t                    u64TSCOffset;
@@ -753 +755 @@
     STAMCOUNTER             StatExitInvlpg;
     STAMCOUNTER             StatExitInvd;
+    STAMCOUNTER             StatExitWbinvd;
     STAMCOUNTER             StatExitCpuid;
     STAMCOUNTER             StatExitRdtsc;