Right now, _filter_img_create just filters out everything that looks

format-dependent, and applies some filename filters. That means that we

have to add another filter line every time some format gets a new

creation option. This can be avoided by instead discarding everything

and just keeping what we know is format-independent (format, size,

backing file, encryption information[1], preallocation) or just

interesting to have in the reference output (external data file path).

Furthermore, we probably want to sort these options. Format drivers are

not required to define them in any specific order, so the output is

effectively random (although this has never bothered us until now). We

need a specific order for our reference outputs, though. Unfortunately,

just using a plain "sort" would change a lot of existing reference

outputs, so we have to pre-filter the option keys to keep our existing

order (fmt, size, backing*, data, encryption info, preallocation).

Finally, this makes it difficult for _filter_img_create to automagically

work for QMP output. Thus, this patch adds a separate

_filter_img_create_for_qmp function that echos every line verbatim that

does not start with "Formatting", and pipes those "Formatting" lines to

_filter_img_create.

[1] Actually, the only thing that is really important is whether

encryption is enabled or not. A patch by Maxim thus removes all

other "encrypt.*" options from the output:

https://lists.nongnu.org/archive/html/qemu-block/2020-06/msg00339.html

But that patch needs to come later so we can get away with changing

as few reference outputs in this patch here as possible.

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

Message-Id: <20200618150628.2169239-2-mreitz@redhat.com>

---

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

tests/qemu-iotests/141 | 2 +-

tests/qemu-iotests/153 | 9 ++-

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

4 files changed, 78 insertions(+), 31 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

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

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

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

qemu-img: TEST_DIR/t.IMGFMT: Refcount width must be a power of two and may not exceed 64 bits

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

qemu-img: TEST_DIR/t.IMGFMT: Refcount width must be a power of two and may not exceed 64 bits

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 refcount_bits=-1

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

qemu-img: TEST_DIR/t.IMGFMT: Refcount width must be a power of two and may not exceed 64 bits

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

qemu-img: TEST_DIR/t.IMGFMT: Refcount width must be a power of two and may not exceed 64 bits

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/141

+++ b/tests/qemu-iotests/141

@@ -XXX,XX +XXX,XX @@ test_blockjob()

_send_qemu_cmd $QEMU_HANDLE \

"$1" \

"$2" \

- | _filter_img_create | _filter_qmp_empty_return

+ | _filter_img_create_in_qmp | _filter_qmp_empty_return

# We want this to return an error because the block job is still running

_send_qemu_cmd $QEMU_HANDLE \

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/153

+++ b/tests/qemu-iotests/153

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

echo

echo "== Creating ${TEST_IMG}.[abc] ==" | _filter_testdir

-(

- $QEMU_IMG create -f qcow2 "${TEST_IMG}.a" -b "${TEST_IMG}"

- $QEMU_IMG create -f qcow2 "${TEST_IMG}.b" -b "${TEST_IMG}"

- $QEMU_IMG create -f qcow2 "${TEST_IMG}.c" -b "${TEST_IMG}.b"

-) | _filter_img_create

+$QEMU_IMG create -f qcow2 "${TEST_IMG}.a" -b "${TEST_IMG}" | _filter_img_create

+$QEMU_IMG create -f qcow2 "${TEST_IMG}.b" -b "${TEST_IMG}" | _filter_img_create

+$QEMU_IMG create -f qcow2 "${TEST_IMG}.c" -b "${TEST_IMG}.b" \

+ | _filter_img_create

echo

echo "== Two devices sharing the same file in backing chain =="

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/common.filter

+++ b/tests/qemu-iotests/common.filter

@@ -XXX,XX +XXX,XX @@ _filter_actual_image_size()

# replace driver-specific options in the "Formatting..." line

_filter_img_create()

