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

Timestamp:

May 5, 2009 10:23:42 PM (16 years ago)

Author:

vboxsync

Message:

VBox/parma.h,VMM: VMCPU_MAX_CPU_COUNT & VMM_MAX_CPUS => VMM_MAX_CPU_COUNT, added VMM_MIN_CPU_COUNT for schema future replacement dropping a hint about these constants Main.

Location:

trunk/src/VBox/VMM

Files:

: 4 edited

CPUM.cpp (modified) (1 diff)
VM.cpp (modified) (1 diff)
VMMR0/GVMMR0.cpp (modified) (2 diffs)
VMMR0/PGMR0DynMap.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/VBox/VMM/CPUM.cpp

r19334	r19403
1023	1023
1024	1024	if ( !pVM->cCPUs
1025		\|\| pVM->cCPUs > VM~~CPU~~_MAX_CPU_COUNT
	1025	\|\| pVM->cCPUs > VMM_MAX_CPU_COUNT
1026	1026	\|\| ( u32Version == CPUM_SAVED_STATE_VERSION_VER2_0
1027	1027	&& pVM->cCPUs != 1))

trunk/src/VBox/VMM/VM.cpp

r19400	r19403
215	215	* Validate input.
216	216	*/
217		AssertLogRelMsgReturn(cCPUs > 0 && cCPUs <= VM~~CPU~~_MAX_CPU_COUNT, ("%RU32\n", cCPUs), VERR_INVALID_PARAMETER);
	217	AssertLogRelMsgReturn(cCPUs > 0 && cCPUs <= VMM_MAX_CPU_COUNT, ("%RU32\n", cCPUs), VERR_INVALID_PARAMETER);
218	218
219	219	/*

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

-              r19398
+              r19403
     if (    cCpus == 0
         ||  cCpus > VMCPU_MAX_CPU_COUNT)
+        ||  cCpus > VMM_MAX_CPU_COUNT)
         return VERR_INVALID_PARAMETER;
 …
             VMCPUID const cCpus = pGVM->cCpus;
             if (    cCpus < 1
                 ||  cCpus > VMM_MAX_CPUS)
+                ||  cCpus > VMM_MAX_CPU_COUNT)
                 continue;
             for (VMCPUID idCpu = 1; idCpu < cCpus; idCpu++)

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

r18984	r19403
356	356	*/
357	357	VMCPUID idCpu = pVM->cCPUs;
358		AssertReturn(idCpu > 0 && idCpu <= VM~~CPU~~_MAX_CPU_COUNT, VERR_INTERNAL_ERROR);
	358	AssertReturn(idCpu > 0 && idCpu <= VMM_MAX_CPU_COUNT, VERR_INTERNAL_ERROR);
359	359	while (idCpu-- > 0)
360	360	{

Note: See TracChangeset for help on using the changeset viewer.