The following changes since commit d5c75ec500d96f1d93447f990cd5a4ef5ba27fae:

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-05-08-1' into staging (2020-05-12 17:00:10 +0100)

are available in the Git repository at:

https://github.com/XanClic/qemu.git tags/pull-block-2020-05-13

for you to fetch changes up to fc9aefc8c0d3c6392656ea661ce72c1583b70bbd:

block/block-copy: fix use-after-free of task pointer (2020-05-13 14:20:31 +0200)

Block patches:

- zstd compression for qcow2

- Fix use-after-free

Vladimir Sementsov-Ogievskiy (1):

block/block-copy: fix use-after-free of task pointer

docs/interop/qcow2.txt | 1 +

configure | 2 +-

qapi/block-core.json | 23 ++-

block/qcow2.h | 20 ++-

include/block/block_int.h | 1 +

block/block-copy.c | 2 +-

block/qcow2-threads.c | 240 +++++++++++++++++++++++++++++--

block/qcow2.c | 120 ++++++++++++++++

tests/qemu-iotests/031.out | 14 +-

tests/qemu-iotests/036.out | 4 +-

tests/qemu-iotests/049.out | 102 ++++++-------

tests/qemu-iotests/060.out | 1 +

tests/qemu-iotests/061.out | 34 +++--

tests/qemu-iotests/065 | 28 ++--

tests/qemu-iotests/080 | 2 +-

tests/qemu-iotests/082.out | 48 ++++++-

tests/qemu-iotests/085.out | 38 ++---

tests/qemu-iotests/144.out | 4 +-

tests/qemu-iotests/182.out | 2 +-

tests/qemu-iotests/185.out | 8 +-

tests/qemu-iotests/198.out | 2 +

tests/qemu-iotests/206.out | 5 +

tests/qemu-iotests/242.out | 5 +

tests/qemu-iotests/255.out | 8 +-

tests/qemu-iotests/274.out | 49 ++++---

tests/qemu-iotests/280.out | 2 +-

tests/qemu-iotests/287 | 152 ++++++++++++++++++++

tests/qemu-iotests/287.out | 67 +++++++++

tests/qemu-iotests/common.filter | 3 +-

tests/qemu-iotests/group | 1 +

30 files changed, 825 insertions(+), 163 deletions(-)

create mode 100755 tests/qemu-iotests/287

create mode 100644 tests/qemu-iotests/287.out

2.26.2

From: Denis Plotnikov <dplotnikov@virtuozzo.com>

The patch adds some preparation parts for incompatible compression type

feature to qcow2 allowing the use different compression methods for

image clusters (de)compressing.

It is implied that the compression type is set on the image creation and

can be changed only later by image conversion, thus compression type

defines the only compression algorithm used for the image, and thus,

for all image clusters.

The goal of the feature is to add support of other compression methods

to qcow2. For example, ZSTD which is more effective on compression than ZLIB.

The default compression is ZLIB. Images created with ZLIB compression type

are backward compatible with older qemu versions.

Adding of the compression type breaks a number of tests because now the

compression type is reported on image creation and there are some changes

in the qcow2 header in size and offsets.

The tests are fixed in the following ways:

* filter out compression_type for many tests

* fix header size, feature table size and backing file offset

affected tests: 031, 036, 061, 080

header_size +=8: 1 byte compression type

7 bytes padding

feature_table += 48: incompatible feature compression type

backing_file_offset += 56 (8 + 48 -> header_change + feature_table_change)

* add "compression type" for test output matching when it isn't filtered

affected tests: 049, 060, 061, 065, 082, 085, 144, 182, 185, 198, 206,

242, 255, 274, 280

Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

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

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

QAPI part:

Acked-by: Markus Armbruster <armbru@redhat.com>

Message-Id: <20200507082521.29210-2-dplotnikov@virtuozzo.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>

qapi/block-core.json | 22 +++++-

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

include/block/block_int.h | 1 +

block/qcow2.c | 113 +++++++++++++++++++++++++++++++

tests/qemu-iotests/031.out | 14 ++--

tests/qemu-iotests/036.out | 4 +-

tests/qemu-iotests/049.out | 102 ++++++++++++++--------------

tests/qemu-iotests/060.out | 1 +

tests/qemu-iotests/061.out | 34 ++++++----

