儲存庫 vbox 的更動 13722

時間撮記:

2008-10-31 下午03:53:18 (16 年 以前)

作者:

vboxsync

訊息:

Introduced new xml setting for the number of virtual CPUs.

位置:

trunk/src/VBox/Main

檔案:

• ConsoleImpl2.cpp (修改) (1 筆差異)
• MachineImpl.cpp (修改) (5 筆差異)
• idl/VirtualBox.xidl (修改) (2 筆差異)
• include/MachineImpl.h (修改) (2 筆差異)
• xml/SchemaDefs.xsl (修改) (1 筆差異)
• xml/VirtualBox-settings-common.xsd (修改) (2 筆差異)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -146 +146 @@
     hrc = pMachine->COMGETTER(MemorySize)(&cRamMBs);                                H();
 
+    ULONG cCpus = 1;
 #ifdef VBOX_WITH_SMP_GUESTS
-    /* @todo nike: Testing code, should use actual getter when ready */
-    uint16_t cCpus = 2;
-#else
-    uint16_t cCpus = 1;
+    hrc = pMachine->COMGETTER(CPUCount)(&cCpus);                                    H();
 #endif
 

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);
     }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2536 +2536 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="ceb17b5b-fd1f-424f-9dd3-2ab04c06eefc"
+     uuid="b5d1baca-da5b-4202-905f-ee53a5f60ae5"
      wsmap="managed"
      >
@@ -2718 +2718 @@
         </note>
       </desc>
+    </attribute>
+
+    <attribute name="CPUCount" type="unsigned long">
+      <desc>Number of virtual CPUs in the VM.</desc>
     </attribute>
 

trunk/src/VBox/Main/include/MachineImpl.h

@@ -259 +259 @@
         BOOL           mHWVirtExVPIDEnabled;
         BOOL           mPAEEnabled;
+        ULONG          mCPUCount;
 
         DeviceType_T   mBootOrder [SchemaDefs::MaxBootPosition];
@@ -474 +475 @@
     STDMETHOD(COMGETTER(MemorySize))(ULONG *memorySize);
     STDMETHOD(COMSETTER(MemorySize))(ULONG memorySize);
+    STDMETHOD(COMGETTER(CPUCount))(ULONG *cpuCount);
+    STDMETHOD(COMSETTER(CPUCount))(ULONG cpuCount);
     STDMETHOD(COMGETTER(MemoryBalloonSize))(ULONG *memoryBalloonSize);
     STDMETHOD(COMSETTER(MemoryBalloonSize))(ULONG memoryBalloonSize);

trunk/src/VBox/Main/xml/SchemaDefs.xsl

@@ -157 +157 @@
 
   <xsl:call-template name="defineEnumMember">
+    <xsl:with-param name="member" select="'        MinCPUCount'"/>
+    <xsl:with-param name="select" select="
+      xsd:complexType[@name='TCPUCount']/xsd:attribute[@name='CPUCount']//xsd:minInclusive/@value
+    "/>
+  </xsl:call-template>
+  <xsl:call-template name="defineEnumMember">
+    <xsl:with-param name="member" select="'        MaxCPUCount'"/>
+    <xsl:with-param name="select" select="
+      xsd:complexType[@name='TCPUCount']/xsd:attribute[@name='CPUCount']//xsd:maxInclusive/@value
+    "/>
+  </xsl:call-template>
+
+  <xsl:call-template name="defineEnumMember">
     <xsl:with-param name="member" select="'        MaxGuestMonitors'"/>
     <xsl:with-param name="select" select="

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -392 +392 @@
 </xsd:complexType>
 
+<xsd:complexType name="TCPUCount">
+  <xsd:attribute name="CPUCount">
+    <xsd:simpleType>
+      <xsd:restriction base="xsd:unsignedInt">
+        <xsd:minInclusive value="1"/>
+        <xsd:maxInclusive value="63"/>
+      </xsd:restriction>
+    </xsd:simpleType>
+  </xsd:attribute>
+</xsd:complexType>
+
 <xsd:complexType name="TCPU">
   <xsd:sequence>
@@ -398 +409 @@
     <xsd:element name="HardwareVirtExVPID" type="THWVirtExVPIDType" minOccurs="0"/>
     <xsd:element name="PAE" type="TPAEType" minOccurs="0"/>
+    <xsd:element name="CPUCount" type="TCPUCount" minOccurs="0"/>
   </xsd:sequence>
 </xsd:complexType>