Re: [PATCH 2/4] qemu-options: re-arrange CPU topology options

[wangyanan (Y)]

On 2021/6/28 19:30, Daniel P. Berrangé wrote:
> 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
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   qemu-options.hx | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index ba3ca9da1d..aa33dfdcfd 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"
nit: There are always "CPUs" elsewhere, it's better to also use "total 
CPUs" here.
>       "                offline CPUs for hotplug, etc\n"
> +    "                sockets= number of discrete sockets in the system\n",
> +    "                dies= number of CPU dies on one socket (for PC only)\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"
> -    "                dies= number of CPU dies on one socket (for PC only)\n"
> -    "                sockets= number of discrete sockets in the system\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
This improves the readability a lot,

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

Thanks,
Yanan
.