tests/qemu-iotests/065 | 28 +++++---

tests/qemu-iotests/080 | 2 +-

tests/qemu-iotests/082.out | 48 +++++++++++--

tests/qemu-iotests/085.out | 38 +++++------

tests/qemu-iotests/144.out | 4 +-

tests/qemu-iotests/182.out | 2 +-

tests/qemu-iotests/185.out | 8 +--

tests/qemu-iotests/198.out | 2 +

tests/qemu-iotests/206.out | 5 ++

tests/qemu-iotests/242.out | 5 ++

tests/qemu-iotests/255.out | 8 +--

tests/qemu-iotests/274.out | 49 +++++++-------

tests/qemu-iotests/280.out | 2 +-

tests/qemu-iotests/common.filter | 3 +-

23 files changed, 365 insertions(+), 150 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -XXX,XX +XXX,XX @@

#

# @bitmaps: A list of qcow2 bitmap details (since 4.0)

#

+# @compression-type: the image cluster compression method (since 5.1)

+#

# Since: 1.7

##

{ 'struct': 'ImageInfoSpecificQCow2',

@@ -XXX,XX +XXX,XX @@

'*corrupt': 'bool',

'refcount-bits': 'int',

'*encrypt': 'ImageInfoSpecificQCow2Encryption',

- '*bitmaps': ['Qcow2BitmapInfo']

+ '*bitmaps': ['Qcow2BitmapInfo'],

+ 'compression-type': 'Qcow2CompressionType'

} }

##

@@ -XXX,XX +XXX,XX @@

'data': [ 'v2', 'v3' ] }

+##

+# @Qcow2CompressionType:

+#

+# Compression type used in qcow2 image file

+#

+# @zlib: zlib compression, see <http://zlib.net/>

+#

+# Since: 5.1

+##

+{ 'enum': 'Qcow2CompressionType',

+ 'data': [ 'zlib' ] }

##

# @BlockdevCreateOptionsQcow2:

#

@@ -XXX,XX +XXX,XX @@

# allowed values: off, falloc, full, metadata)

# @lazy-refcounts: True if refcounts may be updated lazily (default: off)

# @refcount-bits: Width of reference counts in bits (default: 16)

+# @compression-type: The image cluster compression method

+# (default: zlib, since 5.1)

#

# Since: 2.12

##

@@ -XXX,XX +XXX,XX @@

'*cluster-size': 'size',

'*preallocation': 'PreallocMode',

'*lazy-refcounts': 'bool',

- '*refcount-bits': 'int' } }

+ '*refcount-bits': 'int',

+ '*compression-type':'Qcow2CompressionType' } }

##

# @BlockdevCreateOptionsQed:

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qcow2.h

+++ b/block/qcow2.h

@@ -XXX,XX +XXX,XX @@ typedef struct QCowHeader {

uint32_t refcount_order;

uint32_t header_length;

+ /* Additional fields */

+ uint8_t compression_type;

+

+ /* header must be a multiple of 8 */

+ uint8_t padding[7];

} QEMU_PACKED QCowHeader;

+QEMU_BUILD_BUG_ON(!QEMU_IS_ALIGNED(sizeof(QCowHeader), 8));

+

