On Thu, Nov 13, 2025 at 08:29:54AM +0100, Thomas Huth wrote: > On 12/11/2025 18.09, Alberto Garcia wrote: > > Use 'qemu-io -c map' instead of 'qemu-img map' to get an output that > > works with both image types. > > > > Cc: qemu-stable <[email protected]> > > Fixes: 909852ba6b4a ("qemu-img rebase: don't exceed IO_BUF_SIZE in one > > operation") > > Signed-off-by: Alberto Garcia <[email protected]> > > --- > > tests/qemu-iotests/024 | 2 +- > > tests/qemu-iotests/024.out | 3 +-- > > 2 files changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 > > index 021169b4a1..10be2bd845 100755 > > --- a/tests/qemu-iotests/024 > > +++ b/tests/qemu-iotests/024 > > @@ -359,7 +359,7 @@ $QEMU_IO "$OVERLAY" -c "read -P 0x00 0 1M" | > > _filter_qemu_io > > $QEMU_IO "$OVERLAY" -c "read -P 0xff 1M 2M" | _filter_qemu_io > > $QEMU_IO "$OVERLAY" -c "read -P 0x00 3M 1M" | _filter_qemu_io > > -$QEMU_IMG map "$OVERLAY" | _filter_qemu_img_map > > +$QEMU_IO -c map "$OVERLAY" | _filter_qemu_io > > echo > > diff --git a/tests/qemu-iotests/024.out b/tests/qemu-iotests/024.out > > index 1b7522ba71..da8fedc08b 100644 > > --- a/tests/qemu-iotests/024.out > > +++ b/tests/qemu-iotests/024.out > > @@ -266,7 +266,6 @@ read 2097152/2097152 bytes at offset 1048576 > > 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > read 1048576/1048576 bytes at offset 3145728 > > 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > > -Offset Length File > > -0 0x400000 TEST_DIR/subdir/t.IMGFMT > > +4 MiB (0x400000) bytes allocated at offset 0 bytes (0x0) > > *** done > > Thanks! > > Tested-by: Thomas Huth <[email protected]>
Not exactly NBD related, but since I wanted a cleaner iotests run before submitting my pull request, I went ahead and queued this through my tree. -- Eric Blake, Principal Software Engineer Red Hat, Inc. Virtualization: qemu.org | libguestfs.org
