Changeset 87554 in vbox

Timestamp:

Feb 3, 2021 10:44:16 AM (4 years ago)

Author:

vboxsync

Message:

VMM/HM: There should be no restriction on NX for PAE guests now.

File:

• trunk/src/VBox/VMM/VMMR3/HM.cpp (modified) (1 diff)

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

@@ -1676 +1676 @@
         CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
         CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LONG_MODE);
-        CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_SYSCALL);            /* 64 bits only on Intel CPUs */
+        CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_SYSCALL);            /* (Long mode only on Intel CPUs.) */
         CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LAHF);
         CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX);
     }
-    /* Turn on NXE if PAE has been enabled *and* the host has turned on NXE
-       (we reuse the host EFER in the switcher). */
-    /** @todo this needs to be fixed properly!! */
+    /* Given that we're on a long mode host, we can simply enable NX for PAE capable guests. */
     else if (CPUMR3GetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE))
-    {
-        if (pVM->hm.s.vmx.u64HostMsrEfer & MSR_K6_EFER_NXE)
-            CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX);
-        else
-            LogRel(("HM: NX not enabled on the host, unavailable to PAE guest\n"));
-    }
+        CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX);
 
     /*