typedef struct QEMU_PACKED QCowSnapshotHeader {

/* header is 8 byte aligned */

uint64_t l1_table_offset;

@@ -XXX,XX +XXX,XX @@ enum {

QCOW2_INCOMPAT_DIRTY_BITNR = 0,

QCOW2_INCOMPAT_CORRUPT_BITNR = 1,

QCOW2_INCOMPAT_DATA_FILE_BITNR = 2,

+ QCOW2_INCOMPAT_COMPRESSION_BITNR = 3,

QCOW2_INCOMPAT_DIRTY = 1 << QCOW2_INCOMPAT_DIRTY_BITNR,

QCOW2_INCOMPAT_CORRUPT = 1 << QCOW2_INCOMPAT_CORRUPT_BITNR,

QCOW2_INCOMPAT_DATA_FILE = 1 << QCOW2_INCOMPAT_DATA_FILE_BITNR,

+ QCOW2_INCOMPAT_COMPRESSION = 1 << QCOW2_INCOMPAT_COMPRESSION_BITNR,

QCOW2_INCOMPAT_MASK = QCOW2_INCOMPAT_DIRTY

| QCOW2_INCOMPAT_CORRUPT

- | QCOW2_INCOMPAT_DATA_FILE,

+ | QCOW2_INCOMPAT_DATA_FILE

+ | QCOW2_INCOMPAT_COMPRESSION,

};

/* Compatible feature bits */

@@ -XXX,XX +XXX,XX @@ typedef struct BDRVQcow2State {

bool metadata_preallocation_checked;

bool metadata_preallocation;

+ /*

+ * Compression type used for the image. Default: 0 - ZLIB

+ * The image compression type is set on image creation.

+ * For now, the only way to change the compression type

+ * is to convert the image with the desired compression type set.

+ */

+ Qcow2CompressionType compression_type;

} BDRVQcow2State;

typedef struct Qcow2COWRegion {

diff --git a/include/block/block_int.h b/include/block/block_int.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -XXX,XX +XXX,XX @@

#define BLOCK_OPT_REFCOUNT_BITS "refcount_bits"

#define BLOCK_OPT_DATA_FILE "data_file"

#define BLOCK_OPT_DATA_FILE_RAW "data_file_raw"

+#define BLOCK_OPT_COMPRESSION_TYPE "compression_type"

#define BLOCK_PROBE_BUF_SIZE 512

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -XXX,XX +XXX,XX @@ static int qcow2_update_options(BlockDriverState *bs, QDict *options,

return ret;

+static int validate_compression_type(BDRVQcow2State *s, Error **errp)

+ switch (s->compression_type) {

+ case QCOW2_COMPRESSION_TYPE_ZLIB:

+ break;

+

+ default:

+ error_setg(errp, "qcow2: unknown compression type: %u",

+ s->compression_type);

+ return -ENOTSUP;

+ }

+

+ /*

+ * if the compression type differs from QCOW2_COMPRESSION_TYPE_ZLIB

+ * the incompatible feature flag must be set

+ */

+ if (s->compression_type == QCOW2_COMPRESSION_TYPE_ZLIB) {

+ if (s->incompatible_features & QCOW2_INCOMPAT_COMPRESSION) {

+ error_setg(errp, "qcow2: Compression type incompatible feature "

+ "bit must not be set");

+ return -EINVAL;

+ }

+ } else {

+ if (!(s->incompatible_features & QCOW2_INCOMPAT_COMPRESSION)) {

+ error_setg(errp, "qcow2: Compression type incompatible feature "

+ "bit must be set");

+ return -EINVAL;

+ }

+ }

+

+ return 0;

/* Called with s->lock held. */

static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,

int flags, Error **errp)

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,

s->compatible_features = header.compatible_features;

s->autoclear_features = header.autoclear_features;

+ /*

+ * Handle compression type

+ * Older qcow2 images don't contain the compression type header.

+ * Distinguish them by the header length and use

+ * the only valid (default) compression type in that case

+ */

+ if (header.header_length > offsetof(QCowHeader, compression_type)) {

+ s->compression_type = header.compression_type;

+ } else {

+ s->compression_type = QCOW2_COMPRESSION_TYPE_ZLIB;

+ }

+

+ ret = validate_compression_type(s, errp);

+ if (ret) {

+ goto fail;

+ }

+

if (s->incompatible_features & ~QCOW2_INCOMPAT_MASK) {

void *feature_table = NULL;

qcow2_read_extensions(bs, header.header_length, ext_end,

@@ -XXX,XX +XXX,XX @@ int qcow2_update_header(BlockDriverState *bs)

total_size = bs->total_sectors * BDRV_SECTOR_SIZE;

refcount_table_clusters = s->refcount_table_size >> (s->cluster_bits - 3);

+ ret = validate_compression_type(s, NULL);

+ if (ret) {

+ goto fail;

+ }

+

*header = (QCowHeader) {

/* Version 2 fields */

.magic = cpu_to_be32(QCOW_MAGIC),

@@ -XXX,XX +XXX,XX @@ int qcow2_update_header(BlockDriverState *bs)

.autoclear_features = cpu_to_be64(s->autoclear_features),

.refcount_order = cpu_to_be32(s->refcount_order),

.header_length = cpu_to_be32(header_length),

+ .compression_type = s->compression_type,

};

/* For older versions, write a shorter header */

@@ -XXX,XX +XXX,XX @@ int qcow2_update_header(BlockDriverState *bs)

.bit = QCOW2_INCOMPAT_DATA_FILE_BITNR,

.name = "external data file",

},

+ {

+ .type = QCOW2_FEAT_TYPE_INCOMPATIBLE,

+ .bit = QCOW2_INCOMPAT_COMPRESSION_BITNR,

+ .name = "compression type",

+ },

{

.type = QCOW2_FEAT_TYPE_COMPATIBLE,

.bit = QCOW2_COMPAT_LAZY_REFCOUNTS_BITNR,

@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)

uint64_t* refcount_table;

Error *local_err = NULL;

int ret;

+ uint8_t compression_type = QCOW2_COMPRESSION_TYPE_ZLIB;

assert(create_options->driver == BLOCKDEV_DRIVER_QCOW2);

qcow2_opts = &create_options->u.qcow2;

@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)

}

}

