Changeset 8554 in vbox

Timestamp:

May 5, 2008 8:08:06 AM (17 years ago)

Author:

vboxsync

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

30468

Message:

Always refuse to load if the cpu is in vmx root mode (32 bits to PAE switcher turns off paging as well)

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (4 diffs)

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

@@ -182 +182 @@
                                                                 == (MSR_IA32_FEATURE_CONTROL_VMXON|MSR_IA32_FEATURE_CONTROL_LOCK))
                     {
+                        RTR0MEMOBJ pScatchMemObj;
+                        void      *pvScatchPage;
+                        RTHCPHYS   pScatchPagePhys;
+
                         HWACCMR0Globals.vmx.fSupported          = true;
                         HWACCMR0Globals.vmx.msr.vmx_basic_info  = ASMRdMsr(MSR_IA32_VMX_BASIC_INFO);
@@ -196 +200 @@
                         HWACCMR0Globals.vmx.hostCR4             = ASMGetCR4();
 
-#if HC_ARCH_BITS == 64
-                        RTR0MEMOBJ pScatchMemObj;
-                        void      *pvScatchPage;
-                        RTHCPHYS   pScatchPagePhys;
-
                         rc = RTR0MemObjAllocCont(&pScatchMemObj, 1 << PAGE_SHIFT, true /* executable R0 mapping */);
                         if (RT_FAILURE(rc))
@@ -232 +231 @@
                             /* KVM leaves the CPU in VMX root mode. Not only is this not allowed, it will crash the host when we enter raw mode, because
                              * (a) clearing X86_CR4_VMXE in CR4 causes a #GP    (we no longer modify this bit)
-                             * (b) turning off paging causes a #GP              (unavoidable when switching from long to 32 bits mode)
+                             * (b) turning off paging causes a #GP              (unavoidable when switching from long to 32 bits mode or 32 bits to PAE)
                              *
                              * They should fix their code, but until they do we simply refuse to run.
@@ -249 +248 @@
                         if (VBOX_FAILURE(HWACCMR0Globals.lLastError))
                             return HWACCMR0Globals.lLastError ;
-#endif
                     }
                     else