diff mbox series

[3/4] qemu-options: tweak to show that CPU count is optional

Message ID 20210628113047.462498-4-berrange@redhat.com (mailing list archive)
State New, archived
Headers show
Series docs: improve -smp documentation | expand

Commit Message

Daniel P. Berrangé June 28, 2021, 11:30 a.m. UTC
The initial CPU count number is not required, if any of the topology
options are given, since it can be computed.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 qemu-options.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Yanan Wang June 28, 2021, 12:29 p.m. UTC | #1
On 2021/6/28 19:30, Daniel P. Berrangé wrote:
> The initial CPU count number is not required, if any of the topology
> options are given, since it can be computed.
>
> 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 aa33dfdcfd..5871df7291 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
This looks correct to me:

Reviewed-by: Yanan Wang <wangyanan55@huawei.com>

Thanks,
Yanan
.
diff mbox series

Patch

diff --git a/qemu-options.hx b/qemu-options.hx
index aa33dfdcfd..5871df7291 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