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

Timestamp:

Sep 20, 2018 4:55:05 PM (6 years ago)

Author:

vboxsync

Message:

VMM/CPU, IEM: Nested VMX: bugref:9180 Access the CR0 and CR4 fixed bits from the corresponding MSRs for now.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllMsrs.cpp (modified) (1 diff)
• IEMAllCImpl.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

@@ -1557 +1557 @@
 {
     PCCPUMFEATURES pGuestFeatures = &pVCpu->CTX_SUFF(pVM)->cpum.s.GuestFeatures;
-    uint64_t const uVmxMsr = pGuestFeatures->fVmx ? VMX_V_CR0_FIXED0 : 0;
-    return uVmxMsr;
+    if (pGuestFeatures->fVmx)
+    {
+        uint64_t const uVmxMsr = pGuestFeatures->fVmxUnrestrictedGuest ? VMX_V_CR0_FIXED0_UX : VMX_V_CR0_FIXED0;
+        return uVmxMsr;
+    }
+    return 0;
 }
 

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -5338 +5338 @@
             if (IEM_IS_VMX_ROOT_MODE(pVCpu))
             {
-                uint32_t const uCr0Fixed0 = IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fVmxUnrestrictedGuest ?
-                                            VMX_V_CR0_FIXED0_UX : VMX_V_CR0_FIXED0;
+                uint32_t const uCr0Fixed0 = CPUMGetGuestIa32VmxCr0Fixed0(pVCpu);
                 if ((uNewCrX & uCr0Fixed0) != uCr0Fixed0)
                 {
@@ -5565 +5564 @@
             if (IEM_IS_VMX_ROOT_MODE(pVCpu))
             {
-                uint32_t const uCr4Fixed0 = VMX_V_CR4_FIXED0;
+                uint32_t const uCr4Fixed0 = CPUMGetGuestIa32VmxCr4Fixed0(pVCpu);
                 if ((uNewCrX & uCr4Fixed0) != uCr4Fixed0)
                 {