Skip to contentSkip to conversation

qemu-storage-daemon: Fix help line for --export

PATCH In review Kevin Wolf 2 participants 3 messages Sep 30, 2020

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 qemu-storage-daemon: Fix help line for --export

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

Fixes 5f479a8dc086bfa42c9f94e9ab69962f256e207f
---
 storage-daemon/qemu-storage-daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
storage-daemon/qemu-storage-daemon.c +1 -1
index 7cbdbf0b23..42839c981f 100644
@@ -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"
Signature · 1 line
2.25.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Kevin Wolf

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

Fixes 5f479a8dc086bfa42c9f94e9ab69962f256e207f
---
 storage-daemon/qemu-storage-daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
storage-daemon/qemu-storage-daemon.c +0 -0
index 7cbdbf0b23..42839c981f 100644

storage-daemon/qemu-storage-daemon.c static void help(void) · line 95

Quoted 5 lines
storage-daemon/qemu-storage-daemon.c +1 -1
@@ -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,

Quoted 4 lines
storage-daemon/qemu-storage-daemon.c +0 -0
 "           [,writable=on|off][,bitmap=<name>]\n"
 "                         export the specified block node over NBD\n"
 "                         (requires --nbd-server)\n"
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
author Applied
#2 lore raw

Am 30.09.2020 um 15:48 hat Eric Blake geschrieben:

Quoted 10 lines · Kevin Wolf
Quoted 9 lines

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

Fixes 5f479a8dc086bfa42c9f94e9ab69962f256e207f
---
 storage-daemon/qemu-storage-daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines

storage-daemon/qemu-storage-daemon.c static void help(void) · line 95

Quoted 10 lines
storage-daemon/qemu-storage-daemon.c +1 -1
index 7cbdbf0b23..42839c981f 100644
@@ -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.

Quoted 2 lines

With that,

Thanks, applied.

Kevin