Emanuele Giuseppe Esposito (1):

block.h: remove outdated comment

From: Thomas Huth <thuth@redhat.com>

The lsi53c895a SCSI adaptor might not be enabled in each and every

x86 QEMU binary, e.g. it's disabled in the RHEL/CentOS build.

Thus let's add a check to the 051 test so that it does not fail if

this device is not available.

Signed-off-by: Thomas Huth <thuth@redhat.com>

Message-Id: <20211206143404.247032-1-thuth@redhat.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

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

1 file changed, 4 insertions(+)

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

index XXXXXXX..XXXXXXX 100755

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

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

@@ -XXX,XX +XXX,XX @@ _supported_proto file

_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file

_require_drivers nbd

+if [ "$QEMU_DEFAULT_MACHINE" = "pc" ]; then

+ _require_devices lsi53c895a

+fi

+

do_run_qemu()

{

echo Testing: "$@"

--

2.34.1

This test assumes that mirror flushes the source when entering the READY

state, and that the format level will pass that flush on to the protocol

level (where we intercept it with blkdebug).

However, apparently that does not happen when using a VMDK image with

zeroed_grain=on, which actually is the default set by testenv.py. Right

now, Python tests ignore IMGOPTS, though, so this has no effect; but

Vladimir has a series that will change this, so we need to fix this test

before that series lands.

We can fix it by writing data to the source before we start the mirror

job; apparently that makes the (VMDK) format layer change its mind and

pass on the pre-READY flush to the protocol level, so the test passes

again. (I presume, without any data written, mirror just does a 64M

zero write on the target, which VMDK with zeroed_grain=on basically just

ignores.)

Without this, we do not get a flush, and so blkdebug only sees a single

flush at the end of the job instead of two, and therefore does not

inject an error, which makes the block job complete instead of raising

an error.

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

Message-Id: <20211223165308.103793-1-hreitz@redhat.com>

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

---

tests/qemu-iotests/tests/mirror-ready-cancel-error | 7 ++++++-

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

diff --git a/tests/qemu-iotests/tests/mirror-ready-cancel-error b/tests/qemu-iotests/tests/mirror-ready-cancel-error

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/tests/mirror-ready-cancel-error

+++ b/tests/qemu-iotests/tests/mirror-ready-cancel-error

@@ -XXX,XX +XXX,XX @@ class TestMirrorReadyCancelError(iotests.QMPTestCase):

assert iotests.qemu_img_create('-f', iotests.imgfmt, target,

str(image_size)) == 0

+ # Ensure that mirror will copy something before READY so the

+ # target format layer will forward the pre-READY flush to its

+ # file child

+ assert iotests.qemu_io_silent('-c', 'write -P 1 0 64k', source) == 0

+

self.vm = iotests.VM()

self.vm.launch()

@@ -XXX,XX +XXX,XX @@ class TestMirrorReadyCancelError(iotests.QMPTestCase):

# Write something so will not leave the job immediately, but

# flush first (which will fail, thanks to blkdebug)

res = self.vm.qmp('human-monitor-command',

- command_line='qemu-io mirror-top "write 0 64k"')

+ command_line='qemu-io mirror-top "write -P 2 0 64k"')

self.assert_qmp(res, 'return', '')

# Drain status change events

--

2.34.1

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

We are going to support IMGOPTS environment variable like in bash

tests. Corresponding global variable in iotests.py should be called

imgopts. So to not interfere with function argument, rename it in

advance.

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

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

Message-Id: <20211223160144.1097696-2-vsementsov@virtuozzo.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

tests/qemu-iotests/210 | 8 ++++----

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

2 files changed, 7 insertions(+), 6 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/210

+++ b/tests/qemu-iotests/210

@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \

'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),

filter_path=disk_path,

extra_args=['--object', 'secret,id=keysec0,data=foo'],

- imgopts=True)

+ use_image_opts=True)

#

# Successful image creation (with non-default options)

@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \

'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),

filter_path=disk_path,

extra_args=['--object', 'secret,id=keysec0,data=foo'],

- imgopts=True)

+ use_image_opts=True)

#

# Invalid BlockdevRef

@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \

'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),