{

- data_file_filter=()

- if data_file=$(_get_data_file "$TEST_IMG"); then

- data_file_filter=(-e "s# data_file=$data_file##")

+ # Split the line into the pre-options part ($filename_part, which

+ # precedes ", fmt=") and the options part ($options, which starts

+ # with "fmt=")

+ readarray -td '' formatting_line < <(sed -e 's/, fmt=/\x0/')

+

+ filename_part=${formatting_line[0]}

+ if [ -n "${formatting_line[1]}" ]; then

+ options="fmt=${formatting_line[1]}"

+ else

+ options=''

+ fi

+

+ # Set grep_data_file to '\|data_file' to keep it; make it empty

+ # to drop it.

+ # We want to drop it if it is part of the global $IMGOPTS, and we

+ # want to keep it otherwise (if the test specifically wants to

+ # test data files).

+ grep_data_file='\|data_file'

+ if _get_data_file "$TEST_IMG" > /dev/null; then

+ grep_data_file=''

fi

- $SED "${data_file_filter[@]}" \

+ filename_filters=(

-e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \

-e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \

-e "s#$TEST_DIR#TEST_DIR#g" \

-e "s#$SOCK_DIR#SOCK_DIR#g" \

-e "s#$IMGFMT#IMGFMT#g" \

-e 's#nbd:127.0.0.1:[0-9]\\+#TEST_DIR/t.IMGFMT#g' \

- -e 's#nbd+unix:///\??socket=SOCK_DIR/nbd#TEST_DIR/t.IMGFMT#g' \

- -e "s# encryption=off##g" \

- -e "s# cluster_size=[0-9]\\+##g" \

- -e "s# table_size=[0-9]\\+##g" \

- -e "s# compat=[^ ]*##g" \

- -e "s# compat6=\\(on\\|off\\)##g" \

- -e "s# static=\\(on\\|off\\)##g" \

- -e "s# zeroed_grain=\\(on\\|off\\)##g" \

- -e "s# subformat=[^ ]*##g" \

- -e "s# adapter_type=[^ ]*##g" \

- -e "s# hwversion=[^ ]*##g" \

- -e "s# lazy_refcounts=\\(on\\|off\\)##g" \

- -e "s# block_size=[0-9]\\+##g" \

- -e "s# block_state_zero=\\(on\\|off\\)##g" \

- -e "s# log_size=[0-9]\\+##g" \

- -e "s# refcount_bits=[0-9]\\+##g" \

- -e "s# key-secret=[a-zA-Z0-9]\\+##g" \

- -e "s# iter-time=[0-9]\\+##g" \

- -e "s# force_size=\\(on\\|off\\)##g" \

- -e "s# compression_type=[a-zA-Z0-9]\\+##g"

+ -e 's#nbd+unix:///\??socket=SOCK_DIR/nbd#TEST_DIR/t.IMGFMT#g'

+ )

+

+ filename_part=$(echo "$filename_part" | $SED "${filename_filters[@]}")

+

+ # Break the option line before each option (preserving pre-existing

+ # line breaks by replacing them by \0 and restoring them at the end),

+ # then filter out the options we want to keep and sort them according

+ # to some order that all block drivers used at the time of writing

+ # this function.

+ options=$(

+ echo "$options" \

+ | tr '\n' '\0' \

+ | $SED -e 's/\x0$//' -e 's/ \([a-z0-9_.-]*\)=/\n\1=/g' \

+ | grep -ae "^\(fmt\\|size\\|backing\\|preallocation\\|encrypt$grep_data_file\\)" \

+ | $SED "${filename_filters[@]}" \

+ -e 's/^\(fmt\)/0-\1/' \

+ -e 's/^\(size\)/1-\1/' \

+ -e 's/^\(backing\)/2-\1/' \

+ -e 's/^\(data_file\)/3-\1/' \

+ -e 's/^\(encryption\)/4-\1/' \

+ -e 's/^\(encrypt\.format\)/5-\1/' \

+ -e 's/^\(encrypt\.key-secret\)/6-\1/' \

+ -e 's/^\(encrypt\.iter-time\)/7-\1/' \

+ -e 's/^\(preallocation\)/8-\1/' \

+ | sort \

+ | $SED -e 's/^[0-9]-//' \

+ | tr '\n\0' ' \n' \

+ | $SED -e 's/^ *$//' -e 's/ *$//'

+ )

+

+ if [ -n "$options" ]; then

+ echo "$filename_part, $options"

+ elif [ -n "$filename_part" ]; then

+ echo "$filename_part"

+ fi

+}

