Commit 64aa99d3 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qcow2: Use dashes instead of underscores in options 



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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 57975222

block/qcow2.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

        },

block/qcow2.h

+4 −4
Original line number Diff line number Diff line
@@ -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;

tests/qemu-iotests/051

+7 −7
Original line number Diff line number Diff line
@@ -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 ===

tests/qemu-iotests/051.out

+15 −15
Original line number Diff line number Diff line
@@ -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) qququiquit



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) qququiquit



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) qququiquit