儲存庫 vbox 的更動 48765

時間撮記:

2013-9-30 上午08:51:08 (11 年 以前)

作者:

vboxsync

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

89402

訊息:

Main/Qt/VBoxManage: introduced IHost::ProcessorOnlineCoreCount and use it to determine the maximum allowed number of CPU virtual cores the user may assign to a guest

位置:

trunk

檔案:

• doc/manual/user_ChangeLogImpl.xml (修改) (1 筆差異)
• include/iprt/mp.h (修改) (1 筆差異)
• src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (修改) (1 筆差異)
• src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp (修改) (1 筆差異)
• src/VBox/Main/idl/VirtualBox.xidl (修改) (1 筆差異)
• src/VBox/Main/include/HostImpl.h (修改) (1 筆差異)
• src/VBox/Main/src-server/HostImpl.cpp (修改) (1 筆差異)

trunk/doc/manual/user_ChangeLogImpl.xml

@@ -93 +93 @@
         <para>GUI, VBoxManage: when unregistering a VM, also unregister the
           hard disk images which are used exclusively (bug #10311)</para>
+      </listitem>
+
+      <listitem>
+        <para>GUI: use the number of physical presented processor cores instead of
+          the number of logical processor cores to check if the users assigned
+          too many virtual CPUs to the guest</para>
       </listitem>
 

trunk/include/iprt/mp.h

@@ -146 +146 @@
  * @returns The number of online cores.
  */
-RTDECL(RTCPUID) RTMpGetCoreOnlineCount(void);
+RTDECL(RTCPUID) RTMpGetOnlineCoreCount(void);
 
 /**

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -196 +196 @@
     CHECK_ERROR(Host, COMGETTER(ProcessorCount)(&processorCount));
     RTPrintf("Processor count: %lu\n", processorCount);
+    ULONG processorOnlineCoreCount = 0;
+    CHECK_ERROR(Host, COMGETTER(ProcessorOnlineCoreCount)(&processorOnlineCoreCount));
+    RTPrintf("Processor online core count: %lu\n", processorOnlineCoreCount);
+    ULONG processorCoreCount = 0;
+    CHECK_ERROR(Host, COMGETTER(ProcessorCoreCount)(&processorCoreCount));
+    RTPrintf("Processor core count: %lu\n", processorCoreCount);
     ULONG processorSpeed = 0;
     Bstr processorDescription;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -346 +346 @@
 
         /* VCPU amount test: */
-        int cTotalCPUs = vboxGlobal().host().GetProcessorOnlineCount();
+        int cTotalCPUs = vboxGlobal().host().GetProcessorOnlineCoreCount();
         if (m_pSliderCPUCount->value() > 2 * cTotalCPUs)
         {

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

@@ -8419 +8419 @@
     </attribute>
 
+    <attribute name="processorOnlineCoreCount" type="unsigned long" readonly="yes">
+      <desc>Number of physical processor cores online in the host system.</desc>
+    </attribute>
+
     <method name="getProcessorSpeed">
       <desc>Query the (approximate) maximum speed of a specified host CPU in

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

@@ -68 +68 @@
     STDMETHOD(COMGETTER(ProcessorOnlineCount))(ULONG *count);
     STDMETHOD(COMGETTER(ProcessorCoreCount))(ULONG *count);
+    STDMETHOD(COMGETTER(ProcessorOnlineCoreCount))(ULONG *count);
     STDMETHOD(GetProcessorSpeed)(ULONG cpuId, ULONG *speed);
     STDMETHOD(GetProcessorDescription)(ULONG cpuId, BSTR *description);

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -956 +956 @@
     // no locking required
 
-    return E_NOTIMPL;
+    *aCount = RTMpGetPresentCoreCount();
+    return S_OK;
+}
+
+/**
+ * Returns the number of installed physical processor cores.
+ *
+ * @returns COM status code
+ * @param   count address of result variable
+ */
+STDMETHODIMP Host::COMGETTER(ProcessorOnlineCoreCount)(ULONG *aCount)
+{
+    CheckComArgOutPointerValid(aCount);
+    // no locking required
+
+    *aCount = RTMpGetOnlineCoreCount();
+    return S_OK;
 }