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

Timestamp:

Sep 9, 2018 3:51:39 PM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 vmlaunch/vmresume bits.

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (3 diffs)
• hm_vmx.h (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -968 +968 @@
     /** The maximum physical address width of the CPU. */
     uint8_t         cMaxPhysAddrWidth;
-    /** The maximum physical address width for VMX/VMCS structures. */
-    uint8_t         cVmxMaxPhysAddrWidth;
+    /** The maximum linear address width of the CPU. */
+    uint8_t         cMaxLinearAddrWidth;;
     /** Max size of the extended state (or FPU state if no XSAVE). */
     uint16_t        cbMaxExtendedState;
@@ -1117 +1117 @@
     uint32_t        uSvmMaxAsid;
 
+    /** VMX: Maximum physical address width. */
+    uint8_t         cVmxMaxPhysAddrWidth;
+    /** VMX: Padding / reserved for future. */
+    uint8_t         abVmxPadding[3];
+    /** VMX: Padding / reserved for future.  */
+    uint32_t        fVmxPadding0;
+
     /** @name VMX basic controls.
      * @{ */
@@ -1272 +1279 @@
 
     /** VMX: Padding / reserved for future features. */
-    uint32_t        fVmxPadding0 : 2;
-    uint32_t        fVmxPadding1;
+    uint32_t        fVmxPadding1 : 2;
+    uint32_t        fVmxPadding2;
 } CPUMFEATURES;
 #ifndef VBOX_FOR_DTRACE_LIB
-AssertCompileSize(CPUMFEATURES, 40);
+AssertCompileSize(CPUMFEATURES, 48);
 #endif
 /** Pointer to a CPU feature structure. */

trunk/include/VBox/vmm/hm_vmx.h

@@ -3508 +3508 @@
     kVmxVDiag_Vmentry_GuestPatMsr,
     kVmxVDiag_Vmentry_GuestPcide,
+    kVmxVDiag_Vmentry_GuestRip,
+    kVmxVDiag_Vmentry_GuestRipRsvd,
+    kVmxVDiag_Vmentry_GuestRFlagsIf,
+    kVmxVDiag_Vmentry_GuestRFlagsRsvd,
+    kVmxVDiag_Vmentry_GuestRFlagsVm,
     kVmxVDiag_Vmentry_GuestSegAttrCsDefBig,
     kVmxVDiag_Vmentry_GuestSegAttrCsDplEqSs,