Changeset 43657 in vbox for trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

Timestamp:

Oct 16, 2012 3:34:05 PM (12 years ago)

Author:

vboxsync

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

81423

Message:

VMM: APIC refactor. Moved APIC base MSR to the VCPU (where it belongs) for lockless accesses.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (6 diffs)

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

@@ -1166 +1166 @@
         Assert((TRPMQueryTrap(pVCpu, NULL, NULL) == VERR_TRPM_NO_ACTIVE_TRAP));
 
-        /* 
+        /*
          * Clear the pending event and move it over to TRPM for the rest
          * of the world to see.
@@ -3505 +3505 @@
                 {
                     RTGCPHYS GCPhysApicBase, GCPhys;
-                    PDMApicGetBase(pVM, &GCPhysApicBase);   /** @todo cache this */
+                    GCPhysApicBase = pCtx->msrApicBase;
                     GCPhysApicBase &= PAGE_BASE_GC_MASK;
 
@@ -3536 +3536 @@
                 {
                     RTGCPHYS GCPhysApicBase, GCPhys;
-                    PDMApicGetBase(pVM, &GCPhysApicBase);   /* @todo cache this */
+                    GCPhysApicBase = pCtx->msrApicBase;
                     GCPhysApicBase &= PAGE_BASE_GC_MASK;
 
@@ -4048 +4048 @@
             {
                 RTGCPHYS GCPhysApicBase;
-                PDMApicGetBase(pVM, &GCPhysApicBase);   /* @todo cache this */
+                GCPhysApicBase = pCtx->msrApicBase;
                 GCPhysApicBase &= PAGE_BASE_GC_MASK;
                 if (GCPhys == GCPhysApicBase + 0x80)
@@ -4108 +4108 @@
             &&  (pVM->hm.s.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VIRT_APIC))
         {
-            RTGCPHYS GCPhysApicBase;
-            PDMApicGetBase(pVM, &GCPhysApicBase);   /* @todo cache this */
+            RTGCPHYS GCPhysApicBase = pCtx->msrApicBase;
             GCPhysApicBase &= PAGE_BASE_GC_MASK;
             if (GCPhys == GCPhysApicBase + 0x80)
@@ -4648 +4647 @@
             case VMX_APIC_ACCESS_TYPE_LINEAR_WRITE:
             {
-                RTGCPHYS GCPhys;
-                PDMApicGetBase(pVM, &GCPhys);
+                RTGCPHYS GCPhys = pCtx->msrApicBase;
                 GCPhys &= PAGE_BASE_GC_MASK;
                 GCPhys += VMX_EXIT_QUALIFICATION_APIC_ACCESS_OFFSET(exitQualification);