qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eduardo Otubo" <otubo@redhat.com>,
	"Andrew Jones" <drjones@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	"Jason Wang" <jasowang@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Yanan Wang" <wangyanan55@huawei.com>,
	"Jiri Pirko" <jiri@resnulli.us>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Pankaj Gupta" <pankaj.gupta@ionos.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Eric Blake" <eblake@redhat.com>
Subject: [PULL 25/26] qemu-options: tweak to show that CPU count is optional
Date: Wed, 14 Jul 2021 15:08:57 +0100	[thread overview]
Message-ID: <20210714140858.2247409-26-berrange@redhat.com> (raw)
In-Reply-To: <20210714140858.2247409-1-berrange@redhat.com>

The initial CPU count number is not required, if any of the topology
options are given, since it can be computed.

Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 qemu-options.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 6b72617844..14ff35dd4e 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -196,7 +196,7 @@ SRST
 ERST
 
 DEF("smp", HAS_ARG, QEMU_OPTION_smp,
-    "-smp [cpus=]n[,maxcpus=cpus][,sockets=sockets][,dies=dies][,cores=cores][,threads=threads]\n"
+    "-smp [[cpus=]n][,maxcpus=cpus][,sockets=sockets][,dies=dies][,cores=cores][,threads=threads]\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"
@@ -206,7 +206,7 @@ DEF("smp", HAS_ARG, QEMU_OPTION_smp,
     "                threads= number of threads on one CPU core\n",
         QEMU_ARCH_ALL)
 SRST
-``-smp [cpus=]n[,maxcpus=maxcpus][,sockets=sockets][,dies=dies][,cores=cores][,threads=threads]``
+``-smp [[cpus=]n][,maxcpus=maxcpus][,sockets=sockets][,dies=dies][,cores=cores][,threads=threads]``
     Simulate an SMP system with 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 cores per die, the
-- 
2.31.1



  parent reply	other threads:[~2021-07-14 14:28 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-14 14:08 [PULL v2 00/26] Crypto and more patches Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 01/26] crypto: remove conditional around 3DES crypto test cases Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 02/26] crypto: remove obsolete crypto test condition Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 03/26] crypto: skip essiv ivgen tests if AES+ECB isn't available Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 04/26] crypto: use &error_fatal in crypto tests Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 05/26] crypto: fix gcrypt min version 1.8 regression Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 06/26] crypto: drop gcrypt thread initialization code Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 07/26] crypto: drop custom XTS support in gcrypt driver Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 08/26] crypto: add crypto tests for single block DES-ECB and DES-CBC Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 09/26] crypto: delete built-in DES implementation Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 10/26] crypto: delete built-in XTS cipher mode support Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 11/26] crypto: replace 'des-rfb' cipher with 'des' Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 12/26] crypto: flip priority of backends to prefer gcrypt Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 13/26] crypto: introduce build system for gnutls crypto backend Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 14/26] crypto: add gnutls cipher provider Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 15/26] crypto: add gnutls hash provider Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 16/26] crypto: add gnutls hmac provider Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 17/26] crypto: add gnutls pbkdf provider Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 18/26] crypto: prefer gnutls as the crypto backend if new enough Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 19/26] net/rocker: use GDateTime for formatting timestamp in debug messages Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 20/26] io: use GDateTime for formatting timestamp for websock headers Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 21/26] seccomp: don't block getters for resource control syscalls Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 22/26] tests/migration: fix unix socket migration Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 23/26] docs: fix typo s/Intel/AMD/ in CPU model notes Daniel P. Berrangé
2021-07-14 14:08 ` [PULL 24/26] qemu-options: re-arrange CPU topology options Daniel P. Berrangé
2021-07-14 14:08 ` Daniel P. Berrangé [this message]
2021-07-14 14:08 ` [PULL 26/26] qemu-options: rewrite help for -smp options Daniel P. Berrangé
2021-07-15 20:38 ` [PULL v2 00/26] Crypto and more patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210714140858.2247409-26-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=armbru@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=drjones@redhat.com \
    --cc=eblake@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=jiri@resnulli.us \
    --cc=kraxel@redhat.com \
    --cc=otubo@redhat.com \
    --cc=pankaj.gupta@ionos.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=richard.henderson@linaro.org \
    --cc=wangyanan55@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).