Changeset 74421 in vbox for trunk/include/VBox

Timestamp:

Sep 22, 2018 2:38:39 PM (6 years ago)

Author:

vboxsync

Message:

VMM/CPUM, IEM: Nested VMX: bugref:9180 VM-exit bits.

Location:

trunk/include/VBox/vmm

Files:

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

trunk/include/VBox/vmm/cpum.mac

@@ -280 +280 @@
     alignb 8
     .hwvirt.svm.HCPhysVmcb             RTHCPHYS_RES  1
-    .hwvirt.uInhibitRip                resq          1
     .hwvirt.fLocalForcedActions        resd          1
     .hwvirt.fGif                       resb          1

trunk/include/VBox/vmm/cpumctx.h

@@ -624 +624 @@
         } CPUM_UNION_NM(s);
 
-        /** 0x3f0 - Saved guest's interrupt-inhibited RIP (if any) - Intel only. */
-        uint64_t                uInhibitRip;
-        /** 0x3f8 - A subset of guest force flags that are saved while running the
+        /** 0x3f0 - A subset of guest force flags that are saved while running the
          *  nested-guest. */
         uint32_t                fLocalForcedActions;
-        /** 0x3fc - Global interrupt flag - AMD only (always true on Intel). */
+        /** 0x3f4 - Global interrupt flag - AMD only (always true on Intel). */
         bool                    fGif;
-        /** 0x3fd - Padding. */
-        uint8_t                 abPadding1[3];
+        /** 0x3f8 - Padding. */
+        uint8_t                 abPadding1[11];
     } hwvirt;
     /** @} */
@@ -726 +724 @@
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVmwriteBitmapR0, 8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pAutoMsrAreaR0,    8);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.uInhibitRip,         0x3f0);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x3f8);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif,                0x3fc);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x3f0);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif,                0x3f4);
 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw.) rax, CPUMCTX, CPUM_UNION_NM(g.) aGRegs);
 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw.) rax, CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw2.)  r0);

trunk/include/VBox/vmm/hm_vmx.h

@@ -3834 +3834 @@
     kVmxVDiag_Vmentry_VmxRoot,
     kVmxVDiag_Vmentry_Vpid,
+    kVmxVDiag_Vmexit_HostPdpteCr3ReadPhys,
+    kVmxVDiag_Vmexit_HostPdpte0Rsvd,
+    kVmxVDiag_Vmexit_HostPdpte1Rsvd,
+    kVmxVDiag_Vmexit_HostPdpte2Rsvd,
+    kVmxVDiag_Vmexit_HostPdpte3Rsvd,
     kVmxVDiag_Vmexit_MsrStore,
     kVmxVDiag_Vmexit_MsrStoreCount,