Changeset 74103 in vbox for trunk/include/VBox

Timestamp:

Sep 6, 2018 4:57:57 AM (6 years ago)

Author:

vboxsync

Message:

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

File:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -2155 +2155 @@
 /** Return to long mode after a VM-exit. */
 #define VMX_EXIT_CTLS_HOST_ADDR_SPACE_SIZE                      RT_BIT(9)
-/** Whether the guest IA32_PERF_GLOBAL_CTRL MSR is loaded on VM-exit. */
+/** Whether the host IA32_PERF_GLOBAL_CTRL MSR is loaded on VM-exit. */
 #define VMX_EXIT_CTLS_LOAD_PERF_MSR                             RT_BIT(12)
 /** Acknowledge external interrupts with the irq controller if one caused a VM-exit. */
@@ -3475 +3475 @@
     kVmxVInstrDiag_Vmentry_EntryCtlsAllowed1,
     kVmxVInstrDiag_Vmentry_EntryCtlsDisallowed0,
+    kVmxVInstrDiag_Vmentry_EntryHostCr0Fixed0,
+    kVmxVInstrDiag_Vmentry_EntryHostCr0Fixed1,
+    kVmxVInstrDiag_Vmentry_EntryHostCr3,
+    kVmxVInstrDiag_Vmentry_EntryHostCr4Fixed0,
+    kVmxVInstrDiag_Vmentry_EntryHostCr4Fixed1,
+    kVmxVInstrDiag_Vmentry_EntryHostSysenterEspEip,
+    kVmxVInstrDiag_Vmentry_EntryHostPatMsr,
     kVmxVInstrDiag_Vmentry_EntryInstrLen,
     kVmxVInstrDiag_Vmentry_EntryInstrLenZero,
@@ -3557 +3564 @@
  *
  * @returns @c true if it's a valid type, @c false otherwise.
- * @param   fSupportsMtf    Whether the monitor-trap flag CPU feature is supported.
+ * @param   fSupportsMTF    Whether the Monitor-Trap Flag CPU feature is supported.
  * @param   uType           The VM-entry interruption-information type.
  */
-DECLINLINE(bool) HMVmxIsEntryIntInfoTypeValid(bool fSupportsMtf, uint8_t uType)
+DECLINLINE(bool) HMVmxIsEntryIntInfoTypeValid(bool fSupportsMTF, uint8_t uType)
 {
     /* See Intel spec. 26.2.1.3 "VM-Entry Control Fields". */
@@ -3571 +3578 @@
         case VMX_ENTRY_INT_INFO_TYPE_PRIV_SW_XCPT:
         case VMX_ENTRY_INT_INFO_TYPE_SW_XCPT:           return true;
-        case VMX_ENTRY_INT_INFO_TYPE_OTHER_EVENT:       return fSupportsMtf;
+        case VMX_ENTRY_INT_INFO_TYPE_OTHER_EVENT:       return fSupportsMTF;
         default:
             return false;