From patchwork Fri Aug 28 08:49:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 32350 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 39385B7C29 for ; Fri, 28 Aug 2009 18:55:48 +1000 (EST) Received: from localhost ([127.0.0.1]:42734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgxFG-0002nY-UJ for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2009 04:55:43 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgxDv-0002EH-W5 for qemu-devel@nongnu.org; Fri, 28 Aug 2009 04:54:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgxDr-0002Bl-Pw for qemu-devel@nongnu.org; Fri, 28 Aug 2009 04:54:19 -0400 Received: from [199.232.76.173] (port=47381 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgxDr-0002BS-Ki for qemu-devel@nongnu.org; Fri, 28 Aug 2009 04:54:15 -0400 Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11]:41425 helo=VA3EHSOBE001.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1MgxDr-0002fL-9r for qemu-devel@nongnu.org; Fri, 28 Aug 2009 04:54:15 -0400 Received: from mail66-va3-R.bigfish.com (10.7.14.252) by VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id 8.1.340.0; Fri, 28 Aug 2009 08:54:14 +0000 Received: from mail66-va3 (localhost.localdomain [127.0.0.1]) by mail66-va3-R.bigfish.com (Postfix) with ESMTP id 080FE3085C7; Fri, 28 Aug 2009 08:54:14 +0000 (UTC) X-SpamScore: 1 X-BigFish: VPS1(zzzz1202hzzz32i203h61h) X-Spam-TCS-SCL: 0:0 X-FB-SS: 5, Received: by mail66-va3 (MessageSwitch) id 1251449652632759_1112; Fri, 28 Aug 2009 08:54:12 +0000 (UCT) Received: from ausb3extmailp02.amd.com (ausb3extmailp02.amd.com [163.181.251.22]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail66-va3.bigfish.com (Postfix) with ESMTP id 8162F6B8055; Fri, 28 Aug 2009 08:54:12 +0000 (UTC) Received: from ausb3twp01.amd.com (ausb3twp01.amd.com [163.181.250.37]) by ausb3extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n7S8s8OJ024190; Fri, 28 Aug 2009 03:54:11 -0500 X-WSS-ID: 0KP2WQ5-01-LJL-02 X-M-MSG: Received: from sausexbh2.amd.com (SAUSEXBH2.amd.com [163.181.22.102]) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.0) with ESMTP id 218BB10284B2; Fri, 28 Aug 2009 03:54:05 -0500 (CDT) Received: from sausexmb4.amd.com ([163.181.3.15]) by sausexbh2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 28 Aug 2009 03:54:07 -0500 Received: from SDRSEXMB1.amd.com ([172.20.3.116]) by sausexmb4.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 28 Aug 2009 03:54:07 -0500 Received: from localhost.localdomain ([165.204.15.42]) by SDRSEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 28 Aug 2009 10:53:33 +0200 From: Andre Przywara To: anthony@codemonkey.ws Date: Fri, 28 Aug 2009 10:49:57 +0200 Message-ID: <1251449397-1751-1-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.1.3 X-OriginalArrivalTime: 28 Aug 2009 08:53:33.0660 (UTC) FILETIME=[060259C0:01CA27BD] MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ Cc: Andre Przywara , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] add documentation for multi-core features X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org extend QEMU's internal help and man page to cover the recently added multi-core feature. Signed-off-by: Andre Przywara --- qemu-options.hx | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) Sorry, missed that part, that should have been in the original patch series. Regards, Andre. diff --git a/qemu-options.hx b/qemu-options.hx index 0c2b310..ce38a3b 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -39,15 +39,23 @@ Select CPU model (-cpu ? for list and additional feature selection) ETEXI DEF("smp", HAS_ARG, QEMU_OPTION_smp, - "-smp n[,maxcpus=cpus]\n" + "-smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]\n" " set the number of CPUs to 'n' [default=1]\n" " maxcpus= maximum number of total cpus, including\n" - " offline CPUs for hotplug etc.\n") + " offline CPUs for hotplug etc.\n" + " cores= number of CPU cores on one socket\n" + " threads= number of threads on one CPU core\n" + " sockets= number of discrete sockets in the system\n") STEXI -@item -smp @var{n} +@item -smp @var{n}[,cores=@var{cores}][,threads=@var{threads}][,sockets=@var{sockets}][,maxcpus=@var{maxcpus}] Simulate an SMP system with @var{n} CPUs. On the PC target, up to 255 CPUs are supported. On Sparc32 target, Linux limits the number of usable CPUs to 4. +For the PC target, the number of @var{cores} per socket, the number +of @var{threads} per cores and the total number of @var{sockets} can be +specified. Missing values will be computed. If any on the three values is +given, the total number of CPUs @var{n} can be omitted. @var{maxcpus} +specifies the maximum number of hotpluggable CPUs. ETEXI DEF("numa", HAS_ARG, QEMU_OPTION_numa,