summaryrefslogtreecommitdiffstats
path: root/tests/qemu-iotests/172.out
diff options
context:
space:
mode:
authorRoman Kagan2020-05-29 00:55:10 +0200
committerKevin Wolf2020-06-17 14:53:40 +0200
commitc56ee92fcba8cc922b1b2188ac20614d20223db2 (patch)
tree5790ad5e71f651f85db76f612e39d2270b6510c3 /tests/qemu-iotests/172.out
parentvirtio-blk: store opt_io_size with correct size (diff)
downloadqemu-c56ee92fcba8cc922b1b2188ac20614d20223db2.tar.gz
qemu-c56ee92fcba8cc922b1b2188ac20614d20223db2.tar.xz
qemu-c56ee92fcba8cc922b1b2188ac20614d20223db2.zip
block: consolidate blocksize properties consistency checks
Several block device properties related to blocksize configuration must be in certain relationship WRT each other: physical block must be no smaller than logical block; min_io_size, opt_io_size, and discard_granularity must be a multiple of a logical block. To ensure these requirements are met, add corresponding consistency checks to blkconf_blocksizes, adjusting its signature to communicate possible error to the caller. Also remove the now redundant consistency checks from the specific devices. Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Paul Durrant <paul@xen.org> Message-Id: <20200528225516.1676602-3-rvkagan@yandex-team.ru> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/172.out')
-rw-r--r--tests/qemu-iotests/172.out2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out
index 7abbe82427..59cc70aebb 100644
--- a/tests/qemu-iotests/172.out
+++ b/tests/qemu-iotests/172.out
@@ -1204,7 +1204,7 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
drive-type = "144"
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical_block_size=4096
-QEMU_PROG: -device floppy,drive=none0,logical_block_size=4096: Physical and logical block size must be 512 for floppy
+QEMU_PROG: -device floppy,drive=none0,logical_block_size=4096: logical_block_size > physical_block_size not supported
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physical_block_size=1024
QEMU_PROG: -device floppy,drive=none0,physical_block_size=1024: Physical and logical block size must be 512 for floppy