0a122b
From 05ce2d88bccb8c43141ff2f03795c505eff247b8 Mon Sep 17 00:00:00 2001
0a122b
From: Kevin Wolf <kwolf@redhat.com>
0a122b
Date: Fri, 22 Nov 2013 14:23:30 +0100
0a122b
Subject: [PATCH 12/14] qcow2: change default for new images to compat=1.1, part2
0a122b
0a122b
RH-Author: Kevin Wolf <kwolf@redhat.com>
0a122b
Message-id: <1385130210-31063-3-git-send-email-kwolf@redhat.com>
0a122b
Patchwork-id: 55857
0a122b
O-Subject: [RHEL-7.0 qemu-kvm PATCH 2/2] qcow2: Change default for new images to compat=1.1
0a122b
Bugzilla: 1026739
0a122b
RH-Acked-by: Max Reitz <mreitz@redhat.com>
0a122b
RH-Acked-by: Fam Zheng <famz@redhat.com>
0a122b
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
0a122b
0a122b
By the time that qemu 1.7 will be released, enough time will have passed
0a122b
since qemu 1.1, which is the first version to understand version 3
0a122b
images, that changing the default shouldn't hurt many people any more
0a122b
and the benefits of using the new format outweigh the pain.
0a122b
0a122b
qemu-iotests already runs with compat=1.1 by default.
0a122b
0a122b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
0a122b
Reviewed-by: Eric Blake <eblake@redhat.com>
0a122b
(cherry picked from commit 9117b47717ad208b12786ce88eacb013f9b3dd1c)
0a122b
0a122b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
0a122b
---
0a122b
 block/qcow2.c | 4 +++-
0a122b
 1 file changed, 3 insertions(+), 1 deletion(-)
0a122b
0a122b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
0a122b
---
0a122b
 block/qcow2.c |    4 +++-
0a122b
 1 files changed, 3 insertions(+), 1 deletions(-)
0a122b
0a122b
diff --git a/block/qcow2.c b/block/qcow2.c
0a122b
index 897e48a..850d1c2 100644
0a122b
--- a/block/qcow2.c
0a122b
+++ b/block/qcow2.c
0a122b
@@ -1627,7 +1627,9 @@ static int qcow2_create(const char *filename, QEMUOptionParameter *options,
0a122b
                 return -EINVAL;
0a122b
             }
0a122b
         } else if (!strcmp(options->name, BLOCK_OPT_COMPAT_LEVEL)) {
0a122b
-            if (!options->value.s || !strcmp(options->value.s, "0.10")) {
0a122b
+            if (!options->value.s) {
0a122b
+                /* keep the default */
0a122b
+            } else if (!strcmp(options->value.s, "0.10")) {
0a122b
                 version = 2;
0a122b
             } else if (!strcmp(options->value.s, "1.1")) {
0a122b
                 version = 3;
0a122b
-- 
0a122b
1.7.1
0a122b