cryptospore / rpms / qemu-kvm

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