The following changes since commit c4e0780ed1ffd056f205348d387a61b4136a45df:

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.0-pull-request' into staging (2019-03-07 18:40:43 +0000)

for you to fetch changes up to e88153ea9a40009a8ae7648282c0eac1b7f5494f:

qcow2 spec: Describe string header extensions (2019-03-08 12:26:46 +0100)

- qcow2: Support for external data files

- qcow2: Default to 4KB for the qcow2 cache entry size

- Apply block driver whitelist for -drive format=help

- Several qemu-iotests improvements

Alberto Garcia (1):

qcow2: Default to 4KB for the qcow2 cache entry size

Andrey Shinkevich (4):

iotests: open notrun files in text mode

block: iterate_format with account of whitelisting

iotests: ask QEMU for supported formats

iotests: check whitelisted formats

Kevin Wolf (21):

qemu-iotests: Test qcow2 preallocation modes

qcow2: Simplify preallocation code

qcow2: Extend spec for external data files

qcow2: Basic definitions for external data files

qcow2: Pass bs to qcow2_get_cluster_type()

qcow2: Prepare qcow2_get_cluster_type() for external data file

qcow2: Prepare count_contiguous_clusters() for external data file

qcow2: Don't assume 0 is an invalid cluster offset

qcow2: Return 0/-errno in qcow2_alloc_compressed_cluster_offset()

qcow2: Prepare qcow2_co_block_status() for data file

qcow2: External file I/O

qcow2: Return error for snapshot operation with data file

qcow2: Support external data file in qemu-img check

qcow2: Add basic data-file infrastructure

qcow2: Creating images with external data file

qcow2: Store data file name in the image

qcow2: Implement data-file-raw create option

qemu-iotests: Preallocation with external data file

qemu-iotests: General tests for qcow2 with external data file

qemu-iotests: amend with external data file

qcow2 spec: Describe string header extensions

Philippe Mathieu-Daudé (6):

tests/multiboot: Improve portability by searching bash in the $PATH

tests/bios-tables: Improve portability by searching bash in the $PATH

qemu-iotests: Improve portability by searching bash in the $PATH

qemu-iotests: Ensure GNU sed is used

ahci-test: Add dependency to qemu-img tool

qemu-iotests: Add dependency to qemu-nbd tool

From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

Supported formats listed by 'qemu' may differ from those listed by

'qemu-img' due to whitelists. Some test cases require specific formats

that may be used with qemu. They can be inquired directly by running

'qemu -drive format=help'. The response takes whitelists into account.

The method supported_formats() serves for that. The method decorator

skip_if_unsupported() checks if all requested formats are whitelisted.

If not, the test case will be skipped. That has been implemented in

the 'check' file in the way similar to the 'test notrun' mechanism.

Suggested-by: Roman Kagan <rkagan@virtuozzo.com>

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

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

Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

tests/qemu-iotests/check | 13 ++++++++++-

tests/qemu-iotests/iotests.py | 43 +++++++++++++++++++++++++++++++++++

2 files changed, 55 insertions(+), 1 deletion(-)

printf " " # prettier output with timestamps.

fi

rm -f core $seq.notrun

+ rm -f $seq.casenotrun

start=$(_wallclock)

$timestamp && printf %s " [$(date "+%T")]"

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

fi

fi

fi

-

+ if [ -f $seq.casenotrun ]

+ then

+ cat $seq.casenotrun

+ casenotrun="$casenotrun $seq"

+ fi

fi

# come here for each test, except when $showme is true

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/iotests.py

+++ b/tests/qemu-iotests/iotests.py

@@ -XXX,XX +XXX,XX @@ def notrun(reason):

print('%s not run: %s' % (seq, reason))

sys.exit(0)

+def case_notrun(reason):

+ '''Skip this test case'''

+ # Each test in qemu-iotests has a number ("seq")

+ seq = os.path.basename(sys.argv[0])

+

+ open('%s/%s.casenotrun' % (output_dir, seq), 'a').write(

+ ' [case not run] ' + reason + '\n')

+

def verify_image_format(supported_fmts=[], unsupported_fmts=[]):

assert not (supported_fmts and unsupported_fmts)

@@ -XXX,XX +XXX,XX @@ def verify_quorum():

if not supports_quorum():

notrun('quorum support missing')

+def qemu_pipe(*args):

+ '''Run qemu with an option to print something and exit (e.g. a help option),

+ and return its output'''

+ args = [qemu_prog] + qemu_opts + list(args)

+ subp = subprocess.Popen(args, stdout=subprocess.PIPE,

+ stderr=subprocess.STDOUT,

+ universal_newlines=True)

+ exitcode = subp.wait()

+ if exitcode < 0:

+ sys.stderr.write('qemu received signal %i: %s\n' % (-exitcode,

+ ' '.join(args)))

+ return subp.communicate()[0]

+

+def supported_formats(read_only=False):

+ '''Set 'read_only' to True to check ro-whitelist

+ Otherwise, rw-whitelist is checked'''

