Re: [Qemu-block] [PATCH v3] iotests: Fix CID for VMDK afl image
On Wed, 02/28 18:50, Max Reitz wrote: > On 2018-02-02 06:23, Fam Zheng wrote: > > This reverts commit 76bf133c4 which updated the reference output, and > > fixed the reference image, because the code path we want to exercise is > > actually the invalid image size. > > > > The descriptor block in the image, which includes the CID to verify, has > > been > > invalid since the reference image was added. Since commit 9877860e7bd we > > report > > this error earlier than the "file too large", so 059.out mismatches. > > > > The binary change is generated along the operations of: > > > > $ bunzip2 afl9.vmdk.bz2 > > $ qemu-img create -f vmdk fix.vmdk 1G > > $ dd if=afl9.vmdk of=fix.vmdk bs=512 count=1 conv=notrunc > > $ mv fix.vmdk afl9.vmdk > > $ bzip2 afl9.vmdk > > > > Signed-off-by: Fam Zheng> > > > --- > > Could you rebase this on master (so only the _notrun portion remains)? > It appears that v2 has hit master already... OK, will do! Fam
Re: [Qemu-block] [PATCH v3] iotests: Fix CID for VMDK afl image
On 2018-02-02 06:23, Fam Zheng wrote: > This reverts commit 76bf133c4 which updated the reference output, and > fixed the reference image, because the code path we want to exercise is > actually the invalid image size. > > The descriptor block in the image, which includes the CID to verify, has been > invalid since the reference image was added. Since commit 9877860e7bd we > report > this error earlier than the "file too large", so 059.out mismatches. > > The binary change is generated along the operations of: > > $ bunzip2 afl9.vmdk.bz2 > $ qemu-img create -f vmdk fix.vmdk 1G > $ dd if=afl9.vmdk of=fix.vmdk bs=512 count=1 conv=notrunc > $ mv fix.vmdk afl9.vmdk > $ bzip2 afl9.vmdk > > Signed-off-by: Fam Zheng> > --- Could you rebase this on master (so only the _notrun portion remains)? It appears that v2 has hit master already... Max signature.asc Description: OpenPGP digital signature
[Qemu-block] [PATCH v3] iotests: Fix CID for VMDK afl image
This reverts commit 76bf133c4 which updated the reference output, and fixed the reference image, because the code path we want to exercise is actually the invalid image size. The descriptor block in the image, which includes the CID to verify, has been invalid since the reference image was added. Since commit 9877860e7bd we report this error earlier than the "file too large", so 059.out mismatches. The binary change is generated along the operations of: $ bunzip2 afl9.vmdk.bz2 $ qemu-img create -f vmdk fix.vmdk 1G $ dd if=afl9.vmdk of=fix.vmdk bs=512 count=1 conv=notrunc $ mv fix.vmdk afl9.vmdk $ bzip2 afl9.vmdk Signed-off-by: Fam Zheng--- v3: Skip test when ENOMEM. [Max, Eric] v2: Fix commit message "qcow2 -> vmdk". [Kevin] Revert 76bf133c4. --- tests/qemu-iotests/059 | 5 ++--- tests/qemu-iotests/059.out | 2 +- tests/qemu-iotests/sample_images/afl9.vmdk.bz2 | Bin 178 -> 618 bytes 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 index 40f89eae18..530bbbe6ce 100755 --- a/tests/qemu-iotests/059 +++ b/tests/qemu-iotests/059 @@ -152,9 +152,8 @@ done echo echo "=== Testing afl image with a very large capacity ===" _use_sample_img afl9.vmdk.bz2 -# The sed makes this test pass on machines with little RAM -# (and also with 32 bit builds) -_img_info | sed -e 's/Cannot allocate memory/Invalid argument/' +_img_info | grep -q 'Cannot allocate memory' && _notrun "Insufficent memory, skipped test" +_img_info _cleanup_test_img # success, all done diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 1ac5d56233..f6dce7947c 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -2358,5 +2358,5 @@ Offset Length Mapped to File 0x14000 0x1 0x5 TEST_DIR/t-s003.vmdk === Testing afl image with a very large capacity === -qemu-img: Could not open 'TEST_DIR/afl9.IMGFMT': Could not open 'TEST_DIR/afl9.IMGFMT': Invalid argument +qemu-img: Can't get image size 'TEST_DIR/afl9.IMGFMT': File too large *** done diff --git a/tests/qemu-iotests/sample_images/afl9.vmdk.bz2 b/tests/qemu-iotests/sample_images/afl9.vmdk.bz2 index 03615d36a12425cf4240bab86f4cfe648db14572..9fcd0af45a815431acf4689e0845ecf2d333cd58 100644 GIT binary patch literal 618 zcmV-w0+szjT4*^jL0KkKSvgW7ssIN3|NsBH-Q9UpfAhclU70`s-*NE~5QvC~h=_=Y zh>D2n*q*=vygR634445h35k;?00h9835kMW4$iPepVE{Bqk)uhJ^wfGLr=)3s zhM5CR88jLh7)B;cA*K)*6GmuECPU3o4NWG5O#pg>Ak#xY8Z^CrMt}oD38Ns$ z02n}M0LdjZ&}cLPqd+nPKmn$j0iXe(02%-d27nnJriN-uE+X@Bj4BBfd|yV!NB zwqkL}nW3AI5x^jp=t%^F1pxqp)v#n#)j$zcm1xqv(!$2d*5%vF{5RPWnOV8-^tE<( zU~%&}Y0uNu*9Wt=yS^8PkC%IG;aD{l#sG` m4Ho*fsHXdM
Re: [Qemu-block] [PATCH v3] iotests: Fix CID for VMDK afl image
On 2018-02-02 06:23, Fam Zheng wrote: > This reverts commit 76bf133c4 which updated the reference output, and > fixed the reference image, because the code path we want to exercise is > actually the invalid image size. > > The descriptor block in the image, which includes the CID to verify, has been > invalid since the reference image was added. Since commit 9877860e7bd we > report > this error earlier than the "file too large", so 059.out mismatches. > > The binary change is generated along the operations of: > > $ bunzip2 afl9.vmdk.bz2 > $ qemu-img create -f vmdk fix.vmdk 1G > $ dd if=afl9.vmdk of=fix.vmdk bs=512 count=1 conv=notrunc > $ mv fix.vmdk afl9.vmdk > $ bzip2 afl9.vmdk > > Signed-off-by: Fam Zheng> > --- > > v3: Skip test when ENOMEM. [Max, Eric] > > v2: Fix commit message "qcow2 -> vmdk". [Kevin] > Revert 76bf133c4. > --- > tests/qemu-iotests/059 | 5 ++--- > tests/qemu-iotests/059.out | 2 +- > tests/qemu-iotests/sample_images/afl9.vmdk.bz2 | Bin 178 -> 618 bytes > 3 files changed, 3 insertions(+), 4 deletions(-) Nice, thanks. Reviewed-by: Max Reitz signature.asc Description: OpenPGP digital signature