The newline was removed by commit c97d6d2c, and broke -help output:

Before this patch:

  $ qemu-system-x86_64 -help | grep smp
                  thread=single|multi (enable multi-threaded TCG)-smp [...]

After this patch:

  $ qemu-system-x86_64 -help  | grep smp
  -smp [cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]

Fixes: c97d6d2cdf97edb4aebe832fdba65d701ad7bcb6
Cc: Sergio Andres Gomez Del Real <sergio.g.delreal@gmail.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu-options.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index c0d3951e9f..6364cf3f94 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -130,7 +130,7 @@ ETEXI
 DEF("accel", HAS_ARG, QEMU_OPTION_accel,
     "-accel [accel=]accelerator[,thread=single|multi]\n"
     "                select accelerator (kvm, xen, hax, hvf, whpx or tcg; use 'help' for a list)\n"
-    "                thread=single|multi (enable multi-threaded TCG)", QEMU_ARCH_ALL)
+    "                thread=single|multi (enable multi-threaded TCG)\n", QEMU_ARCH_ALL)
 STEXI
 @item -accel @var{name}[,prop=@var{value}[,...]]
 @findex -accel
-- 
2.18.0.rc1.1.g3f1ff2140

On 06/11/2018 02:56 PM, Eduardo Habkost wrote:
> The newline was removed by commit c97d6d2c, and broke -help output:

-help output is not supposed to be parsed by machine, in part because of 
stuff like this ;)

> 
> Before this patch:
> 
>    $ qemu-system-x86_64 -help | grep smp
>                    thread=single|multi (enable multi-threaded TCG)-smp [...]
> 
> After this patch:
> 
>    $ qemu-system-x86_64 -help  | grep smp
>    -smp [cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]
> 
> Fixes: c97d6d2cdf97edb4aebe832fdba65d701ad7bcb6
> Cc: Sergio Andres Gomez Del Real <sergio.g.delreal@gmail.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---

But for the humans, this is a definite mistake worth fixing.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

On 11/06/2018 21:56, Eduardo Habkost wrote:
> The newline was removed by commit c97d6d2c, and broke -help output:
> 
> Before this patch:
> 
>   $ qemu-system-x86_64 -help | grep smp
>                   thread=single|multi (enable multi-threaded TCG)-smp [...]
> 
> After this patch:
> 
>   $ qemu-system-x86_64 -help  | grep smp
>   -smp [cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]
> 
> Fixes: c97d6d2cdf97edb4aebe832fdba65d701ad7bcb6
> Cc: Sergio Andres Gomez Del Real <sergio.g.delreal@gmail.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  qemu-options.hx | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qemu-options.hx b/qemu-options.hx
> index c0d3951e9f..6364cf3f94 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -130,7 +130,7 @@ ETEXI
>  DEF("accel", HAS_ARG, QEMU_OPTION_accel,
>      "-accel [accel=]accelerator[,thread=single|multi]\n"
>      "                select accelerator (kvm, xen, hax, hvf, whpx or tcg; use 'help' for a list)\n"
> -    "                thread=single|multi (enable multi-threaded TCG)", QEMU_ARCH_ALL)
> +    "                thread=single|multi (enable multi-threaded TCG)\n", QEMU_ARCH_ALL)
>  STEXI
>  @item -accel @var{name}[,prop=@var{value}[,...]]
>  @findex -accel
> 

Queued, thanks.

Paolo