Changeset 73628 in vbox for trunk/include

Timestamp:

Aug 13, 2018 7:45:01 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Implement IA32_VMX_MISC MSR.

File:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -1237 +1237 @@
  *  instructions. */
 #define VMX_MISC_ENTRY_INJECT_SOFT_INT                          RT_BIT(30)
-/** Maximum number of MSRs in the VMCS, (n+1)*512. */
+/** Maximum number of MSRs in the auto-load/store MSR areas, (n+1) * 512. */
 #define VMX_MISC_MAX_MSRS(a_MiscMsr)                            (512 * (RT_BF_GET((a_MiscMsr), VMX_BF_MISC_MAX_MSRS) + 1))
+/** Maximum CR3-target count supported by the CPU. */
+#define VMX_MISC_CR3_TARGET_COUNT(a_MiscMsr)                    (((a) >> 16) & 0xff)
 /** Relationship between the preemption timer and tsc. */
 #define VMX_BF_MISC_PREEMPT_TIMER_TSC_SHIFT                     0
@@ -1286 +1288 @@
 /** @} */
 
+/** Maximum number of CR3 target supported by VT-x */
+#define VMX_VMCS_CTRL_CR3_TARGET_COUNT_MAX                      4
 
 /** @name VMX MSR - VMCS enumeration.
@@ -1574 +1578 @@
 #define VMX_VMCS_CTRL_CR3_TARGET_VAL1                           0x600a
 #define VMX_VMCS_CTRL_CR3_TARGET_VAL2                           0x600c
-#define VMX_VMCS_CTRL_CR3_TARGET_VAL31                          0x600e
+#define VMX_VMCS_CTRL_CR3_TARGET_VAL3                           0x600e
 /** @} */
 
@@ -2523 +2527 @@
 #define VMX_V_VMCS_PHYSADDR_4G_LIMIT                            0
 
+/** @name Virtual VMX MSR - Miscellaneous data.
+ * @{ */
+/** Number of CR3-target values supported. */
+#define VMX_V_CR3_TARGET_COUNT                                  4
+/** Activity states supported. */
+#define VMX_V_GUEST_ACTIVITY_STATE_MASK                         (VMX_VMCS_GUEST_ACTIVITY_HLT)
+/** VMX preemption-timer shift (Core i7-2600 taken as reference). */
+#define VMX_V_PREEMPT_TIMER_SHIFT                               5
+/** Maximum number of MSRs in the auto-load/store MSR areas, (n+1) * 512. */
+#define VMX_V_MAX_MSRS                                          0
+/** SMM MSEG revision ID. */
+#define VMX_V_MSEG_REV_ID                                       0
+/** @} */
+
 /**
  * Virtual VMX-instruction diagnostics.