Changeset 30148 in vbox for trunk/src

Timestamp:

Jun 10, 2010 12:17:16 PM (15 years ago)

Author:

vboxsync

Message:

Too early to check guest cpuid features; use host

File:

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

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -35 +35 @@
 #include <iprt/alloc.h>
 #include <iprt/asm.h>
+#include <iprt/asm-amd64-x86.h>
 #include <iprt/string.h>
 #include <iprt/ctype.h>
@@ -533 +534 @@
             {
                 uint32_t u32OrMask = MSR_K6_EFER_LME | MSR_K6_EFER_SCE;
-                if (CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NXE))
+                if (!!(ASMCpuId_EDX(0x80000001) & X86_CPUID_AMD_FEATURE_EDX_NX))
                     u32OrMask |= MSR_K6_EFER_NXE;