Changeset 36236 in vbox

Timestamp:

Mar 9, 2011 5:27:22 PM (14 years ago)

Author:

vboxsync

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

70458

Message:

HWACCMR0: CPU bounds check. CPUMR0: updated message.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• CPUMR0.cpp (modified) (1 diff)
• HWACCMR0.cpp (modified) (2 diffs)

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

@@ -695 +695 @@
     if (RTMpGetArraySize() > RT_ELEMENTS(g_aLApics))
     {
-        LogRel(("CPUM: Too many real CPUs - %u, max %u\n", RTMpGetArraySize(), RT_ELEMENTS(g_aLApics)));
+        LogRel(("CPUM: Too many real CPUs/cores/threads - %u, max %u\n", RTMpGetArraySize(), RT_ELEMENTS(g_aLApics)));
         return VERR_TOO_MANY_CPUS;
     }

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

@@ -154 +154 @@
     bool    fAMDVPresent = false;
 
-    memset(&HWACCMR0Globals, 0, sizeof(HWACCMR0Globals));
     HWACCMR0Globals.enmHwAccmState = HWACCMSTATE_UNINITIALIZED;
     for (unsigned i = 0; i < RT_ELEMENTS(HWACCMR0Globals.aCpuInfo); i++)
@@ -173 +172 @@
     /* Default is global VT-x/AMD-V init */
     HWACCMR0Globals.fGlobalInit         = true;
+
+    /*
+     * Make sure aCpuInfo is big enough for all the CPUs on this system.
+     */
+    if (RTMpGetArraySize() > RT_ELEMENTS(HWACCMR0Globals.aCpuInfo))
+    {
+        LogRel(("HWACCM: Too many real CPUs/cores/threads - %u, max %u\n", RTMpGetArraySize(), RT_ELEMENTS(HWACCMR0Globals.aCpuInfo)));
+        return VERR_TOO_MANY_CPUS;
+    }
 
     /*