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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 4EC91C32792 for ; Mon, 30 Sep 2019 13:05:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 24ED52086A for ; Mon, 30 Sep 2019 13:05:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24ED52086A 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 ([::1]:52112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEvN1-00059Y-80 for qemu-devel@archiver.kernel.org; Mon, 30 Sep 2019 09:05:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39671) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEvJV-0003M8-32 for qemu-devel@nongnu.org; Mon, 30 Sep 2019 09:02:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iEvJT-00014v-Ji for qemu-devel@nongnu.org; Mon, 30 Sep 2019 09:02:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33342) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iEvJQ-00012s-Nx; Mon, 30 Sep 2019 09:02:00 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EF4031DBA; Mon, 30 Sep 2019 13:01:59 +0000 (UTC) Received: from dresden.str.redhat.com (ovpn-204-240.brq.redhat.com [10.40.204.240]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C0EC35D9C3; Mon, 30 Sep 2019 13:01:58 +0000 (UTC) Subject: Re: [PATCH 09/18] iotests: Drop IMGOPTS use in 267 To: Maxim Levitsky , qemu-block@nongnu.org References: <20190927094242.11152-1-mreitz@redhat.com> <20190927094242.11152-10-mreitz@redhat.com> <1c6c86af32c3de1b473b48704cf506694c10c597.camel@redhat.com> From: Max Reitz 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, 30 Sep 2019 15:01:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 MIME-Version: 1.0 In-Reply-To: <1c6c86af32c3de1b473b48704cf506694c10c597.camel@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="IXt3TeO7hxT4mkR3sLuD6LUPvUSHGqoAf" X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 30 Sep 2019 13:02:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org 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) --IXt3TeO7hxT4mkR3sLuD6LUPvUSHGqoAf Content-Type: multipart/mixed; boundary="q6aVfQCDH2D13cGVmjLllplytTuSLEULo" --q6aVfQCDH2D13cGVmjLllplytTuSLEULo Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 29.09.19 18:33, Maxim Levitsky wrote: > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote: >> Overwriting IMGOPTS means ignoring all user-supplied options, which is= >> not what we want. Replace the current IMGOPTS use by a new BACKING_FI= LE >> variable. >> >> Signed-off-by: Max Reitz >> --- >> tests/qemu-iotests/267 | 12 ++++++++---- >> 1 file changed, 8 insertions(+), 4 deletions(-) >> >> diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267 >> index 95f885442f..529f5f9afe 100755 >> --- a/tests/qemu-iotests/267 >> +++ b/tests/qemu-iotests/267 >> @@ -68,7 +68,11 @@ size=3D128M >> =20 >> run_test() >> { >> - _make_test_img $size >> + if [ -n "$BACKING_FILE" ]; then >> + _make_test_img -b "$BACKING_FILE" $size >> + else >> + _make_test_img $size >> + fi >> printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu = "$@" | _filter_date >> } >> =20 >> @@ -119,12 +123,12 @@ echo >> =20 >> TEST_IMG=3D"$TEST_IMG.base" _make_test_img $size >> =20 >> -IMGOPTS=3D"backing_file=3D$TEST_IMG.base" \ >> +BACKING_FILE=3D"$TEST_IMG.base" \ >> run_test -blockdev driver=3Dfile,filename=3D"$TEST_IMG.base",node-nam= e=3Dbacking-file \ >> -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Df= ile \ >> -blockdev driver=3D$IMGFMT,file=3Dfile,backing=3Dbacking-fil= e,node-name=3Dfmt >> =20 >> -IMGOPTS=3D"backing_file=3D$TEST_IMG.base" \ >> +BACKING_FILE=3D"$TEST_IMG.base" \ >> run_test -blockdev driver=3Dfile,filename=3D"$TEST_IMG.base",node-nam= e=3Dbacking-file \ >> -blockdev driver=3D$IMGFMT,file=3Dbacking-file,node-name=3Db= acking-fmt \ >> -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Df= ile \ >> @@ -141,7 +145,7 @@ echo >> echo "=3D=3D=3D -blockdev with NBD server on the backing file =3D=3D=3D= " >> echo >> =20 >> -IMGOPTS=3D"backing_file=3D$TEST_IMG.base" _make_test_img $size >> +_make_test_img -b "$TEST_IMG.base" $size >> cat <> nbd_server_start unix:$TEST_DIR/nbd >> nbd_server_add -w backing-fmt >=20 > qemu's master (pulled today), don't have iotest 267, > you probably based this on some not yet merged branch. > Or I made some mistake with pulling the master branch. Yep, it=E2=80=99s only in Kevin=E2=80=99s block branch (and thus mine, to= o). He sent a pull request for it, which was rejected though (because this test is broken on anything but x64, but that doesn=E2=80=99t stop this patch). Max --q6aVfQCDH2D13cGVmjLllplytTuSLEULo-- --IXt3TeO7hxT4mkR3sLuD6LUPvUSHGqoAf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAl2R/MUACgkQ9AfbAGHV z0C/LAf/a5muIQHqQ/ey9euNFTKgOVPOTvph7cAGJFnmWs8BazcoyTucYnmauZrd NcVjqRxaZRKDqiirww/kjLulmCuaFjpIgNlJfIkGRmjjoQipbLx2AerirgjwXeea 3Ct/mcb4cv9CvNDhlBRXHyj8Czv/bmaWR9QZ7MrR1xqjveravQKtRpkm9K1Rnexr 6FvpUjQtJ45+lNtR87pjh5zD/2gwQqWKZbUhu2nXIGcGDBZM/ROFesCENDbaawxc XISB25MXJGbidEaijBX24tmyFLmmILC5bA9ANXyhEHWu9h2jer/IEfyW42aKrqHP 9g2Cn24+kqmmPRCCheg9lvt5rhZvvQ== =G81X -----END PGP SIGNATURE----- --IXt3TeO7hxT4mkR3sLuD6LUPvUSHGqoAf--