From 19d36792c02e09941d9f3ef19b9461306cc54d76 Mon Sep 17 00:00:00 2001 From: bellard Date: Mon, 7 Aug 2006 21:34:34 +0000 Subject: update git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2100 c046a42c-6fe2-441c-8c8c-71466251a162 --- qemu-doc.texi | 6 +++--- qemu-img.texi | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index 9f0b4f6..8ff329a 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -949,7 +949,7 @@ format. Normally this device is the first virtual hard drive. Use the monitor command @code{savevm} to create a new VM snapshot or replace an existing one. A human readable name can be assigned to each -snapshots in addition to its numerical ID. +snapshot in addition to its numerical ID. Use @code{loadvm} to restore a VM snapshot and @code{delvm} to remove a VM snapshot. @code{info snapshots} lists the available snapshots @@ -972,8 +972,8 @@ and writable block device. The disk image snapshots are stored in every disk image. The size of a snapshot in a disk image is difficult to evaluate and is not shown by @code{info snapshots} because the associated disk sectors are shared among all the snapshots to save -disk space (otherwise each snapshot would have to copy the full disk -images). +disk space (otherwise each snapshot would need a full copy of all the +disk images). When using the (unrelated) @code{-snapshot} option (@ref{disk_images_snapshot_mode}), you can always make VM snapshots, diff --git a/qemu-img.texi b/qemu-img.texi index ac7923f..1f01dce 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -29,16 +29,19 @@ is the disk image format. It is guessed automatically in most cases. The followi @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 -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 @@ -104,7 +107,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 -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 -- cgit v1.1