| Message ID | 20211223101426.3143647-2-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | block: Minor vhost-user-blk fixes | expand |
On Thu, Dec 23, 2021 at 11:14:25AM +0100, Philippe Mathieu-Daudé wrote: > Add missing vhost-user-blk help: > > $ qemu-storage-daemon -h > ... > --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>, > addr.type=unix,addr.path=<socket-path>[,writable=on|off] > [,logical-block-size=<block-size>][,num-queues=<num-queues>] > export the specified block node as a > vhosts-user-blk device over UNIX domain socket Why 'vhosts-' here instead of 'vhost'? > --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>, > fd,addr.str=<fd>[,writable=on|off] > [,logical-block-size=<block-size>][,num-queues=<num-queues>] > export the specified block node as a > vhosts-user-blk device over file descriptor here too. > ... > > Fixes: 90fc91d50b7 ("convert vhost-user-blk server to block export API") > Reported-by: Qing Wang <qinwang@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > storage-daemon/qemu-storage-daemon.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c > index 52cf17e8ace..0c19e128e3f 100644 > --- a/storage-daemon/qemu-storage-daemon.c > +++ b/storage-daemon/qemu-storage-daemon.c > @@ -104,6 +104,19 @@ static void help(void) > " export the specified block node over FUSE\n" > "\n" > #endif /* CONFIG_FUSE */ > +#ifdef CONFIG_VHOST_USER_BLK_SERVER > +" --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>,\n" > +" addr.type=unix,addr.path=<socket-path>[,writable=on|off]\n" > +" [,logical-block-size=<block-size>][,num-queues=<num-queues>]\n" > +" export the specified block node as a\n" > +" vhosts-user-blk device over UNIX domain socket\n" This... > +" --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>,\n" > +" fd,addr.str=<fd>[,writable=on|off]\n" > +" [,logical-block-size=<block-size>][,num-queues=<num-queues>]\n" > +" export the specified block node as a\n" > +" vhosts-user-blk device over file descriptor\n" ...and this line would need the same tweak. If you agree that it's a typo, then let's fix it, and you can have Reviewed-by: Eric Blake <eblake@redhat.com>
On 1/6/22 23:15, Eric Blake wrote: > On Thu, Dec 23, 2021 at 11:14:25AM +0100, Philippe Mathieu-Daudé wrote: >> Add missing vhost-user-blk help: >> >> $ qemu-storage-daemon -h >> ... >> --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>, >> addr.type=unix,addr.path=<socket-path>[,writable=on|off] >> [,logical-block-size=<block-size>][,num-queues=<num-queues>] >> export the specified block node as a >> vhosts-user-blk device over UNIX domain socket > > Why 'vhosts-' here instead of 'vhost'? Oops, I copy/pasted from qemu-storage-daemon.rst. >> --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>, >> fd,addr.str=<fd>[,writable=on|off] >> [,logical-block-size=<block-size>][,num-queues=<num-queues>] >> export the specified block node as a >> vhosts-user-blk device over file descriptor > > here too. > >> ... >> >> Fixes: 90fc91d50b7 ("convert vhost-user-blk server to block export API") >> Reported-by: Qing Wang <qinwang@redhat.com> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> storage-daemon/qemu-storage-daemon.c | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) >> >> diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c >> index 52cf17e8ace..0c19e128e3f 100644 >> --- a/storage-daemon/qemu-storage-daemon.c >> +++ b/storage-daemon/qemu-storage-daemon.c >> @@ -104,6 +104,19 @@ static void help(void) >> " export the specified block node over FUSE\n" >> "\n" >> #endif /* CONFIG_FUSE */ >> +#ifdef CONFIG_VHOST_USER_BLK_SERVER >> +" --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>,\n" >> +" addr.type=unix,addr.path=<socket-path>[,writable=on|off]\n" >> +" [,logical-block-size=<block-size>][,num-queues=<num-queues>]\n" >> +" export the specified block node as a\n" >> +" vhosts-user-blk device over UNIX domain socket\n" > > This... > >> +" --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>,\n" >> +" fd,addr.str=<fd>[,writable=on|off]\n" >> +" [,logical-block-size=<block-size>][,num-queues=<num-queues>]\n" >> +" export the specified block node as a\n" >> +" vhosts-user-blk device over file descriptor\n" > > ...and this line would need the same tweak. > > If you agree that it's a typo, then let's fix it, and you can have > > Reviewed-by: Eric Blake <eblake@redhat.com> Yes (I will also update qemu-storage-daemon.rst). Thank you! Phil.
diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c index 52cf17e8ace..0c19e128e3f 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -104,6 +104,19 @@ static void help(void) " export the specified block node over FUSE\n" "\n" #endif /* CONFIG_FUSE */ +#ifdef CONFIG_VHOST_USER_BLK_SERVER +" --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>,\n" +" addr.type=unix,addr.path=<socket-path>[,writable=on|off]\n" +" [,logical-block-size=<block-size>][,num-queues=<num-queues>]\n" +" export the specified block node as a\n" +" vhosts-user-blk device over UNIX domain socket\n" +" --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>,\n" +" fd,addr.str=<fd>[,writable=on|off]\n" +" [,logical-block-size=<block-size>][,num-queues=<num-queues>]\n" +" export the specified block node as a\n" +" vhosts-user-blk device over file descriptor\n" +"\n" +#endif /* CONFIG_VHOST_USER_BLK_SERVER */ " --monitor [chardev=]name[,mode=control][,pretty[=on|off]]\n" " configure a QMP monitor\n" "\n"
Add missing vhost-user-blk help: $ qemu-storage-daemon -h ... --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>, addr.type=unix,addr.path=<socket-path>[,writable=on|off] [,logical-block-size=<block-size>][,num-queues=<num-queues>] export the specified block node as a vhosts-user-blk device over UNIX domain socket --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>, fd,addr.str=<fd>[,writable=on|off] [,logical-block-size=<block-size>][,num-queues=<num-queues>] export the specified block node as a vhosts-user-blk device over file descriptor ... Fixes: 90fc91d50b7 ("convert vhost-user-blk server to block export API") Reported-by: Qing Wang <qinwang@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- storage-daemon/qemu-storage-daemon.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)