Commit 19d36792c02e09941d9f3ef19b9461306cc54d76
1 parent
90765429
update
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2100 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
15 additions
and
11 deletions
qemu-doc.texi
| @@ -949,7 +949,7 @@ format. Normally this device is the first virtual hard drive. | @@ -949,7 +949,7 @@ format. Normally this device is the first virtual hard drive. | ||
| 949 | 949 | ||
| 950 | Use the monitor command @code{savevm} to create a new VM snapshot or | 950 | Use the monitor command @code{savevm} to create a new VM snapshot or |
| 951 | replace an existing one. A human readable name can be assigned to each | 951 | replace an existing one. A human readable name can be assigned to each |
| 952 | -snapshots in addition to its numerical ID. | 952 | +snapshot in addition to its numerical ID. |
| 953 | 953 | ||
| 954 | Use @code{loadvm} to restore a VM snapshot and @code{delvm} to remove | 954 | Use @code{loadvm} to restore a VM snapshot and @code{delvm} to remove |
| 955 | a VM snapshot. @code{info snapshots} lists the available snapshots | 955 | 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 | @@ -972,8 +972,8 @@ and writable block device. The disk image snapshots are stored in | ||
| 972 | every disk image. The size of a snapshot in a disk image is difficult | 972 | every disk image. The size of a snapshot in a disk image is difficult |
| 973 | to evaluate and is not shown by @code{info snapshots} because the | 973 | to evaluate and is not shown by @code{info snapshots} because the |
| 974 | associated disk sectors are shared among all the snapshots to save | 974 | associated disk sectors are shared among all the snapshots to save |
| 975 | -disk space (otherwise each snapshot would have to copy the full disk | ||
| 976 | -images). | 975 | +disk space (otherwise each snapshot would need a full copy of all the |
| 976 | +disk images). | ||
| 977 | 977 | ||
| 978 | When using the (unrelated) @code{-snapshot} option | 978 | When using the (unrelated) @code{-snapshot} option |
| 979 | (@ref{disk_images_snapshot_mode}), you can always make VM snapshots, | 979 | (@ref{disk_images_snapshot_mode}), you can always make VM snapshots, |
qemu-img.texi
| @@ -29,16 +29,19 @@ is the disk image format. It is guessed automatically in most cases. The followi | @@ -29,16 +29,19 @@ is the disk image format. It is guessed automatically in most cases. The followi | ||
| 29 | @item raw | 29 | @item raw |
| 30 | 30 | ||
| 31 | Raw disk image format (default). This format has the advantage of | 31 | Raw disk image format (default). This format has the advantage of |
| 32 | -being simple and easily exportable to all other emulators. If your file | ||
| 33 | -system supports @emph{holes} (for example in ext2 or ext3 on Linux), | ||
| 34 | -then only the written sectors will reserve space. Use @code{qemu-img | ||
| 35 | -info} to know the real size used by the image or @code{ls -ls} on | ||
| 36 | -Unix/Linux. | 32 | +being simple and easily exportable to all other emulators. If your |
| 33 | +file system supports @emph{holes} (for example in ext2 or ext3 on | ||
| 34 | +Linux or NTFS on Windows), then only the written sectors will reserve | ||
| 35 | +space. Use @code{qemu-img info} to know the real size used by the | ||
| 36 | +image or @code{ls -ls} on Unix/Linux. | ||
| 37 | 37 | ||
| 38 | -@item qcow | 38 | +@item qcow2 |
| 39 | QEMU image format, the most versatile format. Use it to have smaller | 39 | QEMU image format, the most versatile format. Use it to have smaller |
| 40 | images (useful if your filesystem does not supports holes, for example | 40 | images (useful if your filesystem does not supports holes, for example |
| 41 | -on Windows), optional AES encryption and zlib based compression. | 41 | +on Windows), optional AES encryption, zlib based compression and |
| 42 | +support of multiple VM snapshots. | ||
| 43 | +@item qcow | ||
| 44 | +Old QEMU image format. Left for compatibility. | ||
| 42 | @item cow | 45 | @item cow |
| 43 | User Mode Linux Copy On Write image format. Used to be the only growable | 46 | User Mode Linux Copy On Write image format. Used to be the only growable |
| 44 | image format in QEMU. It is supported only for compatibility with | 47 | image format in QEMU. It is supported only for compatibility with |
| @@ -104,7 +107,8 @@ are detected and suppressed from the destination image. | @@ -104,7 +107,8 @@ are detected and suppressed from the destination image. | ||
| 104 | 107 | ||
| 105 | Give information about the disk image @var{filename}. Use it in | 108 | Give information about the disk image @var{filename}. Use it in |
| 106 | particular to know the size reserved on disk which can be different | 109 | particular to know the size reserved on disk which can be different |
| 107 | -from the displayed size. | 110 | +from the displayed size. If VM snapshots are stored in the disk image, |
| 111 | +they are displayed too. | ||
| 108 | @end table | 112 | @end table |
| 109 | 113 | ||
| 110 | @c man end | 114 | @c man end |