aboutsummaryrefslogtreecommitdiff
path: root/qemu-img.texi
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-09-17 10:23:15 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-09-17 10:23:15 -0500
commit109820df4a3b8b58f234319d015a854df9db8981 (patch)
treec08a668dc3ecb2063e729658d0e63afa671778e5 /qemu-img.texi
parent509e9c462d03c4b7edc4a0d277311a7f45c9c046 (diff)
parentfe235a06e1e008dedd2ac3cc0a3a655169ce9b33 (diff)
downloadqemu-arm-109820df4a3b8b58f234319d015a854df9db8981.tar.gz
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: block: Don't forget to delete temporary file Don't require encryption password for 'qemu-img info' command qemu-img: Add json output option to the info command. qapi: Add SnapshotInfo and ImageInfo. ahci: properly reset PxCMD on HBA reset block: fix block tray status vdi: Fix warning from clang block/curl: Fix wrong free statement ide: Fix error messages from static code analysis (no real error) ATAPI: STARTSTOPUNIT only eject/load media if powercondition is 0 sheepdog: fix savevm and loadvm
Diffstat (limited to 'qemu-img.texi')
-rw-r--r--qemu-img.texi5
1 files changed, 3 insertions, 2 deletions
diff --git a/qemu-img.texi b/qemu-img.texi
index 360543b807..8b05f2c428 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -129,12 +129,13 @@ created as a copy on write image of the specified base image; the
@var{backing_file} 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}
+@item info [-f @var{fmt}] [--output=@var{ofmt}] @var{filename}
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. If VM snapshots are stored in the disk image,
-they are displayed too.
+they are displayed too. The command can output in the format @var{ofmt}
+which is either @code{human} or @code{json}.
@item snapshot [-l | -a @var{snapshot} | -c @var{snapshot} | -d @var{snapshot} ] @var{filename}