Changeset 74171 in vbox for trunk/include/VBox

Timestamp:

Sep 10, 2018 7:48:40 AM (6 years ago)

Author:

vboxsync

Message:

VMM/CPUM, IEM: Nested VMX: bugref:9180 vmlaunch/vmresume bits.

File:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -2423 +2423 @@
 /** The logical processor is active. */
 #define VMX_VMCS_GUEST_ACTIVITY_ACTIVE                          0x0
-/** The logical processor is inactive, because executed a HLT instruction. */
+/** The logical processor is inactive, because it executed a HLT instruction. */
 #define VMX_VMCS_GUEST_ACTIVITY_HLT                             0x1
 /** The logical processor is inactive, because of a triple fault or other serious error. */
@@ -2439 +2439 @@
 #define VMX_VMCS_GUEST_INT_STATE_BLOCK_SMI                      RT_BIT(2)
 #define VMX_VMCS_GUEST_INT_STATE_BLOCK_NMI                      RT_BIT(3)
+#define VMX_VMCS_GUEST_INT_STATE_ENCLAVE                        RT_BIT(4)
+
+/** Mask of the guest-interruptibility state field (bits 31:5 MBZ). */
+#define VMX_VMCS_GUEST_INT_STATE_MASK                           UINT32_C(0x1f)
 /** @} */
 
@@ -2845 +2849 @@
 #define VMX_V_CR3_TARGET_COUNT                                  4
 /** Activity states supported. */
-#define VMX_V_GUEST_ACTIVITY_STATE_MASK                         (VMX_VMCS_GUEST_ACTIVITY_HLT)
+#define VMX_V_GUEST_ACTIVITY_STATE_MASK                         (VMX_VMCS_GUEST_ACTIVITY_HLT | VMX_VMCS_GUEST_ACTIVITY_SHUTDOWN)
 /** VMX preemption-timer shift (Core i7-2600 taken as reference). */
 #define VMX_V_PREEMPT_TIMER_SHIFT                               5
@@ -3510 +3514 @@
     kVmxVDiag_Vmentry_GuestIdtrBase,
     kVmxVDiag_Vmentry_GuestIdtrLimit,
+    kVmxVDiag_Vmentry_GuestIntStateEnclave,
+    kVmxVDiag_Vmentry_GuestIntStateExtInt,
+    kVmxVDiag_Vmentry_GuestIntStateNmi,
+    kVmxVDiag_Vmentry_GuestIntStateRFlagsSti,
+    kVmxVDiag_Vmentry_GuestIntStateRsvd,
+    kVmxVDiag_Vmentry_GuestIntStateSmi,
+    kVmxVDiag_Vmentry_GuestIntStateStiMovSs,
+    kVmxVDiag_Vmentry_GuestIntStateVirtNmi,
     kVmxVDiag_Vmentry_GuestPae,
     kVmxVDiag_Vmentry_GuestPatMsr,
@@ -3637 +3649 @@
     kVmxVDiag_Vmentry_SavePreemptTimer,
     kVmxVDiag_Vmentry_Success,
-    kVmxVDiag_Vmentry_TprThreshold,
+    kVmxVDiag_Vmentry_TprThresholdRsvd,
     kVmxVDiag_Vmentry_TprThresholdVTpr,
     kVmxVDiag_Vmentry_VirtApicPagePtrReadPhys,