From 8afe984ef7aa25cb2f8af51da021fdc8a242884d Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Wed, 7 Dec 2011 13:57:13 +0100

Subject: [PATCH 24/25] Documentation: Add qemu-img -t parameter in man page

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

---

 qemu-img-cmds.hx |    6 +++---

 qemu-img.texi    |   10 +++++++---

 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx

index 4be00a5..49dce7c 100644

--- a/qemu-img-cmds.hx

+++ b/qemu-img-cmds.hx

@@ -24,13 +24,13 @@ ETEXI

 DEF("commit", img_commit,

     "commit [-f fmt] [-t cache] filename")

 STEXI

-@item commit [-f @var{fmt}] @var{filename}

+@item commit [-f @var{fmt}] [-t @var{cache}] @var{filename}

 ETEXI

 DEF("convert", img_convert,

     "convert [-c] [-p] [-f fmt] [-t cache] [-O output_fmt] [-o options] [-s snapshot_name] [-S sparse_size] filename [filename2 [...]] output_filename")

 STEXI

-@item convert [-c] [-p] [-f @var{fmt}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_name}] [-S @var{sparse_size}] @var{filename} [@var{filename2} [...]] @var{output_filename}

+@item convert [-c] [-p] [-f @var{fmt}] [-t @var{cache}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_name}] [-S @var{sparse_size}] @var{filename} [@var{filename2} [...]] @var{output_filename}

 ETEXI

 DEF("info", img_info,

@@ -48,7 +48,7 @@ ETEXI

 DEF("rebase", img_rebase,

     "rebase [-f fmt] [-t cache] [-p] [-u] -b backing_file [-F backing_fmt] filename")

 STEXI

-@item rebase [-f @var{fmt}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}

+@item rebase [-f @var{fmt}] [-t @var{cache}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}

 ETEXI

 DEF("resize", img_resize,

diff --git a/qemu-img.texi b/qemu-img.texi

index 70fa321..b2ca3a5 100644

--- a/qemu-img.texi

+++ b/qemu-img.texi

@@ -45,6 +45,10 @@ indicates the consecutive number of bytes that must contain only zeros

 for qemu-img to create a sparse image during conversion. This value is rounded

 down to the nearest 512 bytes. You may use the common size suffixes like

 @code{k} for kilobytes.

+@item -t @var{cache}

+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.

 @end table

 Parameters to snapshot subcommand:

@@ -87,11 +91,11 @@ this case. @var{backing_file} will never be modified unless you use the

 The size can also be specified using the @var{size} option with @code{-o},

 it doesn't need to be specified separately in this case.

-@item commit [-f @var{fmt}] @var{filename}

+@item commit [-f @var{fmt}] [-t @var{cache}] @var{filename}

 Commit the changes recorded in @var{filename} in its base image.

-@item convert [-c] [-p] [-f @var{fmt}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_name}] [-S @var{sparse_size}] @var{filename} [@var{filename2} [...]] @var{output_filename}

+@item convert [-c] [-p] [-f @var{fmt}] [-t @var{cache}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_name}] [-S @var{sparse_size}] @var{filename} [@var{filename2} [...]] @var{output_filename}

 Convert the disk image @var{filename} or a snapshot @var{snapshot_name} to disk image @var{output_filename}

 using format @var{output_fmt}. It can be optionally compressed (@code{-c}

@@ -121,7 +125,7 @@ they are displayed too.

 List, apply, create or delete snapshots in image @var{filename}.

-@item rebase [-f @var{fmt}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}

+@item rebase [-f @var{fmt}] [-t @var{cache}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}

 Changes the backing file of an image. Only the formats @code{qcow2} and

 @code{qed} support changing the backing file.

-- 

1.7.7.5