Changeset 107854 in vbox for trunk/include/VBox/vmm

Timestamp:

Jan 18, 2025 11:59:26 PM (6 weeks ago)

Author:

vboxsync

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

167053

Message:

x86.h,VMM: More AMD CPUID bits; addressed some old todos related to these; fixed bugs in svn & vmx world switcher (sanity checks, ++). jiraref:VBP-947 bugref:10738

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (2 diffs)
• cpum.mac (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -466 +466 @@
     /** Supports IA32_PRED_CMD.IBPB. */
     uint32_t        fIbpb : 1;
+    /** Supports the IA32_SPEC_CTRL MSR (summary of the next). */
+    uint32_t        fSpecCtrlMsr : 1;
     /** Supports IA32_SPEC_CTRL.IBRS. */
     uint32_t        fIbrs : 1;
@@ -640 +642 @@
 
     /** Alignment padding / reserved for future use. */
-    uint32_t        fPadding0 : 18;
+    uint32_t        fPadding0 : 17;
     uint32_t        auPadding[3];
 

trunk/include/VBox/vmm/cpum.mac

@@ -265 +265 @@
 
 
+%define CPUMCTX_MAX_MTRRVAR_COUNT   16
+
 ;;
 ; Guest MSR state.
 struc CPUMCTXMSRS
-    .au64               resq  64
+    .msr.TscAux                         resq 1
+    .msr.MiscEnable                     resq 1
+    .msr.MtrrDefType                    resq 1
+    .msr.MtrrFix64K_00000               resq 1
+    .msr.MtrrFix16K_80000               resq 1
+    .msr.MtrrFix16K_A0000               resq 1
+    .msr.MtrrFix4K_C0000                resq 1
+    .msr.MtrrFix4K_C8000                resq 1
+    .msr.MtrrFix4K_D0000                resq 1
+    .msr.MtrrFix4K_D8000                resq 1
+    .msr.MtrrFix4K_E0000                resq 1
+    .msr.MtrrFix4K_E8000                resq 1
+    .msr.MtrrFix4K_F0000                resq 1
+    .msr.MtrrFix4K_F8000                resq 1
+    .msr.PkgCStateCfgCtrl               resq 1
+    .msr.SpecCtrl                       resq 1
+    .msr.ArchCaps                       resq 1
+    .msr.MtrrCap                        resq 1
+    .msr.aMtrrVarMsrs                   resq CPUMCTX_MAX_MTRRVAR_COUNT
+    alignb 512
 endstruc