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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 05F28C33C8C for ; Mon, 6 Jan 2020 14:49:18 +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 C537020731 for ; Mon, 6 Jan 2020 14:49:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hREzr7g8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C537020731 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]:52870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioTgy-0004wd-7P for qemu-devel@archiver.kernel.org; Mon, 06 Jan 2020 09:49:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43841) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioTbE-0006jT-52 for qemu-devel@nongnu.org; Mon, 06 Jan 2020 09:43:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioTbD-0000U6-0b for qemu-devel@nongnu.org; Mon, 06 Jan 2020 09:43:19 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:40901 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ioTbC-0000Tp-Sl for qemu-devel@nongnu.org; Mon, 06 Jan 2020 09:43:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578321798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bLiYj6BXkPYmDRDPIGzY1HHWOR+4yjYppQp72ysdNJc=; b=hREzr7g8YRtA36wgPaJqJadIadogcjQhRUW8gSPeYmiBXYG7lYe4JQD77pVZKFooTnZqvY cy8648csVktpVlA5bDsX9wDLGVSktwzo4YwylSvl4+ScvC8EX9mX72SeIXvlWOkDil2xis j8Szj5o5IX1DZkR8yji8gIsUiejm3z8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-132-Xss0MI4xOBKUcOEtrf1LtA-1; Mon, 06 Jan 2020 09:43:17 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 06BF55B37C; Mon, 6 Jan 2020 14:43:16 +0000 (UTC) Received: from localhost (ovpn-117-91.ams2.redhat.com [10.36.117.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A067210840F1; Mon, 6 Jan 2020 14:43:15 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 20/34] iotests: Drop IMGOPTS use in 267 Date: Mon, 6 Jan 2020 15:41:52 +0100 Message-Id: <20200106144206.698920-21-mreitz@redhat.com> In-Reply-To: <20200106144206.698920-1-mreitz@redhat.com> References: <20200106144206.698920-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: Xss0MI4xOBKUcOEtrf1LtA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII 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: 205.139.110.61 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 , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Max Reitz Reviewed-by: Maxim Levitsky Message-id: 20191107163708.833192-14-mreitz@redhat.com 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 b823668e29..bd9a5c5524 100755 --- a/tests/qemu-iotests/267 +++ b/tests/qemu-iotests/267 @@ -69,7 +69,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 @@ -120,12 +124,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=3Db= acking-file \ -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfile \ -blockdev driver=3D$IMGFMT,file=3Dfile,backing=3Dbacking-file,nod= e-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=3Db= acking-file \ -blockdev driver=3D$IMGFMT,file=3Dbacking-file,node-name=3Dbackin= g-fmt \ -blockdev driver=3Dfile,filename=3D"$TEST_IMG",node-name=3Dfile \ @@ -142,7 +146,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 <