Changeset 7494 in vbox for trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

Timestamp:

Mar 19, 2008 9:11:21 AM (17 years ago)

Author:

vboxsync

Message:

Cleaned up

File:

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

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

@@ -122 +122 @@
 {
     int        rc;
-    RTR0MEMOBJ pScatchMemObj;
-    void      *pvScatchPage;
-    RTHCPHYS   pScatchPagePhys;
 
     memset(&HWACCMR0Globals, 0, sizeof(HWACCMR0Globals));
     HWACCMR0Globals.enmHwAccmState = HWACCMSTATE_UNINITIALIZED;
-
-    rc = RTR0MemObjAllocCont(&pScatchMemObj, 1 << PAGE_SHIFT, true /* executable R0 mapping */);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    pvScatchPage    = RTR0MemObjAddress(pScatchMemObj);
-    pScatchPagePhys = RTR0MemObjGetPagePhysAddr(pScatchMemObj, 0);
-    memset(pvScatchPage, 0, PAGE_SIZE);
 
 #ifdef RT_OS_WINDOWS /* kernel panics on Linux; disabled for now */
@@ -204 +193 @@
                         HWACCMR0Globals.vmx.msr.vmx_cr4_fixed1  = ASMRdMsr(MSR_IA32_VMX_CR4_FIXED1);
                         HWACCMR0Globals.vmx.msr.vmx_vmcs_enum   = ASMRdMsr(MSR_IA32_VMX_VMCS_ENUM);
+                        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))
+                            return rc;
+
+                        pvScatchPage    = RTR0MemObjAddress(pScatchMemObj);
+                        pScatchPagePhys = RTR0MemObjGetPagePhysAddr(pScatchMemObj, 0);
+                        memset(pvScatchPage, 0, PAGE_SIZE);
+
+                        /* Set revision dword at the beginning of the structure. */
+                        *(uint32_t *)pvScatchPage = MSR_IA32_VMX_BASIC_INFO_VMCS_ID(HWACCMR0Globals.vmx.msr.vmx_basic_info);
 
                         /* Make sure we don't get rescheduled to another cpu during this probe. */
@@ -209 +215 @@
 
                         /*
-                        * Check CR4.VMXE
-                        */
-                        HWACCMR0Globals.vmx.hostCR4 = ASMGetCR4();
+                         * Check CR4.VMXE
+                         */
                         if (!(HWACCMR0Globals.vmx.hostCR4 & X86_CR4_VMXE))
                         {
@@ -220 +225 @@
                         }
 
-                        /* Set revision dword at the beginning of the structure. */
-                        *(uint32_t *)pvScatchPage = MSR_IA32_VMX_BASIC_INFO_VMCS_ID(HWACCMR0Globals.vmx.msr.vmx_basic_info);
-
-#if HC_ARCH_BITS == 64
                         /* Enter VMX Root Mode */
                         rc = VMXEnable(pScatchPagePhys);
@@ -239 +240 @@
                         else
                             VMXDisable();
-#endif
+
                         /* Restore CR4 again; don't leave the X86_CR4_VMXE flag set if it wasn't so before (some software could incorrectly think it's in VMX mode) */
                         ASMSetCR4(HWACCMR0Globals.vmx.hostCR4);
-
                         ASMSetFlags(fFlags);
+
+                        RTR0MemObjFree(pScatchMemObj, false);
+#endif
                     }
                     else
@@ -306 +309 @@
 #endif /* RT_OS_WINDOWS */
 
-    RTR0MemObjFree(pScatchMemObj, false);
     return VINF_SUCCESS;
 }