From nobody Wed Nov 12 10:08:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569577779; cv=none; d=zoho.com; s=zohoarc; b=SP32udbfCwSR84kjP6hK9BUcLbYNRdDCVF9Fh2bf5D+k5zA/FlHp+Yy16GRWvH2bOKHmG6KA42PtSeW9W2Vod4dJJ4GXpSKAia4oXR3SRYvFGNHBSSuT/x9oxGfJzObzoD4PSgBuXZhdqjcUDS7+cWNFRG8pE5k4w9gJoABd1Vs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569577779; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=XJsblbbK+vaY1gVHan6vcW+6iYXEUp5RDG1drVWNHw8=; b=c189vEt8FieNN9zB45PDGvDfr1NyErYGQwUZy2JDhafoTeHMs1gLAeskSby4iIFvLrPm3CX2ipvhvzZEmoV4HM7Xd9y08O1HWA0GHv12StjqLLQsd8F9TEajmb2bbwHaxy4IMk3/PDIVvHTgFup0rVQ6OLi51Jm0SIEcN7A5lbA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569577779113147.72422626204082; Fri, 27 Sep 2019 02:49:39 -0700 (PDT) Received: from localhost ([::1]:49024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDmsV-0000hr-DC for importer@patchew.org; Fri, 27 Sep 2019 05:49:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33418) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDmmN-0003OZ-5G for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:43:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDmmL-0007di-Vt for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:43:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7113) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDmmJ-0007aV-H6; Fri, 27 Sep 2019 05:43:07 -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 BFAE77BDA0; Fri, 27 Sep 2019 09:43:06 +0000 (UTC) Received: from localhost (ovpn-204-76.brq.redhat.com [10.40.204.76]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5BCB55C21A; Fri, 27 Sep 2019 09:43:06 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 09/18] iotests: Drop IMGOPTS use in 267 Date: Fri, 27 Sep 2019 11:42:33 +0200 Message-Id: <20190927094242.11152-10-mreitz@redhat.com> In-Reply-To: <20190927094242.11152-1-mreitz@redhat.com> References: <20190927094242.11152-1-mreitz@redhat.com> 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.26]); Fri, 27 Sep 2019 09:43:06 +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, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- 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-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 \ @@ -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 <