Changeset 26103 in vbox

Timestamp:

Jan 29, 2010 3:14:22 PM (15 years ago)

Author:

vboxsync

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

57086

Message:

Do not enable NXE if the host hasn't activated it (32 bits VT-x only)

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWACCMR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1136 +1136 @@
                 }
                 else
-                /* Turn on NXE if PAE has been enabled. */
-                if (CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE))
+                /* 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!! */
+                if (    CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE)
+                    &&  (pVM->hwaccm.s.vmx.hostEFER & MSR_K6_EFER_NXE))
                     CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NXE);
 

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -383 +383 @@
         /** Host CR4 value (set by ring-0 VMX init) */
         uint64_t                    hostCR4;
+
+        /** Host EFER value (set by ring-0 VMX init) */
+        uint64_t                    hostEFER;
 
         /** VMX MSR values */

trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

@@ -90 +90 @@
         uint64_t                    hostCR4;
 
+        /** Host EFER value (set by ring-0 VMX init) */
+        uint64_t                    hostEFER;
+
         /** VMX MSR values */
         struct
@@ -270 +273 @@
                         {
                             HWACCMR0Globals.vmx.hostCR4             = ASMGetCR4();
+                            HWACCMR0Globals.vmx.hostEFER            = ASMRdMsr(MSR_K6_EFER);
 
                             rc = RTR0MemObjAllocCont(&pScatchMemObj, 1 << PAGE_SHIFT, true /* executable R0 mapping */);
@@ -903 +907 @@
     pVM->hwaccm.s.vmx.msr.feature_ctrl      = HWACCMR0Globals.vmx.msr.feature_ctrl;
     pVM->hwaccm.s.vmx.hostCR4               = HWACCMR0Globals.vmx.hostCR4;
+    pVM->hwaccm.s.vmx.hostEFER              = HWACCMR0Globals.vmx.hostEFER;
     pVM->hwaccm.s.vmx.msr.vmx_basic_info    = HWACCMR0Globals.vmx.msr.vmx_basic_info;
     pVM->hwaccm.s.vmx.msr.vmx_pin_ctls      = HWACCMR0Globals.vmx.msr.vmx_pin_ctls;