Fix warning about incompatible types

[qemu.git] / qemu-img.texi

diff --git a/qemu-img.texi b/qemu-img.texi
index 3afd320851867dca01421cc755974b38abbe911e..1c0504bcfa8a442e5776f4baaa8a9afc6956e587 100644 (file)
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -8,9 +8,9 @@ usage: qemu-img command [command options]
 
 The following commands are supported:
 @table @option
 
 The following commands are supported:
 @table @option

-@item create [-e] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}]
+@item create [-e] [-6] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}]

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

-@item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
+@item convert [-c] [-e] [-6] [-f @var{fmt}] [-O @var{output_fmt}] [-B @var{output_base_image}] @var{filename} [@var{filename2} [...]] @var{output_filename}

 @item info [-f @var{fmt}] @var{filename}
 @end table
 
 @item info [-f @var{fmt}] @var{filename}
 @end table
 


@@ -18,62 +18,70 @@ Command parameters:
 @table @var
 @item filename
  is a disk image filename
 @table @var
 @item filename
  is a disk image filename

-@item base_image 
+@item base_image

 is the read-only disk image which is used as base for a copy on
     write image; the copy on write image only stores the modified data
 is the read-only disk image which is used as base for a copy on
     write image; the copy on write image only stores the modified data

-
-@item fmt 
+@item output_base_image
+forces the output image to be created as a copy on write
+image of the specified base image; @code{output_base_image} should have the same
+content as the input's base image, however the path, image format, etc may
+differ
+@item fmt

 is the disk image format. It is guessed automatically in most cases. The following formats are supported:
 
 @table @code
 @item raw
 
 Raw disk image format (default). This format has the advantage of
 is the disk image format. It is guessed automatically in most cases. The following formats are supported:
 
 @table @code
 @item raw
 
 Raw disk image format (default). This format has the advantage of

-being simple and easily exportable to all other emulators. If your file
-system supports @emph{holes} (for example in ext2 or ext3 on Linux),
-then only the written sectors will reserve space. Use @code{qemu-img
-info} to know the real size used by the image or @code{ls -ls} on
-Unix/Linux.
+being simple and easily exportable to all other emulators. If your
+file system supports @emph{holes} (for example in ext2 or ext3 on
+Linux or NTFS on Windows), then only the written sectors will reserve
+space. Use @code{qemu-img info} to know the real size used by the
+image or @code{ls -ls} on Unix/Linux.

 
 

-@item qcow
+@item qcow2

 QEMU image format, the most versatile format. Use it to have smaller
 images (useful if your filesystem does not supports holes, for example
 QEMU image format, the most versatile format. Use it to have smaller
 images (useful if your filesystem does not supports holes, for example

-on Windows), optional AES encryption and zlib based compression.
+on Windows), optional AES encryption, zlib based compression and
+support of multiple VM snapshots.
+@item qcow
+Old QEMU image format. Left for compatibility.

 @item cow
 User Mode Linux Copy On Write image format. Used to be the only growable
 image format in QEMU. It is supported only for compatibility with
 previous versions. It does not work on win32.
 @item vmdk
 @item cow
 User Mode Linux Copy On Write image format. Used to be the only growable
 image format in QEMU. It is supported only for compatibility with
 previous versions. It does not work on win32.
 @item vmdk

-VMware 3 and 4 compatible image format. Currently only supported as
-read-only.
+VMware 3 and 4 compatible image format.

 @item cloop
 Linux Compressed Loop image, useful only to reuse directly compressed
 CD-ROM images present for example in the Knoppix CD-ROMs.
 @end table
 
 @item cloop
 Linux Compressed Loop image, useful only to reuse directly compressed
 CD-ROM images present for example in the Knoppix CD-ROMs.
 @end table
 

-@item size 
+@item size

 is the disk image size in kilobytes. Optional suffixes @code{M}
 is the disk image size in kilobytes. Optional suffixes @code{M}

-(megabyte) and @code{G} (gigabyte) are supported 
+(megabyte) and @code{G} (gigabyte) are supported

 
 @item output_filename
 
 @item output_filename

-is the destination disk image filename 
+is the destination disk image filename

 
 @item output_fmt
  is the destination format
 
 @item -c
 indicates that target image must be compressed (qcow format only)
 
 @item output_fmt
  is the destination format
 
 @item -c
 indicates that target image must be compressed (qcow format only)

-@item -e 
+@item -e

 indicates that the target image must be encrypted (qcow format only)
 indicates that the target image must be encrypted (qcow format only)

+@item -6
+indicates that the target image must use compatibility level 6 (vmdk format only)

 @end table
 
 Command description:
 
 @table @option
 @end table
 
 Command description:
 
 @table @option

-@item create [-e] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}]
+@item create [-6] [-e] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}]

 
 Create the new disk image @var{filename} of size @var{size} and format
 
 Create the new disk image @var{filename} of size @var{size} and format

-@var{fmt}. 
+@var{fmt}.

 
 If @var{base_image} is specified, then the image will record only the
 differences from @var{base_image}. No size needs to be specified in
 
 If @var{base_image} is specified, then the image will record only the
 differences from @var{base_image}. No size needs to be specified in


@@ -87,7 +95,7 @@ Commit the changes recorded in @var{filename} in its base image.
 @item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
 
 Convert the disk image @var{filename} to disk image @var{output_filename}
 @item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
 
 Convert the disk image @var{filename} to disk image @var{output_filename}

-using format @var{output_fmt}. It can be optionnaly encrypted
+using format @var{output_fmt}. It can be optionally encrypted

 (@code{-e} option) or compressed (@code{-c} option).
 
 Only the format @code{qcow} supports encryption or compression. The
 (@code{-e} option) or compressed (@code{-c} option).
 
 Only the format @code{qcow} supports encryption or compression. The


@@ -105,7 +113,8 @@ are detected and suppressed from the destination image.
 
 Give information about the disk image @var{filename}. Use it in
 particular to know the size reserved on disk which can be different
 
 Give information about the disk image @var{filename}. Use it in
 particular to know the size reserved on disk which can be different

-from the displayed size.
+from the displayed size. If VM snapshots are stored in the disk image,
+they are displayed too.

 @end table
 
 @c man end
 @end table
 
 @c man end