Changeset 73781 in vbox for trunk

Timestamp:

Aug 20, 2018 11:39:33 AM (6 years ago)

Author:

vboxsync

Message:

hm_vmx.h: Nested VMX: bugref:9180 VMCS field encoding union.

File:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -2684 +2684 @@
 /** @name VMCS field encoding.
  * @{ */
-#define VMX_VMCS_ENC_GET_INDEX(a)
-
+typedef union
+{
+    struct
+    {
+        /** The access type; 0=full, 1=high of 64-bit fields. */
+        uint32_t    fAccessType  : 1;
+        /** The index. */
+        uint32_t    uIndex       : 8;
+        /** The type; 0=control, 1=VM-exit info, 2=guest-state, 3=host-state.  */
+        uint32_t    uType        : 2;
+        /** Reserved (MBZ). */
+        uint32_t    u1Reserved0  : 1;
+        /** The width; 0=16-bit, 1=64-bit, 2=32-bit, 3=natural-width. */
+        uint32_t    uWidth       : 2;
+        /** Reserved (MBZ). */
+        uint32_t    u18Reserved0 : 18;
+    } n;
+    /* The unsigned integer view. */
+    uint32_t    u;
+} VMXVMCSFIELDENC;
+AssertCompileSize(VMXVMCSFIELDENC, 4);
+/** Pointer to a VMCS field encoding. */
+typedef VMXVMCSFIELDENC *PVMXVMCSFIELDENC;
+/** Pointer to a const VMCS field encoding. */
+typedef const VMXVMCSFIELDENC *PCVMXVMCSFIELDENC;
+/** Bits fields VMCS field encoding. */
 #define VMX_BF_VMCS_ENC_ACCESS_TYPE_SHIFT                       0
 #define VMX_BF_VMCS_ENC_ACCESS_TYPE_MASK                        UINT32_C(0x00000001)
@@ -2726 +2750 @@
 
 /** The highest index value used for supported virtual VMCS field encoding. */
-#define VMX_V_VMCS_MAX_INDEX                                    RT_BF_GET(VMX_VMCS32_PREEMPT_TIMER_VALUE, VMX_BF_VMCS_ENC_INDEX)
+#define VMX_V_VMCS_MAX_INDEX                                    RT_BF_GET(VMX_VMCS64_CTRL_TSC_MULTIPLIER_HIGH, VMX_BF_VMCS_ENC_INDEX)
 
 /** Whether physical addresses of VMXON and VMCS related structures (I/O bitmap