+

+# Filter the "Formatting..." line in QMP output (leaving the QMP output

+# untouched)

+# (In contrast to _filter_img_create(), this function does not support

+# multi-line Formatting output)

+_filter_img_create_in_qmp()

+{

+ while read -r line; do

+ if echo "$line" | grep -q '^Formatting'; then

+ echo "$line" | _filter_img_create

+ else

+ echo "$line"

+ fi

+ done

}

_filter_img_create_size()

--

2.26.2

From: Maxim Levitsky <mlevitsk@redhat.com>

This allows more tests to be able to have same output on both qcow2 luks encrypted images

and raw luks images

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>

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

Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>

Message-Id: <20200618150628.2169239-3-mreitz@redhat.com>

---

tests/qemu-iotests/087.out | 6 +++---

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

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

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

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

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

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

tests/qemu-iotests/284.out | 6 +++---

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

9 files changed, 17 insertions(+), 20 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

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

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

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

=== Encrypted image QCow ===

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0

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

Testing:

QMP_VERSION

{"return": {}}

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

=== Encrypted image LUKS ===

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encrypt.format=luks encrypt.key-secret=sec0

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

Testing:

QMP_VERSION

{"return": {}}

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

=== Missing driver ===

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0

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

Testing: -S

QMP_VERSION

{"return": {}}

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

index XXXXXXX..XXXXXXX 100644

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

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

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

QA output created by 134

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0

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

== reading whole image ==

read 134217728/134217728 bytes at offset 0

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

index XXXXXXX..XXXXXXX 100644

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

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

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

QA output created by 158

== create base ==

-Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0

+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 encryption=on

== writing whole image ==

wrote 134217728/134217728 bytes at offset 0

@@ -XXX,XX +XXX,XX @@ wrote 134217728/134217728 bytes at offset 0

read 134217728/134217728 bytes at offset 0

128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

== create overlay ==

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base encryption=on encrypt.key-secret=sec0

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base encryption=on

== writing part of a cluster ==

wrote 1024/1024 bytes at offset 0

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

index XXXXXXX..XXXXXXX 100644

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

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

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

QA output created by 188

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216

== reading whole image ==

read 16777216/16777216 bytes at offset 0

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

index XXXXXXX..XXXXXXX 100644

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

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

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

QA output created by 189

== create base ==

-Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10

+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216

== writing whole image ==

wrote 16777216/16777216 bytes at offset 0

@@ -XXX,XX +XXX,XX @@ wrote 16777216/16777216 bytes at offset 0

read 16777216/16777216 bytes at offset 0

16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

== create overlay ==

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base encrypt.format=luks encrypt.key-secret=sec1 encrypt.iter-time=10

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base

== writing part of a cluster ==

wrote 1024/1024 bytes at offset 0

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

index XXXXXXX..XXXXXXX 100644

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

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

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

QA output created by 198

== create base ==

-Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10

+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216

== writing whole image base ==

wrote 16777216/16777216 bytes at offset 0

16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

== create overlay ==

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base encrypt.format=luks encrypt.key-secret=sec1 encrypt.iter-time=10

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base

== writing whole image layer ==

wrote 16777216/16777216 bytes at offset 0

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

index XXXXXXX..XXXXXXX 100644

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

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

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

testing LUKS qcow2 encryption

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576

== reading the whole image ==

read 1048576/1048576 bytes at offset 0

1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

@@ -XXX,XX +XXX,XX @@ read 982528/982528 bytes at offset 66048

testing legacy AES qcow2 encryption

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=aes encrypt.key-secret=sec0

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576

== reading the whole image ==

read 1048576/1048576 bytes at offset 0

1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

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

index XXXXXXX..XXXXXXX 100644

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

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

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

testing LUKS qcow2 encryption

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576

== cluster size 512

== checking image refcounts ==

@@ -XXX,XX +XXX,XX @@ wrote 1/1 bytes at offset 512