+ if (qcow2_opts->has_compression_type &&

+ qcow2_opts->compression_type != QCOW2_COMPRESSION_TYPE_ZLIB) {

+

+ ret = -EINVAL;

+

+ if (version < 3) {

+ error_setg(errp, "Non-zlib compression type is only supported with "

+ "compatibility level 1.1 and above (use version=v3 or "

+ "greater)");

+ goto out;

+ }

+

+ switch (qcow2_opts->compression_type) {

+ default:

+ error_setg(errp, "Unknown compression type");

+ goto out;

+ }

+

+ compression_type = qcow2_opts->compression_type;

+ }

+

/* Create BlockBackend to write to the image */

blk = blk_new_with_bs(bs, BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL,

errp);

@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)

.refcount_table_offset = cpu_to_be64(cluster_size),

.refcount_table_clusters = cpu_to_be32(1),

.refcount_order = cpu_to_be32(refcount_order),

+ /* don't deal with endianness since compression_type is 1 byte long */

+ .compression_type = compression_type,

.header_length = cpu_to_be32(sizeof(*header)),

};

@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)

header->autoclear_features |=

cpu_to_be64(QCOW2_AUTOCLEAR_DATA_FILE_RAW);

}

+ if (compression_type != QCOW2_COMPRESSION_TYPE_ZLIB) {

+ header->incompatible_features |=

+ cpu_to_be64(QCOW2_INCOMPAT_COMPRESSION);

+ }

ret = blk_pwrite(blk, 0, header, cluster_size, 0);

g_free(header);

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv,

{ BLOCK_OPT_ENCRYPT, BLOCK_OPT_ENCRYPT_FORMAT },

{ BLOCK_OPT_COMPAT_LEVEL, "version" },

{ BLOCK_OPT_DATA_FILE_RAW, "data-file-raw" },

+ { BLOCK_OPT_COMPRESSION_TYPE, "compression-type" },

{ NULL, NULL },

};

@@ -XXX,XX +XXX,XX @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs,

.data_file = g_strdup(s->image_data_file),

.has_data_file_raw = has_data_file(bs),

.data_file_raw = data_file_is_raw(bs),

+ .compression_type = s->compression_type,

};

} else {

/* if this assertion fails, this probably means a new version was

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

"images");

return -EINVAL;

}

+ } else if (!strcmp(desc->name, BLOCK_OPT_COMPRESSION_TYPE)) {

+ const char *ct_name =

+ qemu_opt_get(opts, BLOCK_OPT_COMPRESSION_TYPE);

+ int compression_type =

+ qapi_enum_parse(&Qcow2CompressionType_lookup, ct_name, -1,

+ NULL);

+ if (compression_type == -1) {

+ error_setg(errp, "Unknown compression type: %s", ct_name);

+ return -ENOTSUP;

+ }

+

+ if (compression_type != s->compression_type) {

+ error_setg(errp, "Changing the compression type "

+ "is not supported");

+ return -ENOTSUP;

+ }

} else {

/* if this point is reached, this probably means a new option was

* added without having it covered here */

@@ -XXX,XX +XXX,XX @@ static QemuOptsList qcow2_create_opts = {

.help = "Width of a reference count entry in bits",

.def_value_str = "16"

},

+ {

+ .name = BLOCK_OPT_COMPRESSION_TYPE,

+ .type = QEMU_OPT_STRING,

+ .help = "Compression method used for image cluster compression",

+ .def_value_str = "zlib"

+ },

{ /* end of list */ }

}

};

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ incompatible_features []

