[Qemu-devel] [PATCH 2/3] Documentation: Don't mention old qemu-img options

[Kevin Wolf]

The old options are still supported for compatibility, but they are
inconsistent (for example create -b vs. convert -B for backing files) and
incomplete (-F only exists for create) which tends to confuse people. Remove
all references to the old options from the documentation to guide users to the
more consistent -o options.

Signed-off-by: Kevin Wolf <address@hidden>
---
 qemu-img-cmds.hx |    8 ++++----
 qemu-img.c       |    6 ------
 qemu-img.texi    |   38 +++++++++++++++++---------------------
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
index ddb86f0..641bd87 100644
--- a/qemu-img-cmds.hx
+++ b/qemu-img-cmds.hx
@@ -16,9 +16,9 @@ STEXI
 ETEXI
 
 DEF("create", img_create,
-    "create [-F fmt] [-b base_image] [-f fmt] [-o options] filename [size]")
+    "create [-f fmt] [-o options] filename [size]")
 STEXI
address@hidden create [-F @var{base_fmt}] [-b @var{base_image}] [-f @var{fmt}] 
[-o @var{options}] @var{filename} address@hidden
address@hidden create [-f @var{fmt}] [-o @var{options}] @var{filename} 
address@hidden
 ETEXI
 
 DEF("commit", img_commit,
@@ -28,9 +28,9 @@ STEXI
 ETEXI
 
 DEF("convert", img_convert,
-    "convert [-c] [-f fmt] [-O output_fmt] [-o options] [-B output_base_image] 
filename [filename2 [...]] output_filename")
+    "convert [-c] [-f fmt] [-O output_fmt] [-o options] filename [filename2 
[...]] output_filename")
 STEXI
address@hidden convert [-c] [-f @var{fmt}] [-O @var{output_fmt}] [-o 
@var{options}] [-B @var{output_base_image}] @var{filename} address@hidden 
[...]] @var{output_filename}
address@hidden convert [-c] [-f @var{fmt}] [-O @var{output_fmt}] [-o 
@var{options}] @var{filename} address@hidden [...]] @var{output_filename}
 ETEXI
 
 DEF("info", img_info,
diff --git a/qemu-img.c b/qemu-img.c
index 204f618..d5db34c 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -71,12 +71,6 @@ static void help(void)
            "\n"
            "Command parameters:\n"
            "  'filename' is a disk image filename\n"
-           "  'base_image' is the read-only disk image which is used as base 
for a copy on\n"
-           "    write image; the copy on write image only stores the modified 
data\n"
-           "  'output_base_image' forces the output image to be created as a 
copy on write\n"
-           "    image of the specified base image; 'output_base_image' should 
have the same\n"
-           "    content as the input's base image, however the path, image 
format, etc may\n"
-           "    differ\n"
            "  'fmt' is the disk image format. It is guessed automatically in 
most cases\n"
            "  'size' is the disk image size in kilobytes. Optional suffixes\n"
            "    'M' (megabyte, 1024 * 1024) and 'G' (gigabyte, 1024 * 1024 * 
1024) are\n"
diff --git a/qemu-img.texi b/qemu-img.texi
index dd248ea..2d0106b 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -14,16 +14,6 @@ Command parameters:
 @table @var
 @item filename
  is a disk image filename
address@hidden 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
address@hidden 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
address@hidden base_fmt
-is the disk image format of @var{base_image}. for more information look at 
@var{fmt}
 @item fmt
 is the disk image format. It is guessed automatically in most cases. See below
 for a description of the supported disk formats.
@@ -69,15 +59,16 @@ lists all snapshots in the given image
 Command description:
 
 @table @option
address@hidden create [-F @var{base_fmt}] [-b @var{base_image}] [-f @var{fmt}] 
[-o @var{options}] @var{filename} address@hidden
address@hidden create [-f @var{fmt}] [-o @var{options}] @var{filename} 
address@hidden
 
 Create the new disk image @var{filename} of size @var{size} and format
address@hidden
address@hidden Depending on the file format, you can add one or more 
@var{options}
+that enable additional features of this format.
 
-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
-this case. @var{base_image} will never be modified unless you use the
address@hidden monitor command.
+If the option @var{backing_file} is specified, then the image will record
+only the differences from @var{backing_file}. No size needs to be specified in
+this case. @var{backing_file} will never be modified unless you use the
address@hidden monitor command (or qemu-img commit).
 
 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.
@@ -86,23 +77,25 @@ it doesn't need to be specified separately in this case.
 
 Commit the changes recorded in @var{filename} in its base image.
 
address@hidden convert [-c] [-f @var{fmt}] [-O @var{output_fmt}] [-o 
@var{options}] [-B @var{output_base_image}] @var{filename} address@hidden 
[...]] @var{output_filename}
address@hidden convert [-c] [-f @var{fmt}] [-O @var{output_fmt}] [-o 
@var{options}] @var{filename} address@hidden [...]] @var{output_filename}
 
 Convert the disk image @var{filename} to disk image @var{output_filename}
 using format @var{output_fmt}. It can be optionally compressed (@code{-c}
 option) or use any format specific options like encryption (@code{-o} option).
 
-Only the formats @code{qcow} and @code{qcow2} support encryption or 
compression. The
+Only the formats @code{qcow} and @code{qcow2} support compression. The
 compression is read-only. It means that if a compressed sector is
 rewritten, then it is rewritten as uncompressed data.
 
-Encryption uses the AES format which is very secure (128 bit keys). Use
-a long password (16 characters) to get maximum protection.
-
 Image conversion is also useful to get smaller image when using a
 growable format such as @code{qcow} or @code{cow}: the empty sectors
 are detected and suppressed from the destination image.
 
+You can use the @var{backing_file} option to force the output image to be
+created as a copy on write image of the specified base image; the
address@hidden should have the same content as the input's base image,
+however the path, image format, etc may differ.
+
 @item info [-f @var{fmt}] @var{filename}
 
 Give information about the disk image @var{filename}. Use it in
@@ -138,6 +131,9 @@ 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, zlib based compression and
 support of multiple VM snapshots.
+
+Encryption uses the AES format which is very secure (128 bit keys). Use
+a long password (16 characters) to get maximum protection.
 @item qcow
 Old QEMU image format. Left for compatibility.
 @item cow
-- 
1.6.2.5