On Fri, Sep 08, 2023 at 01:07:18AM +0300, Andrey Drobyshev via wrote: > In the previous commit e2f938265e0 ("tests/qemu-iotests/197: add > testcase for CoR with subclusters") we've introduced a new testcase for > copy-on-read with subclusters. Test 197 always forces qcow2 as the top > image, but allows backing image to be in any format. That last test > case didn't meet these requirements, so let's fix it by using more > generic "qemu-io -c map" command. > > Signed-off-by: Andrey Drobyshev <andrey.drobys...@virtuozzo.com> > --- > tests/qemu-iotests/197 | 8 ++++---- > tests/qemu-iotests/197.out | 18 ++++++++---------- > 2 files changed, 12 insertions(+), 14 deletions(-)
Tested-by: Eric Blake <ebl...@redhat.com> > > diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 > index f07a9da136..8ad2bdb035 100755 > --- a/tests/qemu-iotests/197 > +++ b/tests/qemu-iotests/197 > @@ -136,18 +136,18 @@ IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \ > $QEMU_IO -c "write -P 0xaa 0 64k" "$TEST_IMG" | _filter_qemu_io > > # Allocate individual subclusters in the top image, and not the whole cluster > -$QEMU_IO -c "write -P 0xbb 28K 2K" -c "write -P 0xcc 34K 2K" "$TEST_WRAP" \ > +$QEMU_IO -f qcow2 -c "write -P 0xbb 28K 2K" -c "write -P 0xcc 34K 2K" > "$TEST_WRAP" \ > | _filter_qemu_io Adding the -f qcow2 makes sense (this is a test of subcluster behavior); and the backing file remains whatever format was passed to ./check. > +++ b/tests/qemu-iotests/197.out > @@ -42,17 +42,15 @@ wrote 2048/2048 bytes at offset 28672 > 2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > wrote 2048/2048 bytes at offset 34816 > 2 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > -Offset Length File > -0 0x7000 TEST_DIR/t.IMGFMT > -0x7000 0x800 TEST_DIR/t.wrap.IMGFMT > -0x7800 0x1000 TEST_DIR/t.IMGFMT > -0x8800 0x800 TEST_DIR/t.wrap.IMGFMT > -0x9000 0x7000 TEST_DIR/t.IMGFMT > +28 KiB (0x7000) bytes not allocated at offset 0 bytes (0x0) > +2 KiB (0x800) bytes allocated at offset 28 KiB (0x7000) > +4 KiB (0x1000) bytes not allocated at offset 30 KiB (0x7800) > +2 KiB (0x800) bytes allocated at offset 34 KiB (0x8800) > +28 KiB (0x7000) bytes not allocated at offset 36 KiB (0x9000) > read 4096/4096 bytes at offset 30720 Same information, but without the backing file details (which clears up the problem with -nbd). Reviewed-by: Eric Blake <ebl...@redhat.com> Adding to my NBD queue, for a pull request soon. -- Eric Blake, Principal Software Engineer Red Hat, Inc. Virtualization: qemu.org | libguestfs.org