Changeset 13789 in vbox

Timestamp:

Nov 4, 2008 3:42:49 PM (16 years ago)

Author:

vboxsync

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

38775

Message:

VMM: Ring-0 initializes VM::cCPUs, VMR3CreateVM validates i'ts input before doing anything, and use AssertLogRel.

Location:

trunk/src/VBox/VMM

Files:

• VM.cpp (modified) (4 diffs)
• VMMR0/GVMMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VM.cpp

@@ -207 +207 @@
         fGlobalInitDone = true;
     }
+
+    /*
+     * Validate input.
+     */
+#ifdef VBOX_WITH_SMP_GUESTS
+    AssertLogRelMsgReturn(cCPUs > 0 && cCPUs <= VMCPU_MAX_CPU_COUNT, ("%RU32\n", cCPUs), VERR_INVALID_PARAMETER);
+#else
+    AssertLogRelMsgReturn(cCPUs == 1, ("%RU32\n", cCPUs), VERR_INVALID_PARAMETER);
+#endif
 
     /*
@@ -483 +492 @@
         AssertRelease(pVM->pVMR0 == CreateVMReq.pVMR0);
         AssertRelease(pVM->pSession == pUVM->vm.s.pSession);
-
-        Log(("VMR3Create: Created pUVM=%p pVM=%p pVMR0=%p hSelf=%#x \n", pUVM, pVM, pVM->pVMR0, pVM->hSelf));
+        AssertRelease(pVM->cCPUs == cCPUs);
+
+        Log(("VMR3Create: Created pUVM=%p pVM=%p pVMR0=%p hSelf=%#x cCPUs=%RU32\n",
+             pUVM, pVM, pVM->pVMR0, pVM->hSelf, pVM->cCPUs));
 
         /*
@@ -491 +502 @@
         pVM->pUVM = pUVM;
         pVM->NativeThreadEMT = pUVM->aCpu[0].vm.s.NativeThreadEMT;
-
-        for (unsigned i=0;i<pVM->cCPUs;i++)
+        pVM->offVMCPU = RT_OFFSETOF(VM, aCpu);
+
+        for (uint32_t i = 0; i < pVM->cCPUs; i++)
         {
             pVM->aCpu[i].hNativeThread = pUVM->aCpu[i].vm.s.NativeThreadEMT;
-            Assert(pVM->aCpu[i].hNativeThread!= NIL_RTNATIVETHREAD);
+            Assert(pVM->aCpu[i].hNativeThread != NIL_RTNATIVETHREAD);
         }
+
 
         /*
@@ -516 +529 @@
             }
 
-            /* Calculate the offset to the VMCPU array. */
-            pVM->offVMCPU = RT_OFFSETOF(VM, aCpu);
-
-            /* Make sure the CPU count in the config data matches. */
-            rc = CFGMR3QueryU32Def(CFGMR3GetRoot(pVM), "NumCPUs", &pVM->cCPUs, 1);
-            AssertMsgRC(rc, ("Configuration error: Querying \"NumCPUs\" as integer failed, rc=%Vrc\n", rc));
-            Assert(pVM->cCPUs == cCPUs);
-
-#ifdef VBOX_WITH_SMP_GUESTS
-            AssertMsg(pVM->cCPUs > 0 && pVM->cCPUs <= VMCPU_MAX_CPU_COUNT,
-                      ("Configuration error: \"NumCPUs\"=%RU32 is out of range [1..255]\n", pVM->cCPUs));
-#else
-            AssertMsg(pVM->cCPUs != 0,
-                      ("Configuration error: \"NumCPUs\"=%RU32, expected 1\n", pVM->cCPUs));
-#endif
-            if (pVM->cCPUs != cCPUs)
+            /*
+             * Make sure the CPU count in the config data matches.
+             */
+            uint32_t cCPUsCfg;
+            rc = CFGMR3QueryU32Def(CFGMR3GetRoot(pVM), "NumCPUs", &cCPUsCfg, 1);
+            AssertLogRelMsgRC(rc, ("Configuration error: Querying \"NumCPUs\" as integer failed, rc=%Rrc\n", rc));
+            if (RT_SUCCESS(rc) && cCPUsCfg != cCPUs)
+            {
+                AssertLogRelMsgFailed(("Configuration error: \"NumCPUs\"=%RU32 and VMR3CreateVM::cCPUs=%RU32 does not match!\n",
+                                       cCPUsCfg, cCPUs));
                 rc = VERR_INVALID_PARAMETER;
-            else
-#ifdef VBOX_WITH_SMP_GUESTS
-            if (pVM->cCPUs == 0 || pVM->cCPUs > VMCPU_MAX_CPU_COUNT)
-                rc = VERR_INVALID_PARAMETER;
-#else
-            if (pVM->cCPUs != 1)
-                rc = VERR_INVALID_PARAMETER;
-#endif
+            }
             if (VBOX_SUCCESS(rc))
             {

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

@@ -587 +587 @@
                             pVM->hSelf      = iHandle;
                             pVM->cbSelf     = cbVM;
+                            pVM->cCPUs      = cCPUs;
 
                             rc = RTR0MemObjAllocPage(&pGVM->gvmm.s.VMPagesMemObj, cPages * sizeof(SUPPAGE), false /* fExecutable */);
@@ -609 +610 @@
                                     AssertPtr((void *)pVM->pVMR3);
 
-                                    /** Initialize all the VM pointers. */
-                                    for (unsigned i=0;i<cCPUs;i++)
+                                    /* Initialize all the VM pointers. */
+                                    for (uint32_t i = 0; i < cCPUs; i++)
                                     {
                                         pVM->aCpu[i].pVMR0 = pVM;