Changeset 48651 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 24, 2013 9:14:49 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Checking this once outside the loop is sufficient.

File:

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

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

@@ -916 +916 @@
 #undef VMXLOCAL_INIT_VM_MEMOBJ
 
+    /* The VMCS size cannot be more than 4096 bytes. See Intel spec. Appendix A.1 "Basic VMX Information". */
+    AssertReturnStmt(MSR_IA32_VMX_BASIC_INFO_VMCS_SIZE(pVM->hm.s.vmx.Msrs.u64BasicInfo) <= PAGE_SIZE,
+                     (&pVM->aCpus[0])->hm.s.u32HMError = VMX_UFC_INVALID_VMCS_SIZE,
+                     VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO);
+
     /*
      * Allocate all the VT-x structures.
@@ -944 +949 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
         AssertPtr(pVCpu);
-
-        /* The VMCS size cannot be more than 4096 bytes. See Intel spec. Appendix A.1 "Basic VMX Information". */
-        AssertReturnStmt(MSR_IA32_VMX_BASIC_INFO_VMCS_SIZE(pVM->hm.s.vmx.Msrs.u64BasicInfo) <= PAGE_SIZE,
-                         pVCpu->hm.s.u32HMError = VMX_UFC_INVALID_VMCS_SIZE,
-                         VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO);
 
         /* Allocate the VM control structure (VMCS). */