Changeset 93268 in vbox for trunk/src/VBox/VMM

Timestamp:

Jan 17, 2022 11:15:12 AM (3 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10092 True VMX controls MSR support.

File:

• trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -1762 +1762 @@
 
     /* Basic information. */
+    bool const fVmxTrueMsrs = RT_BOOL(pVmxMsrs->u64Basic & VMX_BF_BASIC_TRUE_CTLS_MASK);
     {
         uint64_t const u64Basic = pVmxMsrs->u64Basic;
@@ -1769 +1770 @@
     /* Pin-based VM-execution controls. */
     {
-        uint32_t const fPinCtls = pVmxMsrs->PinCtls.n.allowed1;
+        uint32_t const fPinCtls = fVmxTrueMsrs ? pVmxMsrs->TruePinCtls.n.allowed1 : pVmxMsrs->PinCtls.n.allowed1;
         pFeatures->fVmxExtIntExit            = RT_BOOL(fPinCtls & VMX_PIN_CTLS_EXT_INT_EXIT);
         pFeatures->fVmxNmiExit               = RT_BOOL(fPinCtls & VMX_PIN_CTLS_NMI_EXIT);
@@ -1779 +1780 @@
     /* Processor-based VM-execution controls. */
     {
-        uint32_t const fProcCtls = pVmxMsrs->ProcCtls.n.allowed1;
+        uint32_t const fProcCtls = fVmxTrueMsrs ? pVmxMsrs->TrueProcCtls.n.allowed1 : pVmxMsrs->ProcCtls.n.allowed1;
         pFeatures->fVmxIntWindowExit         = RT_BOOL(fProcCtls & VMX_PROC_CTLS_INT_WINDOW_EXIT);
         pFeatures->fVmxTscOffsetting         = RT_BOOL(fProcCtls & VMX_PROC_CTLS_USE_TSC_OFFSETTING);
@@ -1843 +1844 @@
     /* VM-exit controls. */
     {
-        uint32_t const fExitCtls = pVmxMsrs->ExitCtls.n.allowed1;
+        uint32_t const fExitCtls = fVmxTrueMsrs ? pVmxMsrs->TrueExitCtls.n.allowed1 : pVmxMsrs->ExitCtls.n.allowed1;
         pFeatures->fVmxExitSaveDebugCtls     = RT_BOOL(fExitCtls & VMX_EXIT_CTLS_SAVE_DEBUG);
         pFeatures->fVmxHostAddrSpaceSize     = RT_BOOL(fExitCtls & VMX_EXIT_CTLS_HOST_ADDR_SPACE_SIZE);
@@ -1856 +1857 @@
     /* VM-entry controls. */
     {
-        uint32_t const fEntryCtls = pVmxMsrs->EntryCtls.n.allowed1;
+        uint32_t const fEntryCtls = fVmxTrueMsrs ? pVmxMsrs->TrueEntryCtls.n.allowed1 : pVmxMsrs->EntryCtls.n.allowed1;
         pFeatures->fVmxEntryLoadDebugCtls    = RT_BOOL(fEntryCtls & VMX_ENTRY_CTLS_LOAD_DEBUG);
         pFeatures->fVmxIa32eModeGuest        = RT_BOOL(fEntryCtls & VMX_ENTRY_CTLS_IA32E_MODE_GUEST);