+ format_message = qemu_pipe("-drive", "format=help")

+ line = 1 if read_only else 0

+ return format_message.splitlines()[line].split(":")[1].split()

+

+def skip_if_unsupported(required_formats=[], read_only=False):

+ '''Skip Test Decorator

+ Runs the test if all the required formats are whitelisted'''

+ def skip_test_decorator(func):

+ def func_wrapper(*args, **kwargs):

+ usf_list = list(set(required_formats) -

+ set(supported_formats(read_only)))

+ if usf_list:

+ case_notrun('{}: formats {} are not whitelisted'.format(

+ args[0], usf_list))

+ else:

+ return func(*args, **kwargs)

+ return func_wrapper

+ return skip_test_decorator

+

def main(supported_fmts=[], supported_oses=['linux'], supported_cache_modes=[],

unsupported_fmts=[]):

'''Run tests'''

Provide an option to force QEMU to always keep the external data file

consistent as a standalone read-only raw image.

At the moment, this means making sure that write_zeroes requests are

forwarded to the data file instead of just updating the metadata, and

checking that no backing file is used.

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

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

include/block/block_int.h | 1 +

block/qcow2-cluster.c | 10 +++++++

block/qcow2.c | 56 ++++++++++++++++++++++++++++++++++++--

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

6 files changed, 109 insertions(+), 3 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 @@

# @data-file: the filename of the external data file that is stored in the

# image and used as a default for opening the image (since: 4.0)

#

+# @data-file-raw: True if the external data file must stay valid as a

+# standalone (read-only) raw image without looking at qcow2

+# metadata (since: 4.0)

+#

# @lazy-refcounts: on or off; only valid for compat >= 1.1

#

# @corrupt: true if the image has been marked corrupt; only valid for

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

'data': {

'compat': 'str',

'*data-file': 'str',

+ '*data-file-raw': 'bool',

'*lazy-refcounts': 'bool',

'*corrupt': 'bool',

'refcount-bits': 'int',

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

# @data-file Node to use as an external data file in which all guest

# data is stored so that only metadata remains in the qcow2

# file (since: 4.0)

+# @data-file-raw True if the external data file must stay valid as a

+# standalone (read-only) raw image without looking at qcow2

+# metadata (default: false; since: 4.0)

# @size Size of the virtual disk in bytes

# @version Compatibility level (default: v3)

# @backing-file File name of the backing file if a backing file

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

{ 'struct': 'BlockdevCreateOptionsQcow2',

'data': { 'file': 'BlockdevRef',

'*data-file': 'BlockdevRef',

+ '*data-file-raw': 'bool',

'size': 'size',

'*version': 'BlockdevQcow2Version',

'*backing-file': 'str',

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 @@ enum {

QCOW2_AUTOCLEAR_BITMAPS = 1 << QCOW2_AUTOCLEAR_BITMAPS_BITNR,

QCOW2_AUTOCLEAR_DATA_FILE_RAW = 1 << QCOW2_AUTOCLEAR_DATA_FILE_RAW_BITNR,

- QCOW2_AUTOCLEAR_MASK = QCOW2_AUTOCLEAR_BITMAPS,

+ QCOW2_AUTOCLEAR_MASK = QCOW2_AUTOCLEAR_BITMAPS

+ | QCOW2_AUTOCLEAR_DATA_FILE_RAW,

};

enum qcow2_discard_type {

@@ -XXX,XX +XXX,XX @@ static inline bool has_data_file(BlockDriverState *bs)

return (s->data_file != bs->file);

}

+static inline bool data_file_is_raw(BlockDriverState *bs)

+{

+ BDRVQcow2State *s = bs->opaque;

+ return !!(s->autoclear_features & QCOW2_AUTOCLEAR_DATA_FILE_RAW);

+}

+

static inline int64_t start_of_cluster(BDRVQcow2State *s, int64_t offset)

{

return offset & ~(s->cluster_size - 1);

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

#define BLOCK_OPT_OBJECT_SIZE "object_size"

#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_PROBE_BUF_SIZE 512

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

--- a/block/qcow2-cluster.c

+++ b/block/qcow2-cluster.c

@@ -XXX,XX +XXX,XX @@ int qcow2_cluster_zeroize(BlockDriverState *bs, uint64_t offset,

int64_t cleared;

+ /* If we have to stay in sync with an external data file, zero out

+ * s->data_file first. */

+ if (data_file_is_raw(bs)) {

+ assert(has_data_file(bs));

+ ret = bdrv_co_pwrite_zeroes(s->data_file, offset, bytes, flags);

+ if (ret < 0) {

+ return ret;

+ }

+ }

+

/* Caller must pass aligned values, except at image end */

assert(QEMU_IS_ALIGNED(offset, s->cluster_size));

assert(QEMU_IS_ALIGNED(end_offset, s->cluster_size) ||

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 coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,

"external data file");

ret = -EINVAL;

goto fail;

- } else {

- s->data_file = bs->file;

+ }

+

+ s->data_file = bs->file;

+

+ if (data_file_is_raw(bs)) {

+ error_setg(errp, "data-file-raw requires a data file");

+ ret = -EINVAL;

+ goto fail;

}

}

@@ -XXX,XX +XXX,XX @@ static int qcow2_change_backing_file(BlockDriverState *bs,

{

BDRVQcow2State *s = bs->opaque;

+ /* Adding a backing file means that the external data file alone won't be

+ * enough to make sense of the content */

+ if (backing_file && data_file_is_raw(bs)) {

+ return -EINVAL;

+ }

+

if (backing_file && strlen(backing_file) > 1023) {

return -EINVAL;

}

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

}

refcount_order = ctz32(qcow2_opts->refcount_bits);

+ if (qcow2_opts->data_file_raw && !qcow2_opts->data_file) {

+ error_setg(errp, "data-file-raw requires data-file");

+ ret = -EINVAL;

+ goto out;

+ }

+ if (qcow2_opts->data_file_raw && qcow2_opts->has_backing_file) {

+ error_setg(errp, "Backing file and data-file-raw cannot be used at "

+ "the same time");

+ ret = -EINVAL;

+ goto out;

+ }

+

if (qcow2_opts->data_file) {

if (version < 3) {

error_setg(errp, "External data files are only supported with "

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

header->incompatible_features |=

cpu_to_be64(QCOW2_INCOMPAT_DATA_FILE);

}

+ if (qcow2_opts->data_file_raw) {

+ header->autoclear_features |=

+ cpu_to_be64(QCOW2_AUTOCLEAR_DATA_FILE_RAW);

+ }

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

g_free(header);

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt

{ BLOCK_OPT_REFCOUNT_BITS, "refcount-bits" },

{ BLOCK_OPT_ENCRYPT, BLOCK_OPT_ENCRYPT_FORMAT },

{ BLOCK_OPT_COMPAT_LEVEL, "version" },

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

{ NULL, NULL },

};

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

.bitmaps = bitmaps,

.has_data_file = !!s->image_data_file,

.data_file = g_strdup(s->image_data_file),

+ .has_data_file_raw = has_data_file(bs),

+ .data_file_raw = data_file_is_raw(bs),

};

} 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,

uint64_t new_size = 0;

const char *backing_file = NULL, *backing_format = NULL, *data_file = NULL;

bool lazy_refcounts = s->use_lazy_refcounts;

+ bool data_file_raw = data_file_is_raw(bs);

const char *compat = NULL;

uint64_t cluster_size = s->cluster_size;

bool encrypt;

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

"use an external data file");

return -EINVAL;

}

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

+ data_file_raw = qemu_opt_get_bool(opts, BLOCK_OPT_DATA_FILE_RAW,

+ data_file_raw);

+ if (data_file_raw && !data_file_is_raw(bs)) {

+ error_setg(errp, "data-file-raw cannot be set on existing "

+ "images");

+ return -EINVAL;

+ }

} else {

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

* added without having it covered here */

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

}

}

