[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/26] qemu-options: re-arrange CPU topology options
From: |
Daniel P . Berrangé |
Subject: |
[PULL 24/26] qemu-options: re-arrange CPU topology options |
Date: |
Wed, 14 Jul 2021 15:08:56 +0100 |
The list of CPU topology options are presented in a fairly arbitrary
order currently. Re-arrange them so that they're ordered from largest to
smallest unit
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 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 8965dabc83..6b72617844 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -196,17 +196,17 @@ SRST
ERST
DEF("smp", HAS_ARG, QEMU_OPTION_smp,
- "-smp
[cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,dies=dies][,sockets=sockets]\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"
+ " maxcpus= maximum number of total CPUs, including\n"
" offline CPUs for hotplug, etc\n"
- " cores= number of CPU cores on one socket (for PC, it's on
one die)\n"
- " threads= number of threads on one CPU core\n"
+ " sockets= number of discrete sockets in the system\n"
" dies= number of CPU dies on one socket (for PC only)\n"
- " sockets= number of discrete sockets in the system\n",
+ " cores= number of CPU cores on one socket (for PC, it's on
one die)\n"
+ " threads= number of threads on one CPU core\n",
QEMU_ARCH_ALL)
SRST
-``-smp
[cpus=]n[,cores=cores][,threads=threads][,dies=dies][,sockets=sockets][,maxcpus=maxcpus]``
+``-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
- [PULL 14/26] crypto: add gnutls cipher provider, (continued)
- [PULL 14/26] crypto: add gnutls cipher provider, Daniel P . Berrangé, 2021/07/14
- [PULL 15/26] crypto: add gnutls hash provider, Daniel P . Berrangé, 2021/07/14
- [PULL 16/26] crypto: add gnutls hmac provider, Daniel P . Berrangé, 2021/07/14
- [PULL 17/26] crypto: add gnutls pbkdf provider, Daniel P . Berrangé, 2021/07/14
- [PULL 18/26] crypto: prefer gnutls as the crypto backend if new enough, Daniel P . Berrangé, 2021/07/14
- [PULL 19/26] net/rocker: use GDateTime for formatting timestamp in debug messages, Daniel P . Berrangé, 2021/07/14
- [PULL 20/26] io: use GDateTime for formatting timestamp for websock headers, Daniel P . Berrangé, 2021/07/14
- [PULL 21/26] seccomp: don't block getters for resource control syscalls, Daniel P . Berrangé, 2021/07/14
- [PULL 22/26] tests/migration: fix unix socket migration, Daniel P . Berrangé, 2021/07/14
- [PULL 23/26] docs: fix typo s/Intel/AMD/ in CPU model notes, Daniel P . Berrangé, 2021/07/14
- [PULL 24/26] qemu-options: re-arrange CPU topology options,
Daniel P . Berrangé <=
- [PULL 25/26] qemu-options: tweak to show that CPU count is optional, Daniel P . Berrangé, 2021/07/14
- [PULL 26/26] qemu-options: rewrite help for -smp options, Daniel P . Berrangé, 2021/07/14
- Re: [PULL v2 00/26] Crypto and more patches, Peter Maydell, 2021/07/15