|
 |
9ae3a8 |
From cac4420752da06e6d42b5b6b9f669e9f224524b3 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 3 Feb 2014 10:52:55 -0500
|
|
|
9ae3a8 |
Subject: [PATCH 3/6] docs: qcow2 compat=1.1 is now the default
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1391424775-30596-1-git-send-email-stefanha@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 57069
|
|
|
9ae3a8 |
O-Subject: [PATCH RHEL7.0 qemu-kvm] docs: qcow2 compat=1.1 is now the default
|
|
|
9ae3a8 |
Bugzilla: 1048092
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 1048092
|
|
|
9ae3a8 |
Upstream: merged
|
|
|
9ae3a8 |
BREW: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6990898
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Commit 9117b47717ad208b12786ce88eacb013f9b3dd1c ("qcow2: Change default
|
|
|
9ae3a8 |
for new images to compat=1.1") changed the default qcow2 image format
|
|
|
9ae3a8 |
version but forgot to update qemu-doc.texi and qemu-img.texi.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 7fa9e1f941b4be1f71bb42de2f2ed8805d7e7326)
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-doc.texi | 8 ++++----
|
|
|
9ae3a8 |
qemu-img.texi | 8 ++++----
|
|
|
9ae3a8 |
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-doc.texi | 8 ++++----
|
|
|
9ae3a8 |
qemu-img.texi | 8 ++++----
|
|
|
9ae3a8 |
2 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/qemu-doc.texi b/qemu-doc.texi
|
|
|
9ae3a8 |
index 319c2f2..54ab3c5 100644
|
|
|
9ae3a8 |
--- a/qemu-doc.texi
|
|
|
9ae3a8 |
+++ b/qemu-doc.texi
|
|
|
9ae3a8 |
@@ -536,11 +536,11 @@ support of multiple VM snapshots.
|
|
|
9ae3a8 |
Supported options:
|
|
|
9ae3a8 |
@table @code
|
|
|
9ae3a8 |
@item compat
|
|
|
9ae3a8 |
-Determines the qcow2 version to use. @code{compat=0.10} uses the traditional
|
|
|
9ae3a8 |
-image format that can be read by any QEMU since 0.10 (this is the default).
|
|
|
9ae3a8 |
+Determines the qcow2 version to use. @code{compat=0.10} uses the
|
|
|
9ae3a8 |
+traditional image format that can be read by any QEMU since 0.10.
|
|
|
9ae3a8 |
@code{compat=1.1} enables image format extensions that only QEMU 1.1 and
|
|
|
9ae3a8 |
-newer understand. Amongst others, this includes zero clusters, which allow
|
|
|
9ae3a8 |
-efficient copy-on-read for sparse images.
|
|
|
9ae3a8 |
+newer understand (this is the default). Amongst others, this includes
|
|
|
9ae3a8 |
+zero clusters, which allow efficient copy-on-read for sparse images.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@item backing_file
|
|
|
9ae3a8 |
File name of a base image (see @option{create} subcommand)
|
|
|
9ae3a8 |
diff --git a/qemu-img.texi b/qemu-img.texi
|
|
|
9ae3a8 |
index a71f132..1078791 100644
|
|
|
9ae3a8 |
--- a/qemu-img.texi
|
|
|
9ae3a8 |
+++ b/qemu-img.texi
|
|
|
9ae3a8 |
@@ -387,11 +387,11 @@ support of multiple VM snapshots.
|
|
|
9ae3a8 |
Supported options:
|
|
|
9ae3a8 |
@table @code
|
|
|
9ae3a8 |
@item compat
|
|
|
9ae3a8 |
-Determines the qcow2 version to use. @code{compat=0.10} uses the traditional
|
|
|
9ae3a8 |
-image format that can be read by any QEMU since 0.10 (this is the default).
|
|
|
9ae3a8 |
+Determines the qcow2 version to use. @code{compat=0.10} uses the
|
|
|
9ae3a8 |
+traditional image format that can be read by any QEMU since 0.10.
|
|
|
9ae3a8 |
@code{compat=1.1} enables image format extensions that only QEMU 1.1 and
|
|
|
9ae3a8 |
-newer understand. Amongst others, this includes zero clusters, which allow
|
|
|
9ae3a8 |
-efficient copy-on-read for sparse images.
|
|
|
9ae3a8 |
+newer understand (this is the default). Amongst others, this includes zero
|
|
|
9ae3a8 |
+clusters, which allow efficient copy-on-read for sparse images.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@item backing_file
|
|
|
9ae3a8 |
File name of a base image (see @option{create} subcommand)
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|