mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-options: rewrite help for -smp options

Browse Source 
The -smp option help is peculiarly specific about mentioning the CPU
upper limits, but these are wrong. The "PC" target has varying max
CPU counts depending on the machine type picked. Notes about guest
OS limits are inappropriate for QEMU docs. There are way too many
machine types for it to be practical to mention actual limits, and
some limits are even modified by downstream distribtions. Thus it
is better to remove the specific limits entirely.

The CPU topology reporting is also not neccessarily specific to the
PC platform and descriptions around the rules of usage are somewhat
terse. Expand this information with some examples to show effects
of defaulting.

Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-06-22 16:17:09 +01:00
parent b9361bdc1f
commit 80d7835749
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qemu-options.hx
View File

@ -207,14 +207,27 @@ DEF("smp", HAS_ARG, QEMU_OPTION_smp,
QEMU_ARCH_ALL) QEMU_ARCH_ALL)
SRST 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 Simulate a SMP system with '\ ``n``\ ' CPUs initially present on
are supported. On Sparc32 target, Linux limits the number of usable the machine type board. On boards supporting CPU hotplug, the optional
CPUs to 4. For the PC target, the number of cores per die, the '\ ``maxcpus``\ ' parameter can be set to enable further CPUs to be
number of threads per cores, the number of dies per packages and the added at runtime. If omitted the maximum number of CPUs will be
total number of sockets can be specified. Missing values will be set to match the initial CPU count. Both parameters are subject to
computed. If any on the three values is given, the total number of an upper limit that is determined by the specific machine type chosen.
CPUs n can be omitted. maxcpus specifies the maximum number of
hotpluggable CPUs. To control reporting of CPU topology information, the number of sockets,
dies per socket, cores per die, and threads per core can be specified.
The sum `` sockets * cores * dies * threads `` must be equal to the
maximum CPU count. CPU targets may only support a subset of the topology
parameters. Where a CPU target does not support use of a particular
topology parameter, its value should be assumed to be 1 for the purpose
of computing the CPU maximum count.
Either the initial CPU count, or at least one of the topology parameters
must be specified. Values for any omitted parameters will be computed
from those which are given. Historically preference was given to the
coarsest topology parameters when computing missing values (ie sockets
preferred over cores, which were preferred over threads), however, this
behaviour is considered liable to change.
ERST ERST
DEF("numa", HAS_ARG, QEMU_OPTION_numa, DEF("numa", HAS_ARG, QEMU_OPTION_numa,