[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/22] qemu-img.texi: fix command ordering
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 07/22] qemu-img.texi: fix command ordering |
Date: |
Sun, 20 May 2018 09:14:53 +0300 |
From: John Snow <address@hidden>
This should match the summary ordering, which is alphabetical.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
qemu-img.texi | 58 ++++++++++++++++++++++++++++++----------------------------
1 file changed, 30 insertions(+), 28 deletions(-)
diff --git a/qemu-img.texi b/qemu-img.texi
index 8a26400adb..adf5176902 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -193,6 +193,12 @@ sets the number of input blocks to skip
Command description:
@table @option
+
address@hidden amend [-p] [-f @var{fmt}] [-t @var{cache}] -o @var{options}
@var{filename}
+
+Amends the image format specific @var{options} for the image file
address@hidden Not all file formats support this operation.
+
@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] address@hidden
[-n] [--no-drain] [-o @var{offset}] address@hidden [-q] [-s @var{buffer_size}]
[-S @var{step_size}] [-t @var{cache}] [-w] @var{filename}
Run a simple sequential I/O benchmark on the specified image. If @code{-w} is
@@ -253,30 +259,6 @@ If @code{-r} is specified, exit codes representing the
image state refer to the
state after (the attempt at) repairing it. That is, a successful @code{-r all}
will yield the exit code 0, independently of the image state before.
address@hidden create [-f @var{fmt}] [-b @var{backing_file}] [-F
@var{backing_fmt}] [-u] [-o @var{options}] @var{filename} address@hidden
-
-Create the new disk image @var{filename} of size @var{size} and format
address@hidden Depending on the file format, you can add one or more
@var{options}
-that enable additional features of this format.
-
-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).
-
-If a relative path name is given, the backing file is looked up relative to
-the directory containing @var{filename}.
-
-Note that a given backing file will be opened to check that it is valid. Use
-the @code{-u} option to enable unsafe backing file mode, which means that the
-image will be created even if the associated backing file cannot be opened. A
-matching backing file must be created or additional options be used to make the
-backing file specification valid when you want to use an image created this
-way.
-
-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 [-q] [-f @var{fmt}] [-t @var{cache}] [-b @var{base}] [-d] [-p]
@var{filename}
Commit the changes recorded in @var{filename} in its base image or backing
file.
@@ -381,6 +363,30 @@ creating compressed images.
@var{num_coroutines} specifies how many coroutines work in parallel during
the convert process (defaults to 8).
address@hidden create [-f @var{fmt}] [-b @var{backing_file}] [-F
@var{backing_fmt}] [-u] [-o @var{options}] @var{filename} address@hidden
+
+Create the new disk image @var{filename} of size @var{size} and format
address@hidden Depending on the file format, you can add one or more
@var{options}
+that enable additional features of this format.
+
+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).
+
+If a relative path name is given, the backing file is looked up relative to
+the directory containing @var{filename}.
+
+Note that a given backing file will be opened to check that it is valid. Use
+the @code{-u} option to enable unsafe backing file mode, which means that the
+image will be created even if the associated backing file cannot be opened. A
+matching backing file must be created or additional options be used to make the
+backing file specification valid when you want to use an image created this
+way.
+
+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 dd [-f @var{fmt}] [-O @var{output_fmt}] address@hidden address@hidden
address@hidden address@hidden address@hidden
Dd copies from @var{input} file to @var{output} file converting it from
@@ -585,10 +591,6 @@ how the additional image area should be allocated on the
host. See the format
description in the @code{NOTES} section which values are allowed. Using this
option may result in slightly more data being allocated than necessary.
address@hidden amend [-p] [-f @var{fmt}] [-t @var{cache}] -o @var{options}
@var{filename}
-
-Amends the image format specific @var{options} for the image file
address@hidden Not all file formats support this operation.
@end table
@c man end
--
2.11.0
- [Qemu-devel] [PULL 01/22] tcg: fix s/compliment/complement/ typos, (continued)
- [Qemu-devel] [PULL 01/22] tcg: fix s/compliment/complement/ typos, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 04/22] qemu-option-trace: -trace enable= is a pattern, not a file, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 13/22] trivial: Do not include pci.h if it is not necessary, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 02/22] misc, ide: remove use of HWADDR_PRIx in trace events, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 03/22] slirp/debug: Print IP addresses in human readable form, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 06/22] qemu-img-commands.hx: argument ordering fixups, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 20/22] gdbstub: Handle errors in gdb_accept(), Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 08/22] qemu-img: remove references to GEN_DOCS, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 15/22] hw/timer/mt48t59: Fix bit-rotten NVRAM_PRINTF format strings, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 17/22] typedefs: Remove PcGuestInfo from qemu/typedefs.h, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 07/22] qemu-img.texi: fix command ordering,
Michael Tokarev <=
- [Qemu-devel] [PULL 21/22] qapi/net.json: Fix the version number of the "vlan" removal, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 09/22] qemu-img: Make documentation between .texi and .hx consistent, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 16/22] qemu-options: Allow -no-user-config again, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 05/22] HACKING: document preference for g_new instead of g_malloc, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 22/22] acpi: fix a comment about aml_call0(), Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 10/22] qemu-img-cmds.hx: add passive-aggressive note, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 11/22] hw/ide/ahci: Keep ALLWINNER_AHCI() macro internal, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 12/22] tests: fix tpm-crb tpm-tis tests race, Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 19/22] gdbstub: Use qemu_set_cloexec(), Michael Tokarev, 2018/05/20
- [Qemu-devel] [PULL 18/22] replace functions which are only available in glib-2.24, Michael Tokarev, 2018/05/20