Changeset 13722 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Oct 31, 2008 3:53:18 PM (16 years ago)

Author:

vboxsync

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

38690

Message:

Introduced new xml setting for the number of virtual CPUs.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -188 +188 @@
     /* default values for a newly created machine */
     mMemorySize = 128;
+    mCPUCount = 1;
     mMemoryBalloonSize = 0;
     mStatisticsUpdateInterval = 0;
@@ -226 +227 @@
         mHWVirtExVPIDEnabled != that.mHWVirtExVPIDEnabled ||
         mPAEEnabled != that.mPAEEnabled ||
+        mCPUCount != that.mCPUCount ||
         mClipboardMode != that.mClipboardMode)
         return false;
@@ -932 +934 @@
     mHWData.backup();
     mHWData->mMemorySize = memorySize;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMGETTER(CPUCount) (ULONG *CPUCount)
+{
+    if (!CPUCount)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    *CPUCount = mHWData->mCPUCount;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(CPUCount) (ULONG CPUCount)
+{
+    /* check RAM limits */
+    if (CPUCount < SchemaDefs::MinCPUCount ||
+        CPUCount > SchemaDefs::MaxCPUCount)
+        return setError (E_INVALIDARG,
+            tr ("Invalid virtual CPU count: %lu (must be in range [%lu, %lu])"),
+                CPUCount, SchemaDefs::MinCPUCount, SchemaDefs::MaxCPUCount);
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    HRESULT rc = checkStateDependency (MutableStateDep);
+    CheckComRCReturnRC (rc);
+
+    mHWData.backup();
+    mHWData->mCPUCount = CPUCount;
 
     return S_OK;
@@ -4940 +4980 @@
                 mHWData->mPAEEnabled = PAENode.value <bool> ("enabled");
             }
+
+            /* CPUCount(optional, default is 1) */
+            Key CPUCountNode = cpuNode.findKey ("CPUCount");
+            if (!CPUCountNode.isNull())
+            {
+                mHWData->mCPUCount = CPUCountNode.value <ULONG> ("CPUCount");
+            }
         }
     }
@@ -6310 +6357 @@
             PAENode.setValue <bool> ("enabled", true);
         }
+
+        /* CPU count */
+        Key CPUCountNode = cpuNode.createKey ("CPUCount");
+        CPUCountNode.setValue <ULONG> ("CPUCount", mHWData->mCPUCount);
     }