compatible_features []

autoclear_features []

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

Header extension:

@@ -XXX,XX +XXX,XX @@ incompatible_features []

compatible_features []

autoclear_features []

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

Header extension:

@@ -XXX,XX +XXX,XX @@ No errors were found on the image.

magic 0x514649fb

version 3

-backing_file_offset 0x1d8

+backing_file_offset 0x210

backing_file_size 0x17

cluster_bits 16

size 67108864

@@ -XXX,XX +XXX,XX @@ incompatible_features []

compatible_features []

autoclear_features []

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0xe2792aca

@@ -XXX,XX +XXX,XX @@ data 'host_device'

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

Header extension:

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ compatible_features []

autoclear_features [63]

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

@@ -XXX,XX +XXX,XX @@ compatible_features []

autoclear_features []

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

*** done

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ QA output created by 049

== 1. Traditional size parameter ==

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024b

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1k

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1K

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1G

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1T

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0b

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5k

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5K

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5G

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5T

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

== 2. Specifying size via -o ==

qemu-img create -f qcow2 -o size=1024 TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1024b TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1k TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1K TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1M TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1G TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1T TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1024.0 TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1024.0b TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1.5k TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1.5K TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1.5M TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1.5G TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o size=1.5T TEST_DIR/t.qcow2

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

== 3. Invalid sizes ==

@@ -XXX,XX +XXX,XX @@ qemu-img: TEST_DIR/t.qcow2: The image size must be specified only once

== Check correct interpretation of suffixes for cluster size ==

qemu-img create -f qcow2 -o cluster_size=1024 TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o cluster_size=1024b TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o cluster_size=1k TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o cluster_size=1K TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o cluster_size=1M TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1048576 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1048576 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o cluster_size=1024.0 TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o cluster_size=1024.0b TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o cluster_size=0.5k TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o cluster_size=0.5K TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o cluster_size=0.5M TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=524288 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=524288 lazy_refcounts=off refcount_bits=16 compression_type=zlib

== Check compat level option ==

qemu-img create -f qcow2 -o compat=0.10 TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o compat=1.1 TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o compat=0.42 TEST_DIR/t.qcow2 64M

qemu-img: TEST_DIR/t.qcow2: Invalid parameter '0.42'

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o compat=foobar TEST_DIR/t.qcow2 64M

qemu-img: TEST_DIR/t.qcow2: Invalid parameter 'foobar'

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

== Check preallocation option ==

qemu-img create -f qcow2 -o preallocation=off TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=off lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=off lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o preallocation=metadata TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=metadata lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=metadata lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o preallocation=1234 TEST_DIR/t.qcow2 64M

qemu-img: TEST_DIR/t.qcow2: Invalid parameter '1234'

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=1234 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=1234 lazy_refcounts=off refcount_bits=16 compression_type=zlib

== Check encryption option ==

qemu-img create -f qcow2 -o encryption=off TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 --object secret,id=sec0,data=123456 -o encryption=on,encrypt.key-secret=sec0 TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=on encrypt.key-secret=sec0 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=on encrypt.key-secret=sec0 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

== Check lazy_refcounts option (only with v3) ==

qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=off TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=on TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=on refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=on refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=off TEST_DIR/t.qcow2 64M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=on TEST_DIR/t.qcow2 64M

qemu-img: TEST_DIR/t.qcow2: Lazy refcounts only supported with compatibility level 1.1 and above (use version=v3 or greater)

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=on refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=on refcount_bits=16 compression_type=zlib

