Commit 5f479a8d renamed the 'device' option of --export into
'node-name', but forgot to update the help in qemu-storage-daemon.

Fixes: 5f479a8dc086bfa42c9f94e9ab69962f256e207f
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 storage-daemon/qemu-storage-daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
index 7cbdbf0b23..42839c981f 100644
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -92,7 +92,7 @@ static void help(void)
 "  --chardev <options>    configure a character device backend\n"
 "                         (see the qemu(1) man page for possible options)\n"
 "\n"
-"  --export [type=]nbd,device=<node-name>,id=<id>,[,name=<export-name>]\n"
+"  --export [type=]nbd,id=<id>,node-name=<node-name>,[,name=<export-name>]\n"
 "           [,writable=on|off][,bitmap=<name>]\n"
 "                         export the specified block node over NBD\n"
 "                         (requires --nbd-server)\n"
-- 
2.25.4

On 9/30/20 8:39 AM, Kevin Wolf wrote:
> Commit 5f479a8d renamed the 'device' option of --export into
> 'node-name', but forgot to update the help in qemu-storage-daemon.
> 
> Fixes: 5f479a8dc086bfa42c9f94e9ab69962f256e207f
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  storage-daemon/qemu-storage-daemon.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
> index 7cbdbf0b23..42839c981f 100644
> --- a/storage-daemon/qemu-storage-daemon.c
> +++ b/storage-daemon/qemu-storage-daemon.c
> @@ -92,7 +92,7 @@ static void help(void)
>  "  --chardev <options>    configure a character device backend\n"
>  "                         (see the qemu(1) man page for possible options)\n"
>  "\n"
> -"  --export [type=]nbd,device=<node-name>,id=<id>,[,name=<export-name>]\n"
> +"  --export [type=]nbd,id=<id>,node-name=<node-name>,[,name=<export-name>]\n"

While touching this, get rid of the doubled comma before the optional
name key (s/,\[,/\[,/)

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

>  "           [,writable=on|off][,bitmap=<name>]\n"
>  "                         export the specified block node over NBD\n"
>  "                         (requires --nbd-server)\n"
> 

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

Am 30.09.2020 um 15:48 hat Eric Blake geschrieben:
> On 9/30/20 8:39 AM, Kevin Wolf wrote:
> > Commit 5f479a8d renamed the 'device' option of --export into
> > 'node-name', but forgot to update the help in qemu-storage-daemon.
> > 
> > Fixes: 5f479a8dc086bfa42c9f94e9ab69962f256e207f
> > Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> > ---
> >  storage-daemon/qemu-storage-daemon.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
> > index 7cbdbf0b23..42839c981f 100644
> > --- a/storage-daemon/qemu-storage-daemon.c
> > +++ b/storage-daemon/qemu-storage-daemon.c
> > @@ -92,7 +92,7 @@ static void help(void)
> >  "  --chardev <options>    configure a character device backend\n"
> >  "                         (see the qemu(1) man page for possible options)\n"
> >  "\n"
> > -"  --export [type=]nbd,device=<node-name>,id=<id>,[,name=<export-name>]\n"
> > +"  --export [type=]nbd,id=<id>,node-name=<node-name>,[,name=<export-name>]\n"
> 
> While touching this, get rid of the doubled comma before the optional
> name key (s/,\[,/\[,/)

Somehow I didn't even notice even though I reordered the options before
it. I'm removing the extra comma now.

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

Thanks, applied.

Kevin