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

Timestamp:

Aug 7, 2009 11:46:14 AM (15 years ago)

Author:

vboxsync

Message:

Cleanup

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (3 diffs)
• VMMR0/HWVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -548 +548 @@
     struct
     {
+        /** Physical address of the VM control structure (VMCS). */
+        RTHCPHYS                    pVMCSPhys;
         /** R0 memory object for the VM control structure (VMCS). */
         RTR0MEMOBJ                  pMemObjVMCS;
-        /** Physical address of the VM control structure (VMCS). */
-        RTHCPHYS                    pVMCSPhys;
         /** Virtual address of the VM control structure (VMCS). */
         R0PTRTYPE(void *)           pVMCS;
@@ -564 +564 @@
         uint64_t                    proc_ctls2;
 
+        /** Physical address of the virtual APIC page for TPR caching. */
+        RTHCPHYS                    pVAPICPhys;
         /** R0 memory object for the virtual APIC page for TPR caching. */
         RTR0MEMOBJ                  pMemObjVAPIC;
-        /** Physical address of the virtual APIC page for TPR caching. */
-        RTHCPHYS                    pVAPICPhys;
         /** Virtual address of the virtual APIC page for TPR caching. */
         R0PTRTYPE(uint8_t *)        pVAPIC;
@@ -579 +579 @@
         RTHCPHYS                    GCPhysEPTP;
 
+        /** Physical address of the MSR bitmap (1 page). */
+        RTHCPHYS                    pMSRBitmapPhys;
         /** R0 memory object for the MSR bitmap (1 page). */
         RTR0MEMOBJ                  pMemObjMSRBitmap;
-        /** Physical address of the MSR bitmap (1 page). */
-        RTHCPHYS                    pMSRBitmapPhys;
         /** Virtual address of the MSR bitmap (1 page). */
         R0PTRTYPE(uint8_t *)        pMSRBitmap;
 
+        /** Physical address of the guest MSR load area (1 page). */
+        RTHCPHYS                    pGuestMSRPhys;
         /** R0 memory object for the guest MSR load area (1 page). */
         RTR0MEMOBJ                  pMemObjGuestMSR;
-        /** Physical address of the guest MSR load area (1 page). */
-        RTHCPHYS                    pGuestMSRPhys;
         /** Virtual address of the guest MSR load area (1 page). */
         R0PTRTYPE(uint8_t *)        pGuestMSR;
 
+        /** Physical address of the MSR load area (1 page). */
+        RTHCPHYS                    pHostMSRPhys;
         /** R0 memory object for the MSR load area (1 page). */
         RTR0MEMOBJ                  pMemObjHostMSR;
-        /** Physical address of the MSR load area (1 page). */
-        RTHCPHYS                    pHostMSRPhys;
         /** Virtual address of the MSR load area (1 page). */
         R0PTRTYPE(uint8_t *)        pHostMSR;
+
+        /* Number of automatically loaded/restored MSRs. */
+        uint32_t                    cCachedMSRs;
 
         /** VMCS cache. */

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

@@ -1881 +1881 @@
         }
     }
+    pVCpu->hwaccm.s.vmx.cCachedMSRs = idxMsr;
 
     rc = VMXWriteVMCS(VMX_VMCS_CTRL_ENTRY_MSR_LOAD_COUNT, idxMsr);
@@ -2018 +2019 @@
     }
 
-    uint32_t maxMsr = 0;
-    rc = VMXReadVMCS32(VMX_VMCS_CTRL_EXIT_MSR_STORE_COUNT, &maxMsr);
-    AssertRC(rc);
-
     /* Save the possibly changed MSRs that we automatically restore and save during a world switch. */
-    for (unsigned i = 0; i < maxMsr; i++)
+    for (unsigned i = 0; i < pVCpu->hwaccm.s.vmx.cCachedMSRs; i++)
     {
         PVMXMSR pMsr = (PVMXMSR)pVCpu->hwaccm.s.vmx.pGuestMSR;