+ /* data-file-raw blocks backing files, so clear it first if requested */

+ if (data_file_raw) {

+ s->autoclear_features |= QCOW2_AUTOCLEAR_DATA_FILE_RAW;

+ } else {

+ s->autoclear_features &= ~QCOW2_AUTOCLEAR_DATA_FILE_RAW;

+ }

+

if (data_file) {

g_free(s->image_data_file);

s->image_data_file = *data_file ? g_strdup(data_file) : NULL;

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

.type = QEMU_OPT_STRING,

.help = "File name of an external data file"

},

+ {

+ .name = BLOCK_OPT_DATA_FILE_RAW,

+ .type = QEMU_OPT_BOOL,

+ .help = "The external data file must stay valid as a raw image"

+ },

{

.name = BLOCK_OPT_ENCRYPT,

.type = QEMU_OPT_BOOL,

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 @@ Supported options:

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

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

cluster_size=<size> - qcow2 cluster size

compat=<str> - Compatibility level (0.10 or 1.1)

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

encrypt.cipher-mode=<str> - Name of encryption cipher mode

encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

Rather than requiring that the external data file node is passed

explicitly when creating the qcow2 node, store the filename in the

designated header extension during .bdrv_create and read it from there

as a default during .bdrv_open.

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

block/qcow2.h | 1 +

block/qcow2.c | 94 +++++++++++++++++++++++++++++++++++++-

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

4 files changed, 128 insertions(+), 2 deletions(-)

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

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

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

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

#

# @compat: compatibility level

#

+# @data-file: the filename of the external data file that is stored in the

+# image and used as a default for opening the image (since: 4.0)

+#

# @lazy-refcounts: on or off; only valid for compat >= 1.1

#

# @corrupt: true if the image has been marked corrupt; only valid for

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

{ 'struct': 'ImageInfoSpecificQCow2',