From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE7B9C04AA7 for ; Mon, 13 May 2019 13:23:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6690C208C2 for ; Mon, 13 May 2019 13:23:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6690C208C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:57379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQAvm-0004KT-Ka for qemu-devel@archiver.kernel.org; Mon, 13 May 2019 09:23:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQAsf-0002IK-5Y for qemu-devel@nongnu.org; Mon, 13 May 2019 09:20:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQAse-00081v-2n for qemu-devel@nongnu.org; Mon, 13 May 2019 09:20:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41160) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQAsZ-0007yf-Qp; Mon, 13 May 2019 09:20:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EA7CF3091753; Mon, 13 May 2019 13:20:28 +0000 (UTC) Received: from dresden.str.redhat.com (unknown [10.40.206.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8EA4260C4D; Mon, 13 May 2019 13:20:27 +0000 (UTC) To: Nir Soffer References: <20190510211954.29574-1-mreitz@redhat.com> From: Max Reitz Openpgp: preference=signencrypt Autocrypt: addr=mreitz@redhat.com; prefer-encrypt=mutual; keydata= mQENBFXOJlcBCADEyyhOTsoa/2ujoTRAJj4MKA21dkxxELVj3cuILpLTmtachWj7QW+TVG8U /PsMCFbpwsQR7oEy8eHHZwuGQsNpEtNC2G/L8Yka0BIBzv7dEgrPzIu+W3anZXQW4702+uES U29G8TP/NGfXRRHGlbBIH9KNUnOSUD2vRtpOLXkWsV5CN6vQFYgQfFvmp5ZpPeUe6xNplu8V mcTw8OSEDW/ZnxJc8TekCKZSpdzYoxfzjm7xGmZqB18VFwgJZlIibt1HE0EB4w5GsD7x5ekh awIe3RwoZgZDLQMdOitJ1tUc8aqaxvgA4tz6J6st8D8pS//m1gAoYJWGwwIVj1DjTYLtABEB AAG0HU1heCBSZWl0eiA8bXJlaXR6QHJlZGhhdC5jb20+iQFTBBMBCAA9AhsDBQkSzAMABQsJ CAcCBhUICQoLAgQWAgMBAh4BAheABQJVzie5FRhoa3A6Ly9rZXlzLmdudXBnLm5ldAAKCRD0 B9sAYdXPQDcIB/9uNkbYEex1rHKz3mr12uxYMwLOOFY9fstP5aoVJQ1nWQVB6m2cfKGdcRe1 2/nFaHSNAzT0NnKz2MjhZVmcrpyd2Gp2QyISCfb1FbT82GMtXFj1wiHmPb3CixYmWGQUUh+I AvUqsevLA+WihgBUyaJq/vuDVM1/K9Un+w+Tz5vpeMidlIsTYhcsMhn0L9wlCjoucljvbDy/ 8C9L2DUdgi3XTa0ORKeflUhdL4gucWoAMrKX2nmPjBMKLgU7WLBc8AtV+84b9OWFML6NEyo4 4cP7cM/07VlJK53pqNg5cHtnWwjHcbpGkQvx6RUx6F1My3y52vM24rNUA3+ligVEgPYBuQEN BFXOJlcBCADAmcVUNTWT6yLWQHvxZ0o47KCP8OcLqD+67T0RCe6d0LP8GsWtrJdeDIQk+T+F xO7DolQPS6iQ6Ak2/lJaPX8L0BkEAiMuLCKFU6Bn3lFOkrQeKp3u05wCSV1iKnhg0UPji9V2 W5eNfy8F4ZQHpeGUGy+liGXlxqkeRVhLyevUqfU0WgNqAJpfhHSGpBgihUupmyUg7lfUPeRM DzAN1pIqoFuxnN+BRHdAecpsLcbR8sQddXmDg9BpSKozO/JyBmaS1RlquI8HERQoe6EynJhd 64aICHDfj61rp+/0jTIcevxIIAzW70IadoS/y3DVIkuhncgDBvGbF3aBtjrJVP+5ABEBAAGJ ASUEGAEIAA8FAlXOJlcCGwwFCRLMAwAACgkQ9AfbAGHVz0CbFwf9F/PXxQR9i4N0iipISYjU sxVdjJOM2TMut+ZZcQ6NSMvhZ0ogQxJ+iEQ5OjnIputKvPVd5U7WRh+4lF1lB/NQGrGZQ1ic alkj6ocscQyFwfib+xIe9w8TG1CVGkII7+TbS5pXHRxZH1niaRpoi/hYtgzkuOPp35jJyqT/ /ELbqQTDAWcqtJhzxKLE/ugcOMK520dJDeb6x2xVES+S5LXby0D4juZlvUj+1fwZu+7Io5+B bkhSVPb/QdOVTpnz7zWNyNw+OONo1aBUKkhq2UIByYXgORPFnbfMY7QWHcjpBVw9MgC4tGeF R4bv+1nAMMxKmb5VvQCExr0eFhJUAHAhVg== Message-ID: Date: Mon, 13 May 2019 15:20:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="jefPE3Y4QmQrhcPt4Xj1ivPCguzFFw8mg" X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 13 May 2019 13:20:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: Re: [Qemu-devel] [PATCH] iotests: Filter 175's allocation information X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , QEMU Developers , qemu-block Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --jefPE3Y4QmQrhcPt4Xj1ivPCguzFFw8mg From: Max Reitz To: Nir Soffer Cc: qemu-block , QEMU Developers , Kevin Wolf , Thomas Huth Message-ID: Subject: Re: [PATCH] iotests: Filter 175's allocation information References: <20190510211954.29574-1-mreitz@redhat.com> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10.05.19 23:45, Nir Soffer wrote: > On Sat, May 11, 2019 at 12:19 AM Max Reitz > wrote: >=20 > It is possible for an empty file to take up blocks on a filesystem.= > Make iotest 175 take this into account. >=20 > Reported-by: Thomas Huth > > Signed-off-by: Max Reitz > > --- > =C2=A0tests/qemu-iotests/175=C2=A0 =C2=A0 =C2=A0| 15 +++++++++++---= - > =C2=A0tests/qemu-iotests/175.out |=C2=A0 8 ++++---- > =C2=A02 files changed, 15 insertions(+), 8 deletions(-) >=20 > diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 > index d0ffc495c2..b5652a3889 100755 > --- a/tests/qemu-iotests/175 > +++ b/tests/qemu-iotests/175 > @@ -28,7 +28,8 @@ status=3D1=C2=A0 =C2=A0 =C2=A0 # failure is the d= efault! >=20 > =C2=A0_cleanup() > =C2=A0{ > -=C2=A0 =C2=A0 =C2=A0 =C2=A0_cleanup_test_img > +=C2=A0 =C2=A0 _cleanup_test_img > +=C2=A0 =C2=A0 rm -f "$TEST_DIR/empty" > =C2=A0} > =C2=A0trap "_cleanup; exit \$status" 0 1 2 3 15 >=20 > @@ -40,18 +41,24 @@ _supported_fmt raw > =C2=A0_supported_proto file > =C2=A0_supported_os Linux >=20 > -size=3D1m > +size=3D$((1 * 1024 * 1024)) >=20 > + > +touch "$TEST_DIR/empty" > +empty_blocks=3D$(stat -c '%b' "$TEST_DIR/empty") >=20 >=20 > Maybe extra_blocks? Why not. > =C2=A0echo > =C2=A0echo "=3D=3D creating image with default preallocation =3D=3D= " > =C2=A0_make_test_img $size | _filter_imgfmt > -stat -c "size=3D%s, blocks=3D%b" $TEST_IMG > +stat -c "size=3D%s, blocks=3D%b" $TEST_IMG \ > +=C2=A0 =C2=A0 | sed -e "s/blocks=3D$empty_blocks/nothing allocated= /" >=20 > =C2=A0for mode in off full falloc; do > =C2=A0 =C2=A0 =C2=A0echo > =C2=A0 =C2=A0 =C2=A0echo "=3D=3D creating image with preallocation = $mode =3D=3D" > =C2=A0 =C2=A0 =C2=A0IMGOPTS=3Dpreallocation=3D$mode _make_test_img = $size | _filter_imgfmt > -=C2=A0 =C2=A0 stat -c "size=3D%s, blocks=3D%b" $TEST_IMG > +=C2=A0 =C2=A0 stat -c "size=3D%s, blocks=3D%b" $TEST_IMG \ > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 | sed -e "s/blocks=3D$empty_blocks/not= hing allocated/" \ > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 | sed -e "s/blocks=3D$((empty_blocks += size / > 512))/everything allocated/" >=20 >=20 > "fully allocated"? I didn=E2=80=99t like that because that sounds like it only applies to preallocation=3Dfull. > Maybe add a helper like this: >=20 > _filter_blocks() { > =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Some file systems sometimes allocate extr= a blocks > =C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0sed -e "s/blocks=3D$empty_blocks/= nothing allocated/" \ > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-e "s/blocks=3D$= ((empty_blocks + size / 512))/everything > allocated/" > } >=20 > So we can do: >=20 > =C2=A0 =C2=A0=C2=A0stat -c "size=3D%s, blocks=3D%b" $TEST_IMG | _filter= _blocks >=20 > And it is also clear why we need to run sed without looking up the > commit message. Makes sense to me, but I find it a bit awkward to make a filter rely on a data value determined outside of the filter... I=E2=80=99ll see what I= can do to calm my conscience. Max --jefPE3Y4QmQrhcPt4Xj1ivPCguzFFw8mg Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAlzZbxkACgkQ9AfbAGHV z0BVSwf/Wl0/8/DSH4wfiBsVbzw3OLWgsTw1gqCDcHBAHcTwFMPSv71xLP79HQR5 D1I1T2maPDCzWgOTOYt6z1ffvZL3+kLiI4c6ugo117osn3/qTiMgHR+zH919STOb /+5lFiV+Rwdtv7nAtEeMWZKfUU7neeHq5ZbvcyNZS2z1IWX6hP+ZqKKyddXWPJT9 ubkGRniFEBgzEX6VDU+lpyyZkqsxTbyN5jC8/AmPnbPaJiNn2/pMZ+kYQomQpsxM B8e9EMO1BBzEXM6RLyrm0WJwXge7sEiJ1Pp4IkdZJvzvvBSNxMdpNs6zdcjbEl8a WxUXc0ZthSnjA40vunQJQvTqFKbtvA== =Dxeg -----END PGP SIGNATURE----- --jefPE3Y4QmQrhcPt4Xj1ivPCguzFFw8mg--