| From 94301da385eea27bfd9191cfc3f68b8df2e21987 Mon Sep 17 00:00:00 2001 |
| From: Max Reitz <mreitz@redhat.com> |
| Date: Fri, 24 Oct 2014 08:17:59 +0200 |
| Subject: [PATCH 11/19] qemu-img: clarify src_cache option documentation |
| |
| Message-id: <1414138680-19600-4-git-send-email-mreitz@redhat.com> |
| Patchwork-id: 61864 |
| O-Subject: [RHEL-7.1 qemu-kvm PATCH v2 3/4] qemu-img: clarify src_cache option documentation |
| Bugzilla: 1138691 |
| RH-Acked-by: Laszlo Ersek <lersek@redhat.com> |
| RH-Acked-by: Markus Armbruster <armbru@redhat.com> |
| RH-Acked-by: Kevin Wolf <kwolf@redhat.com> |
| |
| From: Stefan Hajnoczi <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> |
| (cherry picked from commit bb87fdf871d321895b8f5c481977df7a3f74a765) |
| |
| Signed-off-by: Max Reitz <mreitz@redhat.com> |
| Signed-off-by: Miroslav Rezanina <mrezanin@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 1f28729..39d7e05 100644 |
| |
| |
| @@ -84,7 +84,8 @@ static void 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" |
| " and T (terabyte, 1024G) are supported. 'b' is ignored.\n" |
| diff --git a/qemu-img.texi b/qemu-img.texi |
| index 078fe81..4b7a331 100644 |
| |
| |
| @@ -69,8 +69,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.8.3.1 |
| |