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_HELO_NONE,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 A1C68C32792 for ; Mon, 30 Sep 2019 14:34:09 +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 7466921855 for ; Mon, 30 Sep 2019 14:34:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7466921855 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]:53130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEwka-0003Gz-8r for qemu-devel@archiver.kernel.org; Mon, 30 Sep 2019 10:34:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53863) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEwid-0001u7-WB for qemu-devel@nongnu.org; Mon, 30 Sep 2019 10:32:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iEwic-0006jU-Ol for qemu-devel@nongnu.org; Mon, 30 Sep 2019 10:32:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60700) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iEwia-0006hV-9j; Mon, 30 Sep 2019 10:32:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83CAB30832E9; Mon, 30 Sep 2019 14:32:03 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 453655C3FD; Mon, 30 Sep 2019 14:32:02 +0000 (UTC) Message-ID: Subject: Re: [PATCH 09/18] iotests: Drop IMGOPTS use in 267 From: Maxim Levitsky To: Max Reitz , qemu-block@nongnu.org Date: Mon, 30 Sep 2019 17:32:01 +0300 In-Reply-To: References: <20190927094242.11152-1-mreitz@redhat.com> <20190927094242.11152-10-mreitz@redhat.com> <1c6c86af32c3de1b473b48704cf506694c10c597.camel@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 30 Sep 2019 14:32:03 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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" On Mon, 2019-09-30 at 15:01 +0200, Max Reitz wrote: > 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= _FILE > > > variable. > > >=20 > > > Signed-off-by: Max Reitz > > > --- > > > tests/qemu-iotests/267 | 12 ++++++++---- > > > 1 file changed, 8 insertions(+), 4 deletions(-) > > >=20 > > > 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_qe= mu "$@" | _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-= name=3Dbacking-file \ > > > -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3D= file \ > > > -blockdev driver=3D$IMGFMT,file=3Dfile,backing=3Dbacking-= file,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-= name=3Dbacking-file \ > > > -blockdev driver=3D$IMGFMT,file=3Dbacking-file,node-name=3D= backing-fmt \ > > > -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3D= file \ > > > @@ -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. >=20 > Yep, it=E2=80=99s only in Kevin=E2=80=99s block branch (and thus mine, = too). 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). >=20 I figured out that it must be something like that. Being lazy, I would like to ask if we have maybe a list of these=20 branches somewhere in the wiki? Best regards, Maxim Levitsky