From c8fa26b697c9ca4fc90909e9c93471ea8b616c76 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Wed, 17 Jul 2013 14:45:34 +0200

Subject: [PATCH 32/38] qcow2: Use dashes instead of underscores in options

Message-id: <1378736903-18489-33-git-send-email-kwolf@redhat.com>

Patchwork-id: 54219

O-Subject: [RHEL-7.0 qemu-kvm PATCH 32/32] qcow2: Use dashes instead of underscores in options

Bugzilla: 1005818

RH-Acked-by: Fam Zheng <famz@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

Bugzilla: 1005818

This is what QMP wants to use. The options haven't been enabled in any

release yet, so we're still free to change them.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

(cherry picked from commit 64aa99d3e0333dea73d7505190659a02ca909292)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

 block/qcow2.c              |    2 +-

 block/qcow2.h              |    8 ++++----

 tests/qemu-iotests/051     |   14 +++++++-------

 tests/qemu-iotests/051.out |   30 +++++++++++++++---------------

 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c

index 9383990..abdc202 100644

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -291,7 +291,7 @@ static QemuOptsList qcow2_runtime_opts = {

     .head = QTAILQ_HEAD_INITIALIZER(qcow2_runtime_opts.head),

     .desc = {

         {

-            .name = "lazy_refcounts",

+            .name = QCOW2_OPT_LAZY_REFCOUNTS,

             .type = QEMU_OPT_BOOL,

             .help = "Postpone refcount updates",

         },

diff --git a/block/qcow2.h b/block/qcow2.h

index 3b2d5cd..dba9771 100644

--- a/block/qcow2.h

+++ b/block/qcow2.h

@@ -59,10 +59,10 @@

 #define DEFAULT_CLUSTER_SIZE 65536

-#define QCOW2_OPT_LAZY_REFCOUNTS "lazy_refcounts"

-#define QCOW2_OPT_DISCARD_REQUEST "pass_discard_request"

-#define QCOW2_OPT_DISCARD_SNAPSHOT "pass_discard_snapshot"

-#define QCOW2_OPT_DISCARD_OTHER "pass_discard_other"

+#define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"

+#define QCOW2_OPT_DISCARD_REQUEST "pass-discard-request"

+#define QCOW2_OPT_DISCARD_SNAPSHOT "pass-discard-snapshot"

+#define QCOW2_OPT_DISCARD_OTHER "pass-discard-other"

 typedef struct QCowHeader {

     uint32_t magic;

diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051

index 1cf8bf7..1f39c6a 100755

--- a/tests/qemu-iotests/051

+++ b/tests/qemu-iotests/051

@@ -72,11 +72,11 @@ echo

 echo === Enable and disable lazy refcounting on the command line, plus some invalid values ===

 echo

-run_qemu -drive file=$TEST_IMG,format=qcow2,lazy_refcounts=on

-run_qemu -drive file=$TEST_IMG,format=qcow2,lazy_refcounts=off

-run_qemu -drive file=$TEST_IMG,format=qcow2,lazy_refcounts=

-run_qemu -drive file=$TEST_IMG,format=qcow2,lazy_refcounts=42

-run_qemu -drive file=$TEST_IMG,format=qcow2,lazy_refcounts=foo

+run_qemu -drive file=$TEST_IMG,format=qcow2,lazy-refcounts=on

+run_qemu -drive file=$TEST_IMG,format=qcow2,lazy-refcounts=off

+run_qemu -drive file=$TEST_IMG,format=qcow2,lazy-refcounts=

+run_qemu -drive file=$TEST_IMG,format=qcow2,lazy-refcounts=42

+run_qemu -drive file=$TEST_IMG,format=qcow2,lazy-refcounts=foo

 echo

@@ -85,8 +85,8 @@ echo

 _make_test_img -ocompat=0.10 $size

-run_qemu -drive file=$TEST_IMG,format=qcow2,lazy_refcounts=on

-run_qemu -drive file=$TEST_IMG,format=qcow2,lazy_refcounts=off

+run_qemu -drive file=$TEST_IMG,format=qcow2,lazy-refcounts=on

+run_qemu -drive file=$TEST_IMG,format=qcow2,lazy-refcounts=off

 echo

 echo === No medium ===

diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out

index 8630382..9588d0c 100644

--- a/tests/qemu-iotests/051.out

+++ b/tests/qemu-iotests/051.out

@@ -22,35 +22,35 @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,unknown_opt=foo: could not

 === Enable and disable lazy refcounting on the command line, plus some invalid values ===

-Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=on

+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=on

 QEMU 1.5.50 monitor - type 'help' for more information

 (qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K

-Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=off

+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=off

 QEMU 1.5.50 monitor - type 'help' for more information

 (qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K

-Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=

-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=: Parameter 'lazy_refcounts' expects 'on' or 'off'

-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=: could not open disk image TEST_DIR/t.qcow2: Invalid argument

+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=

+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=: Parameter 'lazy-refcounts' expects 'on' or 'off'

+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=: could not open disk image TEST_DIR/t.qcow2: Invalid argument

-Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=42

-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=42: Parameter 'lazy_refcounts' expects 'on' or 'off'

-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=42: could not open disk image TEST_DIR/t.qcow2: Invalid argument

+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=42

+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=42: Parameter 'lazy-refcounts' expects 'on' or 'off'

+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=42: could not open disk image TEST_DIR/t.qcow2: Invalid argument

-Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=foo

-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=foo: Parameter 'lazy_refcounts' expects 'on' or 'off'

-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=foo: could not open disk image TEST_DIR/t.qcow2: Invalid argument

+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=foo

+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=foo: Parameter 'lazy-refcounts' expects 'on' or 'off'

+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=foo: could not open disk image TEST_DIR/t.qcow2: Invalid argument

 === With version 2 images enabling lazy refcounts must fail ===

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 

-Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=on

-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=on: Lazy refcounts require a qcow2 image with at least qemu 1.1 compatibility level

-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=on: could not open disk image TEST_DIR/t.qcow2: Invalid argument

+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=on

+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=on: Lazy refcounts require a qcow2 image with at least qemu 1.1 compatibility level

+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=on: could not open disk image TEST_DIR/t.qcow2: Invalid argument

-Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy_refcounts=off

+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=off

 QEMU 1.5.50 monitor - type 'help' for more information

 (qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K

-- 

1.7.1