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

Timestamp:

May 29, 2009 3:25:31 PM (16 years ago)

Author:

vboxsync

Message:

Extra VCPU checks. Attempt to fix alignment issue

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (1 diff)
• PGMInternal.h (modified) (1 diff)
• VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -423 +423 @@
     if (pVM->cpum.s.enmCPUVendor == CPUMCPUVENDOR_INTEL)
     {
+        AssertReturn(pVM->cCPUs <= 64, VERR_TOO_MANY_CPUS);
         /* One logical processor with possibly multiple cores. */
         pCPUM->aGuestCpuIdStd[4].eax |= ((pVM->cCPUs - 1) << 26);   /* 6 bits only -> 64 cores! */

trunk/src/VBox/VMM/PGMInternal.h

@@ -2222 +2222 @@
     bool                            fRamPreAlloc;
     /** Alignment padding. */
-    bool                            afAlignment0[7];
+    bool                            afAlignment0[11];
 
     /*

trunk/src/VBox/VMM/VM.cpp

@@ -215 +215 @@
      * Validate input.
      */
-    AssertLogRelMsgReturn(cCPUs > 0 && cCPUs <= VMM_MAX_CPU_COUNT, ("%RU32\n", cCPUs), VERR_INVALID_PARAMETER);
+    AssertLogRelMsgReturn(cCPUs > 0 && cCPUs <= VMM_MAX_CPU_COUNT, ("%RU32\n", cCPUs), VERR_TOO_MANY_CPUS);
 
     /*