From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSpDt-0003H4-PI for qemu-devel@nongnu.org; Mon, 08 Feb 2016 12:03:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSpDs-0006iw-Gk for qemu-devel@nongnu.org; Mon, 08 Feb 2016 12:03:37 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:34689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSpDs-0006ip-7g for qemu-devel@nongnu.org; Mon, 08 Feb 2016 12:03:36 -0500 Received: by mail-wm0-x235.google.com with SMTP id 128so163724158wmz.1 for ; Mon, 08 Feb 2016 09:03:36 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 8 Feb 2016 18:03:01 +0100 Message-Id: <1454950999-64128-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1454950999-64128-1-git-send-email-pbonzini@redhat.com> References: <1454950999-64128-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 10/28] qemu-nbd: Minor texi updates List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sitsofe Wheeler From: Sitsofe Wheeler - Change some spacing. - Add disconnect usage to synopsis. - Highlight the command and its options in the synopsis. - Fix up the grammar in the description. - Move filename variable description out of the option table. - Add a description of the dev variable. - Remove duplicate entry for --format. - Reword --discard documentation. - Add --detect-zeroes documentation. - Add reference to qemu man page to see also section. Signed-off-by: Sitsofe Wheeler Message-Id: <1451979212-25479-3-git-send-email-sitsofe@yahoo.com> Signed-off-by: Paolo Bonzini --- qemu-nbd.texi | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 26cc985..5331d69 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -1,19 +1,23 @@ @example @c man begin SYNOPSIS -usage: qemu-nbd [OPTION]... @var{filename} +@command{qemu-nbd} [OPTION]... @var{filename} + +@command{qemu-nbd} @option{-d} @var{dev} @c man end @end example @c man begin DESCRIPTION -Export QEMU disk image using NBD protocol. +Export a QEMU disk image using the NBD protocol. @c man end @c man begin OPTIONS +@var{filename} is a disk image filename. + +@var{dev} is an NBD device. + @table @option -@item @var{filename} -is a disk image filename @item -p, --port=@var{port} port to listen on (default @samp{10809}) @item -o, --offset=@var{offset} @@ -22,8 +26,9 @@ offset into the image interface to bind to (default @samp{0.0.0.0}) @item -k, --socket=@var{path} Use a unix socket with path @var{path} -@item -f, --format=@var{format} -Set image format as @var{format} +@item -f, --format=@var{fmt} +force the use of the block driver for format @var{fmt} instead of +auto-detecting @item -r, --read-only export read-only @item -P, --partition=@var{num} @@ -44,17 +49,22 @@ the emulator's @code{-drive cache=...} option for allowed values. choose asynchronous I/O mode between @samp{threads} (the default) and @samp{native} (Linux only). @item --discard=@var{discard} -toggles whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) -requests are ignored or passed to the filesystem. The default is no -(@samp{--discard=ignore}). +controls whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap}) +requests are ignored or passed to the filesystem. @var{discard} is one of +@samp{ignore} (or @samp{off}), @samp{unmap} (or @samp{on}). The default is +@samp{ignore}. +@item --detect-zeroes=@var{detect-zeroes} +enables the automatic conversion of plain zero writes by the OS to +driver-specific optimized zero write commands. @var{detect-zeroes} is one of +@samp{off}, @samp{on} or @samp{unmap}. @samp{unmap} +converts a zero write to an unmap operation and can only be used if +@var{discard} is set to @samp{unmap}. The default is @samp{off}. @item -c, --connect=@var{dev} connect @var{filename} to NBD device @var{dev} @item -d, --disconnect disconnect the specified device @item -e, --shared=@var{num} device can be shared by @var{num} clients (default @samp{1}) -@item -f, --format=@var{fmt} -force block driver for format @var{fmt} instead of auto-detecting @item -t, --persistent don't exit on the last connection @item -v, --verbose @@ -79,7 +89,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @c man end @c man begin SEEALSO -qemu-img(1) +qemu(1), qemu-img(1) @c man end @end ignore -- 1.8.3.1