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

Timestamp:

Dec 13, 2018 1:02:49 PM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 If hardware-assisted VMX nested-guest execution is not allowed, don't bother deriving guest features based on host features. Initialize with purely emulated features.

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (3 diffs)

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

@@ -1390 +1390 @@
     {
         uint64_t uHostMsr = 0;
-        HMVmxGetHostMsr(pVM, MSR_IA32_VMX_MISC, &uHostMsr);
+        if (cpumR3IsHwAssistVmxNstGstExecAllowed(pVM))
+            HMVmxGetHostMsr(pVM, MSR_IA32_VMX_MISC, &uHostMsr);
         uint8_t const cMaxMsrs       = RT_MIN(RT_BF_GET(uHostMsr, VMX_BF_MISC_MAX_MSRS), VMX_V_AUTOMSR_COUNT_MAX);
         uint8_t const fActivityState = RT_BF_GET(uHostMsr, VMX_BF_MISC_ACTIVITY_STATES) & VMX_V_GUEST_ACTIVITY_STATE_MASK;
@@ -1412 +1413 @@
     {
         uint64_t uHostMsr = 0;
-        HMVmxGetHostMsr(pVM, MSR_IA32_VMX_CR0_FIXED1, &uHostMsr);
+        if (cpumR3IsHwAssistVmxNstGstExecAllowed(pVM))
+            HMVmxGetHostMsr(pVM, MSR_IA32_VMX_CR0_FIXED1, &uHostMsr);
         pVmxMsrs->u64Cr0Fixed1 = uHostMsr | VMX_V_CR0_FIXED0;   /* Make sure the CR0 MB1 bits are not clear. */
     }
@@ -1422 +1424 @@
     {
         uint64_t uHostMsr = 0;
-        HMVmxGetHostMsr(pVM, MSR_IA32_VMX_CR4_FIXED1, &uHostMsr);
+        if (cpumR3IsHwAssistVmxNstGstExecAllowed(pVM))
+            HMVmxGetHostMsr(pVM, MSR_IA32_VMX_CR4_FIXED1, &uHostMsr);
         pVmxMsrs->u64Cr4Fixed1 = uHostMsr | VMX_V_CR4_FIXED0;   /* Make sure the CR4 MB1 bits are not clear. */
     }