filter_path=disk_path,

extra_args=['--object', 'secret,id=keysec0,data=foo'],

- imgopts=True)

+ use_image_opts=True)

#

# Invalid sizes

@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('t.luks') as disk_path, \

'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),

filter_path=disk_path,

extra_args=['--object', 'secret,id=keysec0,data=foo'],

- imgopts=True)

+ use_image_opts=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 qemu_img_log(*args):

log(result, filters=[filter_testfiles])

return result

-def img_info_log(filename, filter_path=None, imgopts=False, extra_args=()):

+def img_info_log(filename, filter_path=None, use_image_opts=False,

+ extra_args=()):

args = ['info']

- if imgopts:

+ if use_image_opts:

args.append('--image-opts')

else:

args += ['-f', imgfmt]

--

2.34.1

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

We are going to support some addition IMGOPTS in python iotests like

in bash iotests. Similarly to bash iotests, we want a way to skip some

tests which can't work with specific IMGOPTS.

Globally for python iotests we will not support things like

'data_file=$TEST_IMG.ext_data_file' in IMGOPTS, so, forbid this

globally in iotests.py.

Suggested-by: Hanna Reitz <hreitz@redhat.com>

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

Reviewed-by: Hanna Reitz <hreitz@redhat.com>

Message-Id: <20211223160144.1097696-3-vsementsov@virtuozzo.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

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

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

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 _verify_virtio_scsi_pci_or_ccw() -> None:

notrun('Missing virtio-scsi-pci or virtio-scsi-ccw in QEMU binary')

+def _verify_imgopts(unsupported: Sequence[str] = ()) -> None:

+ imgopts = os.environ.get('IMGOPTS')

+ # One of usage examples for IMGOPTS is "data_file=$TEST_IMG.ext_data_file"

+ # but it supported only for bash tests. We don't have a concept of global

+ # TEST_IMG in iotests.py, not saying about somehow parsing $variables.

+ # So, for simplicity let's just not support any IMGOPTS with '$' inside.

+ unsup = list(unsupported) + ['$']

+ if imgopts and any(x in imgopts for x in unsup):

+ notrun(f'not suitable for this imgopts: {imgopts}')

+

+

def supports_quorum():

return 'quorum' in qemu_img_pipe('--help')

@@ -XXX,XX +XXX,XX @@ def execute_setup_common(supported_fmts: Sequence[str] = (),

unsupported_fmts: Sequence[str] = (),

supported_protocols: Sequence[str] = (),

unsupported_protocols: Sequence[str] = (),

- required_fmts: Sequence[str] = ()) -> bool:

+ required_fmts: Sequence[str] = (),

+ unsupported_imgopts: Sequence[str] = ()) -> bool:

"""

Perform necessary setup for either script-style or unittest-style tests.

@@ -XXX,XX +XXX,XX @@ def execute_setup_common(supported_fmts: Sequence[str] = (),

_verify_aio_mode(supported_aio_modes)

_verify_formats(required_fmts)

_verify_virtio_blk()

+ _verify_imgopts(unsupported_imgopts)

return debug

--

2.34.1

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

Adding support of IMGOPTS (like in bash tests) allows user to pass a

lot of different options. Still, some may require additional logic.

Now we want compression_type option, so add some smart logic around it:

ignore compression_type=zstd in IMGOPTS, if test want qcow2 in

compatibility mode. As well, ignore compression_type for non-qcow2

formats.

Note that we may instead add support only to qemu_img_create(), but

that works bad:

1. We'll have to update a lot of tests to use qemu_img_create instead

of qemu_img('create'). (still, we may want do it anyway, but no

reason to create a dependancy between task of supporting IMGOPTS and

updating a lot of tests)

2. Some tests use qemu_img_pipe('create', ..) - even more work on

updating

3. Even if we update all tests to go through qemu_img_create, we'll

need a way to avoid creating new tests using qemu_img*('create') -

add assertions.. That doesn't seem good.

So, let's add support of IMGOPTS to most generic

qemu_img_pipe_and_status().

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

Reviewed-by: Hanna Reitz <hreitz@redhat.com>

Message-Id: <20211223160144.1097696-5-vsementsov@virtuozzo.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

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

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

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

# along with this program. If not, see <http://www.gnu.org/licenses/>.

#

+import argparse

import atexit

import bz2

from collections import OrderedDict

@@ -XXX,XX +XXX,XX @@ def qemu_tool_pipe_and_status(tool: str, args: Sequence[str],

{-subp.returncode}: {cmd}\n')

return (output, subp.returncode)

+def qemu_img_create_prepare_args(args: List[str]) -> List[str]:

+ if not args or args[0] != 'create':

+ return list(args)

+ args = args[1:]

+

+ p = argparse.ArgumentParser(allow_abbrev=False)

+ p.add_argument('-f')

+ parsed, remaining = p.parse_known_args(args)

+

+ result = ['create']

+ if parsed.f is not None:

+ result += ['-f', parsed.f]

+

+ # IMGOPTS most probably contain options specific for the selected format,

+ # like extended_l2 or compression_type for qcow2. Test may want to create

+ # additional images in other formats that doesn't support these options.

+ # So, use IMGOPTS only for images created in imgfmt format.

+ if parsed.f == imgfmt and 'IMGOPTS' in os.environ:

+ result += ['-o', os.environ['IMGOPTS']]

+

+ result += remaining

+

+ return result

+

def qemu_img_pipe_and_status(*args: str) -> Tuple[str, int]:

"""

