On 7/22/24 10:18 AM, Thomas Huth wrote: > [Вы нечасто получаете письма от [email protected]. Узнайте, почему это > важно, по адресу https://aka.ms/LearnAboutSenderIdentification ] > > On 31/10/2023 19.58, Kevin Wolf wrote: >> From: Andrey Drobyshev <[email protected]> >> >> As the previous commit changes the logic of "qemu-img rebase" (it's using >> write alignment now), let's add a couple more test cases which would >> ensure it works correctly. In particular, the following scenarios: >> >> 024: add test case for rebase within one backing chain when the overlay >> cluster size > backings cluster size; >> 271: add test case for rebase images that contain subclusters. Check >> that no extra allocations are being made. >> >> Signed-off-by: Andrey Drobyshev <[email protected]> >> Reviewed-by: Hanna Czenczek <[email protected]> >> Message-ID: <[email protected]> >> Reviewed-by: Kevin Wolf <[email protected]> >> Signed-off-by: Kevin Wolf <[email protected]> >> --- >> tests/qemu-iotests/024 | 60 ++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/024.out | 43 +++++++++++++++++++++++++ >> tests/qemu-iotests/271 | 66 ++++++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/271.out | 42 ++++++++++++++++++++++++ >> 4 files changed, 211 insertions(+) > > Hi! > > Seems like this patch now breaks the iotests when running with -qed : > > $ ./check -qed 024 > QEMU -- ".../qemu-build/qemu-system-x86_64" -nodefaults -display > none -accel qtest > QEMU_IMG -- ".../qemu-build/qemu-img" > QEMU_IO -- ".../qemu-build/qemu-io" --cache writeback --aio > threads -f qed > QEMU_NBD -- ".../qemu-build/qemu-nbd" > IMGFMT -- qed > IMGPROTO -- file > PLATFORM -- Linux/x86_64 thuth-p1g4 6.9.9-200.fc40.x86_64 > TEST_DIR -- .../qemu-build/tests/qemu-iotests/scratch > SOCK_DIR -- /tmp/qemu-iotests-b84qth8b > GDB_OPTIONS -- > VALGRIND_QEMU -- > PRINT_QEMU_OUTPUT -- > > 024 fail [09:14:06] [09:14:09] 2.9s output > mismatch (see > .../qemu-build/tests/qemu-iotests/scratch/qed-file-024/024.out.bad) > --- .../qemu/tests/qemu-iotests/024.out > +++ .../qemu-build/tests/qemu-iotests/scratch/qed-file-024/024.out.bad > @@ -214,7 +214,6 @@ > virtual size: 384 KiB (393216 bytes) > cluster_size: 131072 > backing file: TEST_DIR/subdir/t.IMGFMT.base_old > -backing file format: IMGFMT > > Fill backing files with data > > Failures: 024 > Failed 1 of 1 iotests > > Could you please have a look at it? > > Thanks, > Thomas >
Hi Thomas, Thanks for the catch. That seems to be a minor issue, apparently 'qemu-img info' doesn't report the backing file format field for qed (as it does for qcow2): # qemu-img create -f qed base.qed 1M && qemu-img create -f qed -b base.qed -F qed top.qed 1M # qemu-img create -f qcow2 base.qcow2 1M && qemu-img create -f qcow2 -b base.qcow2 -F qcow2 top.qcow2 1M # qemu-img info top.qed | grep 'backing file format' # qemu-img info top.qcow2 | grep 'backing file format' backing file format: qcow2 I think we can just filter the field out and remove it from the expected output. Andrey
