|
 |
45e84a0 |
From 8afe984ef7aa25cb2f8af51da021fdc8a242884d Mon Sep 17 00:00:00 2001
|
|
|
45e84a0 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
45e84a0 |
Date: Wed, 7 Dec 2011 13:57:13 +0100
|
|
|
45e84a0 |
Subject: [PATCH 24/25] Documentation: Add qemu-img -t parameter in man page
|
|
|
45e84a0 |
|
|
|
45e84a0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
45e84a0 |
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
|
|
|
45e84a0 |
---
|
|
|
45e84a0 |
qemu-img-cmds.hx | 6 +++---
|
|
|
45e84a0 |
qemu-img.texi | 10 +++++++---
|
|
|
45e84a0 |
2 files changed, 10 insertions(+), 6 deletions(-)
|
|
|
45e84a0 |
|
|
|
45e84a0 |
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
|
|
|
45e84a0 |
index 4be00a5..49dce7c 100644
|
|
|
45e84a0 |
--- a/qemu-img-cmds.hx
|
|
|
45e84a0 |
+++ b/qemu-img-cmds.hx
|
|
|
45e84a0 |
@@ -24,13 +24,13 @@ ETEXI
|
|
|
45e84a0 |
DEF("commit", img_commit,
|
|
|
45e84a0 |
"commit [-f fmt] [-t cache] filename")
|
|
|
45e84a0 |
STEXI
|
|
|
45e84a0 |
-@item commit [-f @var{fmt}] @var{filename}
|
|
|
45e84a0 |
+@item commit [-f @var{fmt}] [-t @var{cache}] @var{filename}
|
|
|
45e84a0 |
ETEXI
|
|
|
45e84a0 |
|
|
|
45e84a0 |
DEF("convert", img_convert,
|
|
|
45e84a0 |
"convert [-c] [-p] [-f fmt] [-t cache] [-O output_fmt] [-o options] [-s snapshot_name] [-S sparse_size] filename [filename2 [...]] output_filename")
|
|
|
45e84a0 |
STEXI
|
|
|
45e84a0 |
-@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}
|
|
|
45e84a0 |
+@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}
|
|
|
45e84a0 |
ETEXI
|
|
|
45e84a0 |
|
|
|
45e84a0 |
DEF("info", img_info,
|
|
|
45e84a0 |
@@ -48,7 +48,7 @@ ETEXI
|
|
|
45e84a0 |
DEF("rebase", img_rebase,
|
|
|
45e84a0 |
"rebase [-f fmt] [-t cache] [-p] [-u] -b backing_file [-F backing_fmt] filename")
|
|
|
45e84a0 |
STEXI
|
|
|
45e84a0 |
-@item rebase [-f @var{fmt}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}
|
|
|
45e84a0 |
+@item rebase [-f @var{fmt}] [-t @var{cache}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}
|
|
|
45e84a0 |
ETEXI
|
|
|
45e84a0 |
|
|
|
45e84a0 |
DEF("resize", img_resize,
|
|
|
45e84a0 |
diff --git a/qemu-img.texi b/qemu-img.texi
|
|
|
45e84a0 |
index 70fa321..b2ca3a5 100644
|
|
|
45e84a0 |
--- a/qemu-img.texi
|
|
|
45e84a0 |
+++ b/qemu-img.texi
|
|
|
45e84a0 |
@@ -45,6 +45,10 @@ indicates the consecutive number of bytes that must contain only zeros
|
|
|
45e84a0 |
for qemu-img to create a sparse image during conversion. This value is rounded
|
|
|
45e84a0 |
down to the nearest 512 bytes. You may use the common size suffixes like
|
|
|
45e84a0 |
@code{k} for kilobytes.
|
|
|
45e84a0 |
+@item -t @var{cache}
|
|
|
45e84a0 |
+specifies the cache mode that should be used with the (destination) file. See
|
|
|
45e84a0 |
+the documentation of the emulator's @code{-drive cache=...} option for allowed
|
|
|
45e84a0 |
+values.
|
|
|
45e84a0 |
@end table
|
|
|
45e84a0 |
|
|
|
45e84a0 |
Parameters to snapshot subcommand:
|
|
|
45e84a0 |
@@ -87,11 +91,11 @@ this case. @var{backing_file} will never be modified unless you use the
|
|
|
45e84a0 |
The size can also be specified using the @var{size} option with @code{-o},
|
|
|
45e84a0 |
it doesn't need to be specified separately in this case.
|
|
|
45e84a0 |
|
|
|
45e84a0 |
-@item commit [-f @var{fmt}] @var{filename}
|
|
|
45e84a0 |
+@item commit [-f @var{fmt}] [-t @var{cache}] @var{filename}
|
|
|
45e84a0 |
|
|
|
45e84a0 |
Commit the changes recorded in @var{filename} in its base image.
|
|
|
45e84a0 |
|
|
|
45e84a0 |
-@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}
|
|
|
45e84a0 |
+@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}
|
|
|
45e84a0 |
|
|
|
45e84a0 |
Convert the disk image @var{filename} or a snapshot @var{snapshot_name} to disk image @var{output_filename}
|
|
|
45e84a0 |
using format @var{output_fmt}. It can be optionally compressed (@code{-c}
|
|
|
45e84a0 |
@@ -121,7 +125,7 @@ they are displayed too.
|
|
|
45e84a0 |
|
|
|
45e84a0 |
List, apply, create or delete snapshots in image @var{filename}.
|
|
|
45e84a0 |
|
|
|
45e84a0 |
-@item rebase [-f @var{fmt}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}
|
|
|
45e84a0 |
+@item rebase [-f @var{fmt}] [-t @var{cache}] [-p] [-u] -b @var{backing_file} [-F @var{backing_fmt}] @var{filename}
|
|
|
45e84a0 |
|
|
|
45e84a0 |
Changes the backing file of an image. Only the formats @code{qcow2} and
|
|
|
45e84a0 |
@code{qed} support changing the backing file.
|
|
|
45e84a0 |
--
|
|
|
45e84a0 |
1.7.7.5
|
|
|
45e84a0 |
|