Run qemu-img and return both its output and its exit code

"""

- full_args = qemu_img_args + list(args)

+ full_args = qemu_img_args + qemu_img_create_prepare_args(list(args))

return qemu_tool_pipe_and_status('qemu-img', full_args)

def qemu_img(*args: str) -> int:

--

2.34.1

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

qemu_img_verbose() has a drawback of not going through generic

qemu_img_pipe_and_status(). qemu_img_verbose() is not very popular, so

update the only two users to qemu_img_log() and drop qemu_img_verbose()

at all.

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

Reviewed-by: Hanna Reitz <hreitz@redhat.com>

Message-Id: <20211223160144.1097696-6-vsementsov@virtuozzo.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

tests/qemu-iotests/044 | 5 +++--

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

tests/qemu-iotests/209 | 7 ++++---

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

tests/qemu-iotests/iotests.py | 8 --------

5 files changed, 10 insertions(+), 13 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/044

+++ b/tests/qemu-iotests/044

@@ -XXX,XX +XXX,XX @@ import os

import qcow2

from qcow2 import QcowHeader

import iotests

-from iotests import qemu_img, qemu_img_verbose, qemu_io

+from iotests import qemu_img, qemu_img_log, qemu_io

import struct

import subprocess

import sys

@@ -XXX,XX +XXX,XX @@ class TestRefcountTableGrowth(iotests.QMPTestCase):

def test_grow_refcount_table(self):

qemu_io('-c', 'write 3800M 1M', test_img)

- qemu_img_verbose('check' , test_img)

+ qemu_img_log('check' , test_img)

pass

if __name__ == '__main__':

+ iotests.activate_logging()

iotests.main(supported_fmts=['qcow2'],

supported_protocols=['file'],

unsupported_imgopts=['refcount_bits'])

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

index XXXXXXX..XXXXXXX 100644

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

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

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

No errors were found on the image.

7292415/33554432 = 21.73% allocated, 0.00% fragmented, 0.00% compressed clusters

Image end offset: 4296217088

+

.

----------------------------------------------------------------------

Ran 1 tests

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/209

+++ b/tests/qemu-iotests/209

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

#

import iotests

-from iotests import qemu_img_create, qemu_io, qemu_img_verbose, qemu_nbd, \

- file_path

+from iotests import qemu_img_create, qemu_io, qemu_img_log, qemu_nbd, \

+ file_path, log

iotests.script_initialize(supported_fmts=['qcow2'])

@@ -XXX,XX +XXX,XX @@ qemu_img_create('-f', iotests.imgfmt, disk, '1M')

qemu_io('-f', iotests.imgfmt, '-c', 'write 0 512K', disk)

qemu_nbd('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, disk)

-qemu_img_verbose('map', '-f', 'raw', '--output=json', nbd_uri)

+qemu_img_log('map', '-f', 'raw', '--output=json', nbd_uri)

+log('done.') # avoid new line at the end of output file

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

index XXXXXXX..XXXXXXX 100644

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

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

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

[{ "start": 0, "length": 524288, "depth": 0, "present": true, "zero": false, "data": true, "offset": 0},

{ "start": 524288, "length": 524288, "depth": 0, "present": true, "zero": true, "data": false, "offset": 524288}]

+

+done.

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 qemu_img_measure(*args):

def qemu_img_check(*args):

return json.loads(qemu_img_pipe("check", "--output", "json", *args))

-def qemu_img_verbose(*args):

- '''Run qemu-img without suppressing its output and return the exit code'''

- exitcode = subprocess.call(qemu_img_args + list(args))

- if exitcode < 0:

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

- % (-exitcode, ' '.join(qemu_img_args + list(args))))

- return exitcode

-

def qemu_img_pipe(*args: str) -> str:

'''Run qemu-img and return its output'''

return qemu_img_pipe_and_status(*args)[0]

--

2.34.1

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

Move the logic to more generic qemu_img_pipe_and_status(). Also behave

better when we have several -o options. And reuse argument parser of

course.

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

Reviewed-by: Hanna Reitz <hreitz@redhat.com>

Message-Id: <20211223160144.1097696-7-vsementsov@virtuozzo.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

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

1 file changed, 17 insertions(+), 19 deletions(-)

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 qemu_img_create_prepare_args(args: List[str]) -> List[str]:

args = args[1:]

p = argparse.ArgumentParser(allow_abbrev=False)

+ # -o option may be specified several times

+ p.add_argument('-o', action='append', default=[])

p.add_argument('-f')

parsed, remaining = p.parse_known_args(args)

+ opts_list = parsed.o

+

result = ['create']

if parsed.f is not None:

result += ['-f', parsed.f]

@@ -XXX,XX +XXX,XX @@ def qemu_img_create_prepare_args(args: List[str]) -> List[str]:

# like extended_l2 or compression_type for qcow2. Test may want to create

# additional images in other formats that doesn't support these options.

# So, use IMGOPTS only for images created in imgfmt format.

- if parsed.f == imgfmt and 'IMGOPTS' in os.environ:

- result += ['-o', os.environ['IMGOPTS']]

+ imgopts = os.environ.get('IMGOPTS')

+ if imgopts and parsed.f == imgfmt:

+ opts_list.insert(0, imgopts)

+

+ # default luks support

+ if parsed.f == 'luks' and \

+ all('key-secret' not in opts for opts in opts_list):

+ result += ['--object', luks_default_secret_object]

+ opts_list.append(luks_default_key_secret_opt)

+

+ for opts in opts_list:

+ result += ['-o', opts]

result += remaining

@@ -XXX,XX +XXX,XX @@ def ordered_qmp(qmsg, conv_keys=True):

return qmsg

def qemu_img_create(*args):

- args = list(args)

-

- # default luks support

- if '-f' in args and args[args.index('-f') + 1] == 'luks':

- if '-o' in args:

- i = args.index('-o')

- if 'key-secret' not in args[i + 1]:

- args[i + 1].append(luks_default_key_secret_opt)

- args.insert(i + 2, '--object')

- args.insert(i + 3, luks_default_secret_object)

- else:

- args = ['-o', luks_default_key_secret_opt,

- '--object', luks_default_secret_object] + args

-

- args.insert(0, 'create')

-

- return qemu_img(*args)

+ return qemu_img('create', *args)

def qemu_img_measure(*args):

return json.loads(qemu_img_pipe("measure", "--output", "json", *args))

--

2.34.1

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

The test prints qcow2 header fields which depends on chosen compression

type. So, let's be explicit in what compression type we want and

independent of IMGOPTS. Test both existing compression types.

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

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

Message-Id: <20211223160144.1097696-8-vsementsov@virtuozzo.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

tests/qemu-iotests/303 | 25 ++++++++++++++++---------

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

2 files changed, 45 insertions(+), 10 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/303

+++ b/tests/qemu-iotests/303

@@ -XXX,XX +XXX,XX @@ def add_bitmap(num, begin, end, disabled):

log('')

-qemu_img_create('-f', iotests.imgfmt, disk, '10M')

-

-add_bitmap(1, 0, 6, False)

-add_bitmap(2, 6, 8, True)

-dump = ['./qcow2.py', disk, 'dump-header']

-subprocess.run(dump)

-# Dump the metadata in JSON format

-dump.append('-j')

-subprocess.run(dump)

+def test(compression_type: str, json_output: bool) -> None:

+ qemu_img_create('-f', iotests.imgfmt,

+ '-o', f'compression_type={compression_type}',

+ disk, '10M')

+ add_bitmap(1, 0, 6, False)

+ add_bitmap(2, 6, 8, True)

+

+ cmd = ['./qcow2.py', disk, 'dump-header']

+ if json_output:

+ cmd.append('-j')

+

+ subprocess.run(cmd)

+

+

+test('zlib', False)

+test('zstd', True)

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ extra_data_size 0

Bitmap table type size offset

0 all-zeroes 0 0

+Add bitmap 1

+wrote 1048576/1048576 bytes at offset 0

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

+

+wrote 1048576/1048576 bytes at offset 1048576

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

+

+wrote 1048576/1048576 bytes at offset 2097152

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

+

+wrote 1048576/1048576 bytes at offset 3145728

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

+

+wrote 1048576/1048576 bytes at offset 4194304

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

+

+wrote 1048576/1048576 bytes at offset 5242880

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

+

+

+Add bitmap 2

+wrote 1048576/1048576 bytes at offset 6291456

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

+

+wrote 1048576/1048576 bytes at offset 7340032

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

+

+

{

"magic": 1363560955,

"version": 3,

@@ -XXX,XX +XXX,XX @@ Bitmap table type size offset

"refcount_table_clusters": 1,

"nb_snapshots": 0,

"snapshot_offset": 0,

- "incompatible_features": 0,

+ "incompatible_features": 8,

"compatible_features": 0,

"autoclear_features": 1,

"refcount_order": 4,

--

2.34.1

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

The test checks different options. It of course fails if set

IMGOPTS='compression_type=zstd'. So, let's be explicit in what

compression type we want and independent of IMGOPTS. Test both existing

compression types.

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

Reviewed-by: Hanna Reitz <hreitz@redhat.com>

Message-Id: <20211223160144.1097696-9-vsementsov@virtuozzo.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

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

1 file changed, 8 insertions(+), 8 deletions(-)

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'

+ img_options = 'compat=0.10,compression_type=zlib'

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

'compression-type': 'zlib' }

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

@@ -XXX,XX +XXX,XX @@ class TestQCow2(TestQemuImgInfo):

class TestQCow3NotLazy(TestQemuImgInfo):

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

- img_options = 'compat=1.1,lazy_refcounts=off'

+ img_options = 'compat=1.1,lazy_refcounts=off,compression_type=zstd'

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

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

- 'compression-type': 'zlib', 'extended-l2': False }

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

+ 'compression-type': 'zstd', 'extended-l2': False }

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

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

'corrupt: false', 'extended l2: false' ]

class TestQCow3Lazy(TestQemuImgInfo):

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

- img_options = 'compat=1.1,lazy_refcounts=on'

+ img_options = 'compat=1.1,lazy_refcounts=on,compression_type=zlib'

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

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

'compression-type': 'zlib', 'extended-l2': False }

@@ -XXX,XX +XXX,XX @@ class TestQCow3Lazy(TestQemuImgInfo):

class TestQCow3NotLazyQMP(TestQMP):

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

with lazy refcounts enabled'''

- img_options = 'compat=1.1,lazy_refcounts=off'

+ img_options = 'compat=1.1,lazy_refcounts=off,compression_type=zlib'

qemu_options = 'lazy-refcounts=on'

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

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

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

class TestQCow3LazyQMP(TestQMP):

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

with lazy refcounts disabled'''

- img_options = 'compat=1.1,lazy_refcounts=on'

+ img_options = 'compat=1.1,lazy_refcounts=on,compression_type=zstd'

qemu_options = 'lazy-refcounts=off'

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

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

- 'compression-type': 'zlib', 'extended-l2': False }

+ 'compression-type': 'zstd', 'extended-l2': False }

TestImageInfoSpecific = None

TestQemuImgInfo = None

--

2.34.1

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

The only "feature" of this "Formatting ..." line is that we have to

update it every time we add new option. Let's drop it.

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

Reviewed-by: Hanna Reitz <hreitz@redhat.com>

Message-Id: <20211223160144.1097696-10-vsementsov@virtuozzo.com>

Signed-off-by: Hanna Reitz <hreitz@redhat.com>

---

tests/qemu-iotests/149.out | 21 ---------------------

tests/qemu-iotests/237.out | 3 ---

tests/qemu-iotests/255.out | 4 ----

tests/qemu-iotests/274.out | 29 -----------------------------

tests/qemu-iotests/280.out | 1 -

tests/qemu-iotests/296.out | 10 +++-------

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

7 files changed, 11 insertions(+), 67 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha1.img

# ================= qemu-img aes-256-xts-plain64-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-aes-256-xts-plain64-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha1.img qiotest-145-aes-256-xts-plain64-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-twofish-256-xts-plain64-sha1.img

# ================= qemu-img twofish-256-xts-plain64-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=twofish-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-twofish-256-xts-plain64-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-twofish-256-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=twofish-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-256-xts-plain64-sha1.img qiotest-145-twofish-256-xts-plain64-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-serpent-256-xts-plain64-sha1.img

# ================= qemu-img serpent-256-xts-plain64-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=serpent-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-serpent-256-xts-plain64-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-serpent-256-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=serpent-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-256-xts-plain64-sha1.img qiotest-145-serpent-256-xts-plain64-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img

# ================= qemu-img cast5-128-cbc-plain64-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=cast5-128,cipher-mode=cbc,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=cast5-128 cipher-mode=cbc ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img qiotest-145-cast5-128-cbc-plain64-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-plain-sha1.img

# ================= qemu-img aes-256-cbc-plain-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=plain,hash-alg=sha1 TEST_DIR/luks-aes-256-cbc-plain-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-cbc-plain-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=plain hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain-sha1.img qiotest-145-aes-256-cbc-plain-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha1.img

# ================= qemu-img aes-256-cbc-plain64-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-aes-256-cbc-plain64-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha1.img qiotest-145-aes-256-cbc-plain64-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img

# ================= qemu-img aes-256-cbc-essiv-sha256-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=essiv,hash-alg=sha1,ivgen-hash-alg=sha256 TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=essiv ivgen-hash-alg=sha256 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img qiotest-145-aes-256-cbc-essiv-sha256-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img

# ================= qemu-img aes-256-xts-essiv-sha256-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=essiv,hash-alg=sha1,ivgen-hash-alg=sha256 TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=essiv ivgen-hash-alg=sha256 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img qiotest-145-aes-256-xts-essiv-sha256-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img

# ================= qemu-img aes-128-xts-plain64-sha256-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-128,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-128 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img qiotest-145-aes-128-xts-plain64-sha256-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img

# ================= qemu-img aes-192-xts-plain64-sha256-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-192,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-192 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img qiotest-145-aes-192-xts-plain64-sha256-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-twofish-128-xts-plain64-sha1.img

# ================= qemu-img twofish-128-xts-plain64-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=twofish-128,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-twofish-128-xts-plain64-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-twofish-128-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=twofish-128 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-128-xts-plain64-sha1.img qiotest-145-twofish-128-xts-plain64-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-serpent-128-xts-plain64-sha1.img

# ================= qemu-img serpent-128-xts-plain64-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=serpent-128,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-serpent-128-xts-plain64-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-serpent-128-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=serpent-128 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-128-xts-plain64-sha1.img qiotest-145-serpent-128-xts-plain64-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-serpent-192-xts-plain64-sha1.img

# ================= qemu-img serpent-192-xts-plain64-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=serpent-192,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha1 TEST_DIR/luks-serpent-192-xts-plain64-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-serpent-192-xts-plain64-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=serpent-192 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-192-xts-plain64-sha1.img qiotest-145-serpent-192-xts-plain64-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha224.img

# ================= qemu-img aes-256-xts-plain64-sha224 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha224 TEST_DIR/luks-aes-256-xts-plain64-sha224.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha224.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha224 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha224.img qiotest-145-aes-256-xts-plain64-sha224

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha256.img

# ================= qemu-img aes-256-xts-plain64-sha256 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha256 TEST_DIR/luks-aes-256-xts-plain64-sha256.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha256.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha256 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha256.img qiotest-145-aes-256-xts-plain64-sha256

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha384.img

# ================= qemu-img aes-256-xts-plain64-sha384 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha384 TEST_DIR/luks-aes-256-xts-plain64-sha384.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha384.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha384 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha384.img qiotest-145-aes-256-xts-plain64-sha384

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha512.img

# ================= qemu-img aes-256-xts-plain64-sha512 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=sha512 TEST_DIR/luks-aes-256-xts-plain64-sha512.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha512.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=sha512 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha512.img qiotest-145-aes-256-xts-plain64-sha512

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img

# ================= qemu-img aes-256-xts-plain64-ripemd160 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain64,hash-alg=ripemd160 TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain64 hash-alg=ripemd160 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img qiotest-145-aes-256-xts-plain64-ripemd160

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img

# ================= qemu-img aes-256-xts-plain-sha1-pwallslots =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=c2xvdDE=,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=xts,ivgen-alg=plain,hash-alg=sha1 TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=xts ivgen-alg=plain hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img qiotest-145-aes-256-xts-plain-sha1-pwallslots

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img

# ================= qemu-img aes-256-cbc-essiv-auto-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=essiv,hash-alg=sha1 TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=essiv hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img qiotest-145-aes-256-cbc-essiv-auto-sha1

@@ -XXX,XX +XXX,XX @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img

# ================= qemu-img aes-256-cbc-plain64-sha256-sha1 =================

# Create image

qemu-img create -f luks --object secret,id=sec0,data=MTIzNDU2,format=base64 -o key-secret=sec0,iter-time=10,cipher-alg=aes-256,cipher-mode=cbc,ivgen-alg=plain64,hash-alg=sha1,ivgen-hash-alg=sha256 TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img 4194304M

-Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img', fmt=luks size=4398046511104 key-secret=sec0 cipher-alg=aes-256 cipher-mode=cbc ivgen-alg=plain64 ivgen-hash-alg=sha256 hash-alg=sha1 iter-time=10

# Open dev

sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img qiotest-145-aes-256-cbc-plain64-sha256-sha1

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device='this doesn't exist' nor node-name='this doesn't

=== Other subformats ===

-Formatting 'TEST_DIR/PID-t.vmdk.1', fmt=vmdk size=0 compat6=off hwversion=undefined

-Formatting 'TEST_DIR/PID-t.vmdk.2', fmt=vmdk size=0 compat6=off hwversion=undefined

-Formatting 'TEST_DIR/PID-t.vmdk.3', fmt=vmdk size=0 compat6=off hwversion=undefined

== Missing extent ==

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ Finishing a commit job with background reads

=== Create backing chain and start VM ===

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

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

=== Start background read requests ===

@@ -XXX,XX +XXX,XX @@ Closing the VM while a job is being cancelled

=== Create images and start VM ===

-Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16

-Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16

wrote 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/274.out b/tests/qemu-iotests/274.out

index XXXXXXX..XXXXXXX 100644

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

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

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

== Commit tests ==

-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16

-Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

wrote 2097152/2097152 bytes at offset 0

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

@@ -XXX,XX +XXX,XX @@ read 1048576/1048576 bytes at offset 1048576

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

=== Testing HMP commit (top -> mid) ===

-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16

-Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

wrote 2097152/2097152 bytes at offset 0

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

@@ -XXX,XX +XXX,XX @@ read 1048576/1048576 bytes at offset 1048576

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

=== Testing QMP active commit (top -> mid) ===

-Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16

-Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

-Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

wrote 2097152/2097152 bytes at offset 0

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

@@ -XXX,XX +XXX,XX @@ read 1048576/1048576 bytes at offset 1048576