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