Denis V. Lunev (1):

block: add 'force' parameter to 'blockdev-change-medium' command

qmp_blockdev_change_medium(true, device, false, NULL, target,

- !!arg, arg, !!read_only, read_only_mode,

+ !!arg, arg, true, force,

+ !!read_only, read_only_mode,

&err);

From: John Snow <jsnow@redhat.com>

This makes these callsites a little simpler, but the real motivation is

a forthcoming commit will change the return type of qemu_io(), so removing

users of the return value now is helpful.

Signed-off-by: John Snow <jsnow@redhat.com>

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

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

Message-Id: <20220418211504.943969-2-jsnow@redhat.com>

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

---

tests/qemu-iotests/242 | 6 +++---

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

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

3 files changed, 6 insertions(+), 8 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/242

+++ b/tests/qemu-iotests/242

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

import iotests

import json

import struct

-from iotests import qemu_img_create, qemu_io, qemu_img_info, \

- file_path, img_info_log, log, filter_qemu_io

+from iotests import qemu_img_create, qemu_io_log, qemu_img_info, \

+ file_path, img_info_log, log

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

supported_protocols=['file'],

@@ -XXX,XX +XXX,XX @@ def add_bitmap(bitmap_number, persistent, disabled):

def write_to_disk(offset, size):

write = 'write {} {}'.format(offset, size)

- log(qemu_io('-c', write, disk), filters=[filter_qemu_io])

+ qemu_io_log('-c', write, disk)

def toggle_flag(offset):

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/255

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

@@ -XXX,XX +XXX,XX @@ with iotests.FilePath('src.qcow2') as src_path, \

iotests.qemu_img_create('-f', iotests.imgfmt, src_path, size_str)

iotests.qemu_img_create('-f', iotests.imgfmt, dst_path, size_str)

- iotests.log(iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write 0 1M',

- src_path),

- filters=[iotests.filter_test_dir, iotests.filter_qemu_io])

+ iotests.qemu_io_log('-f', iotests.imgfmt, '-c', 'write 0 1M', src_path),

vm.add_object('throttle-group,x-bps-read=4096,id=throttle0')

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

import iotests

import subprocess

-from iotests import qemu_img_create, qemu_io, file_path, log, filter_qemu_io, \

+from iotests import qemu_img_create, qemu_io_log, file_path, log, \

verify_qcow2_zstd_compression

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

@@ -XXX,XX +XXX,XX @@ def create_bitmap(bitmap_number, disabled):

def write_to_disk(offset, size):

write = f'write {offset} {size}'

- log(qemu_io('-c', write, disk), filters=[filter_qemu_io])

+ qemu_io_log('-c', write, disk)

def add_bitmap(num, begin, end, disabled):

--

2.35.1

From: John Snow <jsnow@redhat.com>

The 'read' commands to qemu-io were malformed, and this invocation only

worked by coincidence because the error messages were identical. Oops.

There's no point in checking the patterning of the reference image, so

just check the empty image by itself instead.

(Note: as of this commit, nothing actually enforces that this command

completes successfully, but a forthcoming commit in this series will

enforce that qemu_io() must have a zero status code.)

Signed-off-by: John Snow <jsnow@redhat.com>

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

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

Message-Id: <20220418211504.943969-3-jsnow@redhat.com>

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

---

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

1 file changed, 1 insertion(+), 4 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/163

+++ b/tests/qemu-iotests/163

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

qemu_img('resize', '-f', iotests.imgfmt, '--shrink', test_img,

self.shrink_size)

- self.assertEqual(

- qemu_io('-c', 'read -P 0x00 %s'%self.shrink_size, test_img),

- qemu_io('-c', 'read -P 0x00 %s'%self.shrink_size, check_img),

- "Verifying image content")

+ qemu_io('-c', f"read -P 0x00 0 {self.shrink_size}", test_img)

self.image_verify()

--

2.35.1

From: John Snow <jsnow@redhat.com>

