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=1569578004; cv=none; d=zoho.com; s=zohoarc; b=hKApluuidmW/RyLK6/mLlHLMLS2V3zIUQbuzme9KtTkbXR55tn6ktxB4PhHm2Ct6EYXdbSJuOJvuVx+e457Kify4Tm8k/DWtUDzi64YC6ayRGEYS/0CYcL5Os5xt1oLz3u+QmCqnUigG3xByH2fUdZEvzcSa0oHm80mCVUN+VAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569578004; 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=of1zymCH4HkP2SBLJwKK0hrq/t8LOdEqhXovh6JCVLE=; b=HKoc2y9kaAyobJXUboYKVw/ycaZRtxwg3JTaGyNNNp/Kwcvd/uV1ae1bJ7MkElnbCh5d1Z1uLqDsFA4E5MMnic79O1VplF0CyzhS7lTvyKHT9tdcUSGj6ROlZ6g6lPlmlBO7QaN5Lrvkgni7gNBtiNTwPuuqWnUc8miknEr+U1I= 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 1569578004382553.8379981431598; Fri, 27 Sep 2019 02:53:24 -0700 (PDT) Received: from localhost ([::1]:49058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDmwE-00056O-7P for importer@patchew.org; Fri, 27 Sep 2019 05:53:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33279) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDmmB-000364-0l for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:43:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDmm9-0007Ru-Mo for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:42:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54686) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDmm7-0007Ma-DQ; Fri, 27 Sep 2019 05:42:55 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 9FBF530ADBAF; Fri, 27 Sep 2019 09:42:54 +0000 (UTC) Received: from localhost (ovpn-204-76.brq.redhat.com [10.40.204.76]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3614A100EBD7; Fri, 27 Sep 2019 09:42:54 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 04/18] iotests: Let _make_test_img parse its parameters Date: Fri, 27 Sep 2019 11:42:28 +0200 Message-Id: <20190927094242.11152-5-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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 27 Sep 2019 09:42:54 +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" This will allow us to add more options than just -b. Signed-off-by: Max Reitz --- tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 12b4751848..3e7adc4834 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -282,12 +282,12 @@ _make_test_img() # extra qemu-img options can be added by tests # at least one argument (the image size) needs to be added local extra_img_options=3D"" - local image_size=3D$* local optstr=3D"" local img_name=3D"" local use_backing=3D0 local backing_file=3D"" local object_options=3D"" + local misc_params=3D() =20 if [ -n "$TEST_IMG_FILE" ]; then img_name=3D$TEST_IMG_FILE @@ -303,11 +303,23 @@ _make_test_img() optstr=3D$(_optstr_add "$optstr" "key-secret=3Dkeysec0") fi =20 - if [ "$1" =3D "-b" ]; then - use_backing=3D1 - backing_file=3D$2 - image_size=3D$3 - fi + for param; do + if [ "$use_backing" =3D "1" -a -z "$backing_file" ]; then + backing_file=3D$param + continue + fi + + case "$param" in + -b) + use_backing=3D1 + ;; + + *) + misc_params=3D("${misc_params[@]}" "$param") + ;; + esac + done + if [ \( "$IMGFMT" =3D "qcow2" -o "$IMGFMT" =3D "qed" \) -a -n "$CLUSTE= R_SIZE" ]; then optstr=3D$(_optstr_add "$optstr" "cluster_size=3D$CLUSTER_SIZE") fi @@ -323,9 +335,9 @@ _make_test_img() # XXX(hch): have global image options? ( if [ $use_backing =3D 1 ]; then - $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b = "$backing_file" "$img_name" $image_size 2>&1 + $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b = "$backing_file" "$img_name" "${misc_params[@]}" 2>&1 else - $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$i= mg_name" $image_size 2>&1 + $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$i= mg_name" "${misc_params[@]}" 2>&1 fi ) | _filter_img_create =20 --=20 2.21.0