From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 13/26] qemu-img: clarify src_cache option documentation
Date: Fri, 5 Sep 2014 17:13:41 +0100 [thread overview]
Message-ID: <1409933634-11331-14-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1409933634-11331-1-git-send-email-stefanha@redhat.com>
The source cache option takes the same values as the cache option. The
documentation reads a little strange because it starts with "In contrast
the src_cache option ...". The fact that this is comparing with the
previous documented option (the 'cache' option) is implicit. Readers
may be confused, especially if they jump to src_cache without reading
cache documentation first.
Suggested-by: Jeff Nelson <jenelson@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
qemu-img.c | 3 ++-
qemu-img.texi | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index ff29ed1..91d1ac3 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -95,7 +95,8 @@ static void QEMU_NORETURN help(void)
" 'cache' is the cache mode used to write the output disk image, the valid\n"
" options are: 'none', 'writeback' (default, except for convert), 'writethrough',\n"
" 'directsync' and 'unsafe' (default for convert)\n"
- " 'src_cache' in contrast is the cache mode used to read input disk images\n"
+ " 'src_cache' is the cache mode used to read input disk images, the valid\n"
+ " options are the same as for the 'cache' option\n"
" 'size' is the disk image size in bytes. Optional suffixes\n"
" 'k' or 'K' (kilobyte, 1024), 'M' (megabyte, 1024k), 'G' (gigabyte, 1024M),\n"
" 'T' (terabyte, 1024G), 'P' (petabyte, 1024T) and 'E' (exabyte, 1024P) are\n"
diff --git a/qemu-img.texi b/qemu-img.texi
index cb68948..4380d56 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -73,8 +73,9 @@ specifies the cache mode that should be used with the (destination) file. See
the documentation of the emulator's @code{-drive cache=...} option for allowed
values.
@item -T @var{src_cache}
-in contrast specifies the cache mode that should be used with the source
-file(s).
+specifies the cache mode that should be used with the source file(s). See
+the documentation of the emulator's @code{-drive cache=...} option for allowed
+values.
@end table
Parameters to snapshot subcommand:
--
1.9.3
next prev parent reply other threads:[~2014-09-05 16:14 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-05 16:13 [Qemu-devel] [PULL 00/26] Block patches Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 01/26] block: kill tail whitespace in block.c Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 02/26] pflash_cfi01: fixup stale DPRINTF() calls Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 03/26] pflash_cfi01: write flash contents to bdrv on incoming migration Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 04/26] virtio: Import virtio_vring.h Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 05/26] block: Always compile virtio-blk dataplane Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 06/26] tests: Functions bus_foreach and device_find from libqos virtio API Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 07/26] tests: Add virtio device initialization Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 08/26] libqos: Added basic virtqueue support to virtio implementation Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 09/26] libqos: Added indirect descriptor " Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 10/26] libqos: Added test case for configuration changes in virtio-blk test Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 11/26] libqos: Added MSI-X support Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 12/26] libqos: Added EVENT_IDX support Stefan Hajnoczi
2014-09-05 16:13 ` Stefan Hajnoczi [this message]
2014-09-05 16:13 ` [Qemu-devel] [PULL 14/26] qemu-img: fix rebase src_cache option documentation Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 15/26] block/archipelago: Use QEMU atomic builtins Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 16/26] rename parse_enum_option to qapi_enum_parse and make it public Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 17/26] qemu-nbd: add option to set detect-zeroes mode Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 18/26] qemu-nbd: fix indentation and coding style Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 19/26] MAINTAINERS: update sheepdog maintainer Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 20/26] libqos: add a simple first-fit memory allocator Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 21/26] qtest/ide: Uninitialize PC allocator Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 22/26] ide: Add wwn support to IDE-ATAPI drive Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 23/26] vmdk: fix vmdk_parse_extents() extent_file leaks Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 24/26] vmdk: fix buf leak in vmdk_parse_extents() Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 25/26] IDE: Fill the IDENTIFY request consistently Stefan Hajnoczi
2014-09-05 16:13 ` [Qemu-devel] [PULL 26/26] ide: Add resize callback to ide/core Stefan Hajnoczi
2014-09-05 16:32 ` [Qemu-devel] [PULL 00/26] Block patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409933634-11331-14-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).