A forthcoming commit updates qemu_io() to raise an exception on non-zero

return by default, and changes its return type.

In preparation, simplify some calls to qemu_io() that assert that

specific error message strings do not appear in qemu-io's

output. Asserting that all of these calls return a status code of zero

will be a more robust way to guard against failure.

Signed-off-by: John Snow <jsnow@redhat.com>

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

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

Message-Id: <20220418211504.943969-4-jsnow@redhat.com>

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

---

tests/qemu-iotests/040 | 33 ++++++++++++++++-----------------

tests/qemu-iotests/056 | 2 +-

2 files changed, 17 insertions(+), 18 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/040

+++ b/tests/qemu-iotests/040

@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(ImageCommitTestCase):

def test_commit(self):

self.run_commit_test(mid_img, backing_img)

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img).find("verification failed"))

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img).find("verification failed"))

+ qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)

+ qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)

def test_commit_node(self):

self.run_commit_test("mid", "base", node_names=True)

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img).find("verification failed"))

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img).find("verification failed"))

+ qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)

+ qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)

@iotests.skip_if_unsupported(['throttle'])

def test_commit_with_filter_and_quit(self):

@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(ImageCommitTestCase):

def test_top_is_active(self):

self.run_commit_test(test_img, backing_img, need_ready=True)

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img).find("verification failed"))

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img).find("verification failed"))

+ qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)

+ qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)

def test_top_is_default_active(self):

self.run_default_commit_test()

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img).find("verification failed"))

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img).find("verification failed"))

+ qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)

+ qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)

def test_top_and_base_reversed(self):

self.assert_no_active_block_jobs()

@@ -XXX,XX +XXX,XX @@ class TestRelativePaths(ImageCommitTestCase):

def test_commit(self):

self.run_commit_test(self.mid_img, self.backing_img)

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', self.backing_img_abs).find("verification failed"))

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', self.backing_img_abs).find("verification failed"))

+ qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', self.backing_img_abs)

+ qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', self.backing_img_abs)

def test_device_not_found(self):

result = self.vm.qmp('block-commit', device='nonexistent', top='%s' % self.mid_img)

@@ -XXX,XX +XXX,XX @@ class TestRelativePaths(ImageCommitTestCase):

def test_top_is_active(self):

self.run_commit_test(self.test_img, self.backing_img)

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', self.backing_img_abs).find("verification failed"))

- self.assertEqual(-1, qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', self.backing_img_abs).find("verification failed"))

+ qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', self.backing_img_abs)

+ qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', self.backing_img_abs)

def test_top_and_base_reversed(self):

self.assert_no_active_block_jobs()

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

def do_test_io(self, read_or_write):

for index, pattern_file in enumerate(self.pattern_files):

- result = qemu_io('-f', iotests.imgfmt,

- '-c',

- f'{read_or_write} -P {index + 1} {index}M 1M',

- pattern_file)

- self.assertFalse('Pattern verification failed' in result)

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

+ '-c',

+ f'{read_or_write} -P {index + 1} {index}M 1M',

+ pattern_file)

@iotests.skip_if_unsupported(['throttle'])

def setUp(self):

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/056

+++ b/tests/qemu-iotests/056

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

self.vm.shutdown()

time.sleep(1)

- self.assertEqual(-1, qemu_io('-c', 'read -P0x41 0 512', target_img).find("verification failed"))

+ qemu_io('-c', 'read -P0x41 0 512', target_img)

class TestBeforeWriteNotifier(iotests.QMPTestCase):

def setUp(self):

--

2.35.1

From: John Snow <jsnow@redhat.com>

qemu-io fails on read/write beyond end-of-file on raw images, so skip

these invocations when running the zero-length image tests.

Signed-off-by: John Snow <jsnow@redhat.com>

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

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

Message-Id: <20220418211504.943969-5-jsnow@redhat.com>

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

---

tests/qemu-iotests/040 | 14 ++++++++++++--