== rechecking image refcounts ==

No errors were found on the image.

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576

== cluster size 2048

== checking image refcounts ==

@@ -XXX,XX +XXX,XX @@ wrote 1/1 bytes at offset 2048

== rechecking image refcounts ==

No errors were found on the image.

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576

== cluster size 32768

== checking image refcounts ==

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/common.filter

+++ b/tests/qemu-iotests/common.filter

@@ -XXX,XX +XXX,XX @@ _filter_img_create()

echo "$options" \

| tr '\n' '\0' \

| $SED -e 's/\x0$//' -e 's/ \([a-z0-9_.-]*\)=/\n\1=/g' \

- | grep -ae "^\(fmt\\|size\\|backing\\|preallocation\\|encrypt$grep_data_file\\)" \

+ | grep -ae "^\(fmt\\|size\\|backing\\|preallocation\\|encryption$grep_data_file\\)" \

| $SED "${filename_filters[@]}" \

-e 's/^\(fmt\)/0-\1/' \

-e 's/^\(size\)/1-\1/' \

-e 's/^\(backing\)/2-\1/' \

-e 's/^\(data_file\)/3-\1/' \

-e 's/^\(encryption\)/4-\1/' \

- -e 's/^\(encrypt\.format\)/5-\1/' \

- -e 's/^\(encrypt\.key-secret\)/6-\1/' \

- -e 's/^\(encrypt\.iter-time\)/7-\1/' \

-e 's/^\(preallocation\)/8-\1/' \

| sort \

| $SED -e 's/^[0-9]-//' \

--

2.26.2

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

ret may be > 0 on success path at this point. Fix assertion, which may

crash currently.

Fixes: 4ce5dd3e9b5ee0fac18625860eb3727399ee965e

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

Message-Id: <20200526181347.489557-1-vsementsov@virtuozzo.com>

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

---

block/block-copy.c | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/block/block-copy.c

+++ b/block/block-copy.c

@@ -XXX,XX +XXX,XX @@ out:

* block_copy_task_run. If it fails, it means some task already failed

* for real reason, let's return first failure.

* Still, assert that we don't rewrite failure by success.

+ *

+ * Note: ret may be positive here because of block-status result.

*/

- assert(ret == 0 || aio_task_pool_status(aio) < 0);

+ assert(ret >= 0 || aio_task_pool_status(aio) < 0);

ret = aio_task_pool_status(aio);

aio_task_pool_free(aio);

--

2.26.2

From: Maxim Levitsky <mlevitsk@redhat.com>

This will be used first to implement luks keyslot management.

block_crypto_amend_opts_init will be used to convert

qemu-img cmdline to QCryptoBlockAmendOptions

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Message-Id: <20200608094030.670121-2-mlevitsk@redhat.com>

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

---

qapi/crypto.json | 16 ++++++++++++++++

block/crypto.h | 3 +++

crypto/blockpriv.h | 8 ++++++++

include/crypto/block.h | 22 ++++++++++++++++++++++

block/crypto.c | 17 +++++++++++++++++

crypto/block.c | 29 +++++++++++++++++++++++++++++

6 files changed, 95 insertions(+)

diff --git a/qapi/crypto.json b/qapi/crypto.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/crypto.json

+++ b/qapi/crypto.json

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

'base': 'QCryptoBlockInfoBase',

'discriminator': 'format',

'data': { 'luks': 'QCryptoBlockInfoLUKS' } }

+

+

+

+##

+# @QCryptoBlockAmendOptions:

+#

+# The options that are available for all encryption formats

+# when amending encryption settings

+#

+# Since: 5.1

+##

+{ 'union': 'QCryptoBlockAmendOptions',

+ 'base': 'QCryptoBlockOptionsBase',

+ 'discriminator': 'format',

+ 'data': {

+ } }

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

index XXXXXXX..XXXXXXX 100644

--- a/block/crypto.h

+++ b/block/crypto.h

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

QCryptoBlockCreateOptions *

block_crypto_create_opts_init(QDict *opts, Error **errp);

+QCryptoBlockAmendOptions *

