VBox

Timestamp:

Oct 1, 2018 5:42:25 AM (6 years ago)

Author:

vboxsync

Message:

VMM/CPUM, IEM: Nested VMX: bugref:9180 Preparation of MSR bitmaps for MSR intercepts.

Location:

trunk/include/VBox/vmm

Files:

trunk/include/VBox/vmm/cpumctx.h

-              r74479
+              r74542
                 uint32_t                uAutoMsrAreaR3;
 #endif
+                /** 0x368 - Padding. */
+                uint8_t             abPadding[0x3f0 - 0x368];
+                /** 0x368 - The MSR bitmap - R0 ptr. */
+                R0PTRTYPE(void *)       pvMsrBitmapR0;
+#if HC_ARCH_BITS == 32
+                uint32_t                uMsrBitmapR0;
+#endif
+                /** 0x370 - The MSR bitmap - R3 ptr. */
+                R3PTRTYPE(void *)       pvMsrBitmapR3;
+#if HC_ARCH_BITS == 32
+                uint32_t                uMsrBitmapR3;
+#endif
+                /** 0x378 - Padding. */
+                uint8_t             abPadding[0x3f0 - 0x378];
             } vmx;
         } CPUM_UNION_NM(s);
 …
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVmwriteBitmapR0, 8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pAutoMsrAreaR0,    8);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvMsrBitmapR0,     8);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.enmHwvirt,           0x3f0);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x3f4);

-              r74523
+              r74542
 /** The size of the VMREAD/VMWRITE-bitmap (in pages). */
 #define VMX_V_VMREAD_VMWRITE_BITMAP_PAGES                       1
+/** The size of the MSR bitmap (in bytes). */
+#define VMX_V_MSR_BITMAP_SIZE                                   X86_PAGE_4K_SIZE
+/** The size of the MSR bitmap (in pages). */
+#define VMX_V_MSR_BITMAP_PAGES                                  1
 /** The size of the auto-load/store MSR area (in bytes). */
 …
     kVmxVDiag_Vmentry_HostSysenterEspEip,
     kVmxVDiag_Vmentry_LongModeCS,
+    kVmxVDiag_Vmentry_MsrBitmapPtrReadPhys,
     kVmxVDiag_Vmentry_MsrLoad,
     kVmxVDiag_Vmentry_MsrLoadCount,

Note: See TracChangeset for help on using the changeset viewer.