1 file changed, 12 insertions(+), 2 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/040

+++ b/tests/qemu-iotests/040

@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(ImageCommitTestCase):

qemu_img('create', '-f', iotests.imgfmt,

'-o', 'backing_file=%s' % mid_img,

'-F', iotests.imgfmt, test_img)

- qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img)

- qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288', mid_img)

+ if self.image_len:

+ qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img)

+ qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288',

+ mid_img)

self.vm = iotests.VM().add_drive(test_img, "node-name=top,backing.node-name=mid,backing.backing.node-name=base", interface="none")

self.vm.add_device('virtio-scsi')

self.vm.add_device("scsi-hd,id=scsi0,drive=drive0")

@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(ImageCommitTestCase):

def test_commit(self):

self.run_commit_test(mid_img, backing_img)

+ if not self.image_len:

+ return

qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)

qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)

def test_commit_node(self):

self.run_commit_test("mid", "base", node_names=True)

+ if not self.image_len:

+ return

qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)

qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)

@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(ImageCommitTestCase):

def test_top_is_active(self):

self.run_commit_test(test_img, backing_img, need_ready=True)

+ if not self.image_len:

+ return

qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)

qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)

def test_top_is_default_active(self):

self.run_default_commit_test()

+ if not self.image_len:

+ return

qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)

qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)

--

2.35.1

From: John Snow <jsnow@redhat.com>

reimplement qemu_img() in terms of qemu_tool() in preparation for doing

the same with qemu_io().

Signed-off-by: John Snow <jsnow@redhat.com>

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

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

Message-Id: <20220418211504.943969-7-jsnow@redhat.com>

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

---

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

1 file changed, 21 insertions(+), 11 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]:

return result

-def qemu_img(*args: str, check: bool = True, combine_stdio: bool = True

- ) -> 'subprocess.CompletedProcess[str]':

- """

- Run qemu_img and return the status code and console output.

- This function always prepends QEMU_IMG_OPTIONS and may further alter

- the args for 'create' commands.

+def qemu_tool(*args: str, check: bool = True, combine_stdio: bool = True

+ ) -> 'subprocess.CompletedProcess[str]':

+ """

+ Run a qemu tool and return its status code and console output.

- :param args: command-line arguments to qemu-img.

+ :param args: full command line to run.

:param check: Enforce a return code of zero.

:param combine_stdio: set to False to keep stdout/stderr separated.

@@ -XXX,XX +XXX,XX @@ def qemu_img(*args: str, check: bool = True, combine_stdio: bool = True

properties. If streams are not combined, it will also have a

stderr property.

"""

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

-

subp = subprocess.run(

- full_args,

+ args,

stdout=subprocess.PIPE,

stderr=subprocess.STDOUT if combine_stdio else subprocess.PIPE,

universal_newlines=True,

@@ -XXX,XX +XXX,XX @@ def qemu_img(*args: str, check: bool = True, combine_stdio: bool = True

if check and subp.returncode or (subp.returncode < 0):

raise VerboseProcessError(

- subp.returncode, full_args,

+ subp.returncode, args,

output=subp.stdout,

stderr=subp.stderr,

)

@@ -XXX,XX +XXX,XX @@ def qemu_img(*args: str, check: bool = True, combine_stdio: bool = True

return subp

+def qemu_img(*args: str, check: bool = True, combine_stdio: bool = True

+ ) -> 'subprocess.CompletedProcess[str]':

+ """

+ Run QEMU_IMG_PROG and return its status code and console output.

+

+ This function always prepends QEMU_IMG_OPTIONS and may further alter

+ the args for 'create' commands.

+

+ See `qemu_tool()` for greater detail.

+ """

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

+ return qemu_tool(*full_args, check=check, combine_stdio=combine_stdio)

+

+

def ordered_qmp(qmsg, conv_keys=True):

# Dictionaries are not ordered prior to 3.6, therefore:

if isinstance(qmsg, list):

--

2.35.1