*** done

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ virtual size: 64 MiB (67108864 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: false

refcount bits: 16

corrupt: true

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ incompatible_features []

compatible_features [0]

autoclear_features []

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

magic 0x514649fb

@@ -XXX,XX +XXX,XX @@ incompatible_features []

compatible_features [0]

autoclear_features []

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

magic 0x514649fb

@@ -XXX,XX +XXX,XX @@ incompatible_features [0]

compatible_features [0]

autoclear_features []

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

ERROR cluster 5 refcount=0 reference=1

@@ -XXX,XX +XXX,XX @@ incompatible_features []

compatible_features [42]

autoclear_features [42]

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

magic 0x514649fb

@@ -XXX,XX +XXX,XX @@ incompatible_features []

compatible_features [0]

autoclear_features []

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

read 65536/65536 bytes at offset 44040192

@@ -XXX,XX +XXX,XX @@ incompatible_features [0]

compatible_features [0]

autoclear_features []

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

ERROR cluster 5 refcount=0 reference=1

@@ -XXX,XX +XXX,XX @@ incompatible_features []

compatible_features []

autoclear_features []

refcount_order 4

-header_length 104

+header_length 112

Header extension:

magic 0x6803f857

-length 288

+length 336

data <binary>

read 131072/131072 bytes at offset 0

@@ -XXX,XX +XXX,XX @@ virtual size: 64 MiB (67108864 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: false

refcount bits: 16

data file: TEST_DIR/t.IMGFMT.data

@@ -XXX,XX +XXX,XX @@ virtual size: 64 MiB (67108864 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: false

refcount bits: 16

data file: foo

@@ -XXX,XX +XXX,XX @@ virtual size: 64 MiB (67108864 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: false

refcount bits: 16

data file raw: false

@@ -XXX,XX +XXX,XX @@ virtual size: 64 MiB (67108864 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: false

refcount bits: 16

data file: TEST_DIR/t.IMGFMT.data

@@ -XXX,XX +XXX,XX @@ virtual size: 64 MiB (67108864 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: false

refcount bits: 16

data file: TEST_DIR/t.IMGFMT.data

@@ -XXX,XX +XXX,XX @@ virtual size: 64 MiB (67108864 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: false

refcount bits: 16

data file: TEST_DIR/t.IMGFMT.data

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/065

+++ b/tests/qemu-iotests/065

@@ -XXX,XX +XXX,XX @@ class TestQMP(TestImageInfoSpecific):

class TestQCow2(TestQemuImgInfo):

'''Testing a qcow2 version 2 image'''

img_options = 'compat=0.10'

- json_compare = { 'compat': '0.10', 'refcount-bits': 16 }

- human_compare = [ 'compat: 0.10', 'refcount bits: 16' ]

+ json_compare = { 'compat': '0.10', 'refcount-bits': 16,

+ 'compression-type': 'zlib' }

+ human_compare = [ 'compat: 0.10', 'compression type: zlib',

+ 'refcount bits: 16' ]

class TestQCow3NotLazy(TestQemuImgInfo):

'''Testing a qcow2 version 3 image with lazy refcounts disabled'''

img_options = 'compat=1.1,lazy_refcounts=off'

json_compare = { 'compat': '1.1', 'lazy-refcounts': False,

- 'refcount-bits': 16, 'corrupt': False }

- human_compare = [ 'compat: 1.1', 'lazy refcounts: false',

- 'refcount bits: 16', 'corrupt: false' ]

+ 'refcount-bits': 16, 'corrupt': False,

+ 'compression-type': 'zlib' }

+ human_compare = [ 'compat: 1.1', 'compression type: zlib',

+ 'lazy refcounts: false', 'refcount bits: 16',

+ 'corrupt: false' ]

class TestQCow3Lazy(TestQemuImgInfo):

'''Testing a qcow2 version 3 image with lazy refcounts enabled'''

img_options = 'compat=1.1,lazy_refcounts=on'

json_compare = { 'compat': '1.1', 'lazy-refcounts': True,

- 'refcount-bits': 16, 'corrupt': False }

- human_compare = [ 'compat: 1.1', 'lazy refcounts: true',

- 'refcount bits: 16', 'corrupt: false' ]

+ 'refcount-bits': 16, 'corrupt': False,

+ 'compression-type': 'zlib' }

+ human_compare = [ 'compat: 1.1', 'compression type: zlib',

+ 'lazy refcounts: true', 'refcount bits: 16',

+ 'corrupt: false' ]

class TestQCow3NotLazyQMP(TestQMP):

'''Testing a qcow2 version 3 image with lazy refcounts disabled, opening

@@ -XXX,XX +XXX,XX @@ class TestQCow3NotLazyQMP(TestQMP):

img_options = 'compat=1.1,lazy_refcounts=off'

qemu_options = 'lazy-refcounts=on'

compare = { 'compat': '1.1', 'lazy-refcounts': False,

- 'refcount-bits': 16, 'corrupt': False }

+ 'refcount-bits': 16, 'corrupt': False,

+ 'compression-type': 'zlib' }

class TestQCow3LazyQMP(TestQMP):

@@ -XXX,XX +XXX,XX @@ class TestQCow3LazyQMP(TestQMP):

img_options = 'compat=1.1,lazy_refcounts=on'

qemu_options = 'lazy-refcounts=off'

compare = { 'compat': '1.1', 'lazy-refcounts': True,

- 'refcount-bits': 16, 'corrupt': False }

+ 'refcount-bits': 16, 'corrupt': False,

+ 'compression-type': 'zlib' }

TestImageInfoSpecific = None

TestQemuImgInfo = None

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/080

+++ b/tests/qemu-iotests/080

@@ -XXX,XX +XXX,XX @@ _supported_os Linux

# - This is generally a test for compat=1.1 images

_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file 'compat=0.10'

-header_size=104

+header_size=112

offset_backing_file_offset=8

offset_backing_file_size=16

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ QA output created by 082

=== create: Options specified more than once ===

Testing: create -f foo -f qcow2 TEST_DIR/t.qcow2 128M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

image: TEST_DIR/t.IMGFMT

file format: IMGFMT

virtual size: 128 MiB (134217728 bytes)

cluster_size: 65536

Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on TEST_DIR/t.qcow2 128M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=4096 lazy_refcounts=on refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=4096 lazy_refcounts=on refcount_bits=16 compression_type=zlib

image: TEST_DIR/t.IMGFMT

file format: IMGFMT

virtual size: 128 MiB (134217728 bytes)

cluster_size: 4096

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: true

refcount bits: 16

corrupt: false

Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on -o cluster_size=8k TEST_DIR/t.qcow2 128M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=on refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=on refcount_bits=16 compression_type=zlib

image: TEST_DIR/t.IMGFMT

file format: IMGFMT

virtual size: 128 MiB (134217728 bytes)

cluster_size: 8192

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: true

refcount bits: 16

corrupt: false

Testing: create -f qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 128M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=off refcount_bits=16 compression_type=zlib

image: TEST_DIR/t.IMGFMT

file format: IMGFMT

virtual size: 128 MiB (134217728 bytes)

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

size=<size> - Virtual disk size

Testing: create -f qcow2 -u -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 128M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 backing_file=TEST_DIR/t.qcow2,,help cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 backing_file=TEST_DIR/t.qcow2,,help cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

Testing: create -f qcow2 -u -o backing_file=TEST_DIR/t.qcow2,,? TEST_DIR/t.qcow2 128M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 backing_file=TEST_DIR/t.qcow2,,? cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 backing_file=TEST_DIR/t.qcow2,,? cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

Testing: create -f qcow2 -o backing_file=TEST_DIR/t.qcow2, -o help TEST_DIR/t.qcow2 128M

qemu-img: Invalid option list: backing_file=TEST_DIR/t.qcow2,

@@ -XXX,XX +XXX,XX @@ Supported qcow2 options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ qemu-img: Format driver 'bochs' does not support image creation

=== convert: Options specified more than once ===

Testing: create -f qcow2 TEST_DIR/t.qcow2 128M

-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16

+Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib

Testing: convert -f foo -f qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

image: TEST_DIR/t.IMGFMT.base

@@ -XXX,XX +XXX,XX @@ virtual size: 128 MiB (134217728 bytes)

cluster_size: 4096

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: true

refcount bits: 16

corrupt: false

@@ -XXX,XX +XXX,XX @@ virtual size: 128 MiB (134217728 bytes)

cluster_size: 8192

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: true

refcount bits: 16

corrupt: false

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Supported qcow2 options:

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ virtual size: 128 MiB (134217728 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: true

refcount bits: 16

corrupt: false

@@ -XXX,XX +XXX,XX @@ virtual size: 130 MiB (136314880 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: false

refcount bits: 16

corrupt: false

@@ -XXX,XX +XXX,XX @@ virtual size: 132 MiB (138412032 bytes)

cluster_size: 65536

Format specific information:

compat: 1.1

+ compression type: zlib

lazy refcounts: true

refcount bits: 16

corrupt: false

@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':

backing_fmt=<str> - Image format of the base image

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])

+ compression_type=<str> - Compression method used for image cluster compression

data_file=<str> - File name of an external data file

data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image

encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':

backing_fmt=<str> - Image format of the base image