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

Timestamp:

Dec 11, 2018 7:02:18 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Add the VMX MSRs to CPUMCTX.

Location:

trunk/src/VBox/VMM

Files:

• include/CPUMInternal.mac (modified) (2 diffs)
• testcase/tstVMStruct.h (modified) (1 diff)

trunk/src/VBox/VMM/include/CPUMInternal.mac

@@ -253 +253 @@
     alignb 8
     .Guest.hwvirt.svm.HCPhysVmcb             RTHCPHYS_RES 1
+    .Guest.hwvirt.svm.u64Padding0            resb         120
     .Guest.hwvirt.enmHwvirt                  resd         1
     .Guest.hwvirt.fGif                       resb         1
@@ -542 +543 @@
     alignb 8
     .Hyper.hwvirt.svm.HCPhysVmcb             RTHCPHYS_RES 1
+    .Hyper.hwvirt.svm.u64Padding0            resb         120
     .Hyper.hwvirt.enmHwvirt                  resd         1
     .Hyper.hwvirt.fGif                       resb         1

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -175 +175 @@
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uVmentryTick);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.offVirtApicWrite);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrFeatCtrl);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrBasic);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrPinCtls);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrProcCtls);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrProcCtls2);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrExitCtls);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrEntryCtls);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrTruePinCtls);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrTrueProcCtls);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrTrueEntryCtls);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrTrueExitCtls);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrMisc);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrCr0Fixed0);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrCr0Fixed1);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrCr4Fixed0);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrCr4Fixed1);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrVmcsEnum);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrVmFunc);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uMsrEptVpidCaps);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.enmHwvirt);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.fGif);