On Wed, May 11, 2016 at 04:39:42PM -0600, Eric Blake wrote: > The NBD protocol allows servers to advertise a human-readable > description alongside an export name during NBD_OPT_LIST. Add > an option to pass through the user's string to the NBD client. > > Doing this also makes it easier to test commit 200650d4, which > is the client counterpart of receiving the description. > > Signed-off-by: Eric Blake <ebl...@redhat.com> > --- > include/block/nbd.h | 1 + > nbd/nbd-internal.h | 5 +++-- > nbd/server.c | 34 ++++++++++++++++++++++++++-------- > qemu-nbd.c | 12 +++++++++++- > qemu-nbd.texi | 5 ++++- > 5 files changed, 45 insertions(+), 12 deletions(-)
> diff --git a/qemu-nbd.texi b/qemu-nbd.texi > index 9f23343..923de74 100644 > --- a/qemu-nbd.texi > +++ b/qemu-nbd.texi > @@ -79,9 +79,12 @@ Disconnect the device @var{dev} > Allow up to @var{num} clients to share the device (default @samp{1}) > @item -t, --persistent > Don't exit on the last connection > -@item -x NAME, --export-name=NAME > +@item -x, --export-name=@var{name} Why this change - that reads as saying that '-x' doesn't take any value which is wrong IMHO > Set the NBD volume export name. This switches the server to use > the new style NBD protocol negotiation > +@item -D, --description=@var{description} Likewise this suggests -D doesn't take a value > +Set the NBD volume export description, as a human-readable > +string. Requires the use of @option{-x} > @item --tls-creds=ID > Enable mandatory TLS encryption for the server by setting the ID > of the TLS credentials object previously created with the --object Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|