Changeset 73885 in vbox for trunk/include/VBox

Timestamp:

Aug 25, 2018 4:00:00 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HM, IEM: Nested VMX: bugref:9180 Implement VMCLEAR instruction, fix typos and missing enum defines for instruction diagnostics.

File:

• trunk/include/VBox/vmm/hm_vmx.h (modified) (4 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -2862 +2862 @@
     kVmxVInstrDiag_Vmptrst_Cpl,
     kVmxVInstrDiag_Vmptrst_PtrMap,
+    kVmxVInstrDiag_Vmptrst_Success,
     /* VMCLEAR. */
     kVmxVInstrDiag_Vmclear_Cpl,
+    kVmxVInstrDiag_Vmclear_PtrAbnormal,
+    kVmxVInstrDiag_Vmclear_PtrAlign,
+    kVmxVInstrDiag_Vmclear_PtrMap,
+    kVmxVInstrDiag_Vmclear_PtrReadPhys,
+    kVmxVInstrDiag_Vmclear_PtrVmxon,
+    kVmxVInstrDiag_Vmclear_PtrWidth,
+    kVmxVInstrDiag_Vmclear_Success,
     /* Last member for determining array index limit. */
     kVmxVInstrDiag_Last
 } VMXVINSTRDIAG;
 AssertCompileSize(VMXVINSTRDIAG, 4);
+
+/** @name VMX_V_VMCS_STATE_XXX - Virtual VMCS state.
+ * @{ */
+/** VMCS state clear. */
+#define VMX_V_VMCS_STATE_CLEAR          RT_BIT(0)
+/** VMCS state launched. */
+#define VMX_V_VMCS_STATE_LAUNCHED       RT_BIT(1)
+/** @} */
 
 /**
@@ -2876 +2892 @@
  * The first 8 bytes are as per Intel spec. 24.2 "Format of the VMCS Region".
  *
+ * The offset and size of the VMCS state field (fVmcsState) is also fixed as we use
+ * it to offset into guest memory.
+ *
  * Although the guest is supposed to access the VMCS only through the execution of
  * VMX instructions (VMREAD, VMWRITE etc.), since the VMCS may reside in guest
@@ -2889 +2908 @@
     /** 0x4 - VMX-abort indicator. */
     uint32_t        u32VmxAbortId;
-    /** 0x8 - Reserved for future. */
-    uint32_t        au32Reserved0[8];
+    /** 0x8 - VMCS state, see VMX_V_VMCS_STATE_XXX. */
+    uint8_t         fVmcsState;
+    /** 0x9 - Reserved for future. */
+    uint8_t         au8Padding0[3];
+    /** 0xc - Reserved for future. */
+    uint32_t        au32Reserved0[7];
 
     /** @name 16-bit control fields.
@@ -3300 +3323 @@
 typedef const VMXVVMCS *PCVMXVVMCS;
 AssertCompileSize(VMXVVMCS, X86_PAGE_4K_SIZE);
+AssertCompileMemberSize(VMXVVMCS, fVmcsState, sizeof(uint8_t));
 AssertCompileMemberOffset(VMXVVMCS, u32VmxAbortId,      0x004);
+AssertCompileMemberOffset(VMXVVMCS, fVmcsState,         0x008);
 AssertCompileMemberOffset(VMXVVMCS, u16Vpid,            0x028);
 AssertCompileMemberOffset(VMXVVMCS, GuestEs,            0x03e);