+block_crypto_amend_opts_init(QDict *opts, Error **errp);

+

QCryptoBlockOpenOptions *

block_crypto_open_opts_init(QDict *opts, Error **errp);

diff --git a/crypto/blockpriv.h b/crypto/blockpriv.h

index XXXXXXX..XXXXXXX 100644

--- a/crypto/blockpriv.h

+++ b/crypto/blockpriv.h

@@ -XXX,XX +XXX,XX @@ struct QCryptoBlockDriver {

void *opaque,

Error **errp);

+ int (*amend)(QCryptoBlock *block,

+ QCryptoBlockReadFunc readfunc,

+ QCryptoBlockWriteFunc writefunc,

+ void *opaque,

+ QCryptoBlockAmendOptions *options,

+ bool force,

+ Error **errp);

+

int (*get_info)(QCryptoBlock *block,

QCryptoBlockInfo *info,

Error **errp);

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

index XXXXXXX..XXXXXXX 100644

--- a/include/crypto/block.h

+++ b/include/crypto/block.h

@@ -XXX,XX +XXX,XX @@ QCryptoBlock *qcrypto_block_create(QCryptoBlockCreateOptions *options,

void *opaque,

Error **errp);

+/**

+ * qcrypto_block_amend_options:

+ * @block: the block encryption object

+ *

+ * @readfunc: callback for reading data from the volume header

+ * @writefunc: callback for writing data to the volume header

+ * @opaque: data to pass to @readfunc and @writefunc

+ * @options: the new/amended encryption options

+ * @force: hint for the driver to allow unsafe operation

+ * @errp: error pointer

+ *

+ * Changes the crypto options of the encryption format

+ *

+ */

+int qcrypto_block_amend_options(QCryptoBlock *block,

+ QCryptoBlockReadFunc readfunc,

+ QCryptoBlockWriteFunc writefunc,

+ void *opaque,

+ QCryptoBlockAmendOptions *options,

+ bool force,

+ Error **errp);

+

/**

* qcrypto_block_calculate_payload_offset:

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

index XXXXXXX..XXXXXXX 100644

--- a/block/crypto.c

+++ b/block/crypto.c

@@ -XXX,XX +XXX,XX @@ block_crypto_create_opts_init(QDict *opts, Error **errp)

return ret;

}

+QCryptoBlockAmendOptions *

+block_crypto_amend_opts_init(QDict *opts, Error **errp)

+{

+ Visitor *v;

+ QCryptoBlockAmendOptions *ret;

+

+ v = qobject_input_visitor_new_flat_confused(opts, errp);

+ if (!v) {

+ return NULL;

+ }

+

+ visit_type_QCryptoBlockAmendOptions(v, NULL, &ret, errp);

+

+ visit_free(v);

+ return ret;

+}

+

static int block_crypto_open_generic(QCryptoBlockFormat format,

QemuOptsList *opts_spec,

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

index XXXXXXX..XXXXXXX 100644

--- a/crypto/block.c

+++ b/crypto/block.c

@@ -XXX,XX +XXX,XX @@ qcrypto_block_calculate_payload_offset(QCryptoBlockCreateOptions *create_opts,

return crypto != NULL;

}

+int qcrypto_block_amend_options(QCryptoBlock *block,

+ QCryptoBlockReadFunc readfunc,

+ QCryptoBlockWriteFunc writefunc,

+ void *opaque,

+ QCryptoBlockAmendOptions *options,

+ bool force,

+ Error **errp)

+{

+ if (options->format != block->format) {

+ error_setg(errp,

+ "Cannot amend encryption format");

+ return -1;

+ }

+

+ if (!block->driver->amend) {

+ error_setg(errp,

+ "Crypto format %s doesn't support format options amendment",

+ QCryptoBlockFormat_str(block->format));

+ return -1;

+ }

+

+ return block->driver->amend(block,

+ readfunc,

+ writefunc,

+ opaque,

+ options,

+ force,

+ errp);

+}

QCryptoBlockInfo *qcrypto_block_get_info(QCryptoBlock *block,

Error **errp)

--

2.26.2