Changeset 79141 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 14, 2019 4:31:58 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131308

Message:

VMM/CPUM: Nested VMX: bugref:9180 Take the CR0 fixed bits as we report it in the MSR rather than the macro (which might change in the future when UX is exposed).

File:

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

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

@@ -1677 +1677 @@
          */
         uint64_t const uHostMsr = fIsNstGstHwExecAllowed ? pHostVmxMsrs->u64Cr0Fixed1 : 0xffffffff;
-        pGuestVmxMsrs->u64Cr0Fixed1 = uHostMsr | VMX_V_CR0_FIXED0;   /* Make sure the CR0 MB1 bits are not clear. */
+        pGuestVmxMsrs->u64Cr0Fixed1 = uHostMsr | pGuestVmxMsrs->u64Cr0Fixed0;   /* Make sure the CR0 MB1 bits are not clear. */
     }
 
@@ -1686 +1686 @@
     {
         uint64_t const uHostMsr = fIsNstGstHwExecAllowed ? pHostVmxMsrs->u64Cr4Fixed1 : CPUMGetGuestCR4ValidMask(pVM);
-        pGuestVmxMsrs->u64Cr4Fixed1 = uHostMsr | VMX_V_CR4_FIXED0;   /* Make sure the CR4 MB1 bits are not clear. */
+        pGuestVmxMsrs->u64Cr4Fixed1 = uHostMsr | pGuestVmxMsrs->u64Cr4Fixed0;   /* Make sure the CR4 MB1 bits are not clear. */
     }