[Qemu-devel] [PATCH] numa: fix missing '-numa cpu' in '-help' output

[Qemu-devel] [PATCH] numa: fix missing '-numa cpu' in '-help' output

[Igor Mammedov]

commit 419fcdec3c (numa: add '-numa cpu,...' option for property based node mapping)
added '-numa cpu' option but forgot to update appropriate section for '--help'.
Add '-numa cpu' description to '-help' output

Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 qemu-options.hx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index df19cf2..972a5c6 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -163,7 +163,9 @@ ETEXI
 DEF("numa", HAS_ARG, QEMU_OPTION_numa,
     "-numa node[,mem=size][,cpus=firstcpu[-lastcpu]][,nodeid=node]\n"
     "-numa node[,memdev=id][,cpus=firstcpu[-lastcpu]][,nodeid=node]\n"
-    "-numa dist,src=source,dst=destination,val=distance\n", QEMU_ARCH_ALL)
+    "-numa dist,src=source,dst=destination,val=distance\n"
+    "-numa cpu,node-id=node[,socket-id=x][,core-id=y][,thread-id=z]\n",
+    QEMU_ARCH_ALL)
 STEXI
 @item -numa node[,mem=@var{size}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}]
 @itemx -numa node[,memdev=@var{id}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}]
-- 
2.7.4

Re: [Qemu-devel] [PATCH] numa: fix missing '-numa cpu' in '-help' output

[Eric Blake]

On 11/28/2017 08:53 AM, Igor Mammedov wrote:
> commit 419fcdec3c (numa: add '-numa cpu,...' option for property based node mapping)
> added '-numa cpu' option but forgot to update appropriate section for '--help'.
> Add '-numa cpu' description to '-help' output
> 
> Reported-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
>   qemu-options.hx | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)

Documentation only; safe for 2.11 if it makes it through someone's tree 
(although we're cutting it close); and harmless if it waits for 2.12 
instead.

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

> 
> diff --git a/qemu-options.hx b/qemu-options.hx
> index df19cf2..972a5c6 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -163,7 +163,9 @@ ETEXI
>   DEF("numa", HAS_ARG, QEMU_OPTION_numa,
>       "-numa node[,mem=size][,cpus=firstcpu[-lastcpu]][,nodeid=node]\n"
>       "-numa node[,memdev=id][,cpus=firstcpu[-lastcpu]][,nodeid=node]\n"
> -    "-numa dist,src=source,dst=destination,val=distance\n", QEMU_ARCH_ALL)
> +    "-numa dist,src=source,dst=destination,val=distance\n"
> +    "-numa cpu,node-id=node[,socket-id=x][,core-id=y][,thread-id=z]\n",
> +    QEMU_ARCH_ALL)
>   STEXI
>   @item -numa node[,mem=@var{size}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}]
>   @itemx -numa node[,memdev=@var{id}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}]
> 

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

Re: [Qemu-devel] [PATCH] numa: fix missing '-numa cpu' in '-help' output

[Eduardo Habkost]

On Tue, Nov 28, 2017 at 10:59:57AM -0600, Eric Blake wrote:
> On 11/28/2017 08:53 AM, Igor Mammedov wrote:
> > commit 419fcdec3c (numa: add '-numa cpu,...' option for property based node mapping)
> > added '-numa cpu' option but forgot to update appropriate section for '--help'.
> > Add '-numa cpu' description to '-help' output
> > 
> > Reported-by: Markus Armbruster <armbru@redhat.com>
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> >   qemu-options.hx | 4 +++-
> >   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Documentation only; safe for 2.11 if it makes it through someone's tree
> (although we're cutting it close); and harmless if it waits for 2.12
> instead.
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks, queueing it for 2.12 on machine-next.

-- 
Eduardo