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.8 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 4F08AC10F14 for ; Tue, 15 Oct 2019 14:39:54 +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 D566920854 for ; Tue, 15 Oct 2019 14:39:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D566920854 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]:47056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKNzM-0001yr-2q for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 10:39:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35950) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKNno-0006fh-Fh for qemu-devel@nongnu.org; Tue, 15 Oct 2019 10:27:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKNnm-0008Pz-DP for qemu-devel@nongnu.org; Tue, 15 Oct 2019 10:27:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59516) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKNnj-0008OL-Ed; Tue, 15 Oct 2019 10:27:51 -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 A87963082B41; Tue, 15 Oct 2019 14:27:50 +0000 (UTC) Received: from localhost (ovpn-117-226.ams2.redhat.com [10.36.117.226]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48FF710027A8; Tue, 15 Oct 2019 14:27:50 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v2 07/21] iotests: Let _make_test_img parse its parameters Date: Tue, 15 Oct 2019 16:27:15 +0200 Message-Id: <20191015142729.18123-8-mreitz@redhat.com> In-Reply-To: <20191015142729.18123-1-mreitz@redhat.com> References: <20191015142729.18123-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.45]); Tue, 15 Oct 2019 14:27:50 +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 , Maxim Levitsky , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This will allow us to add more options than just -b. Signed-off-by: Max Reitz Reviewed-by: Maxim Levitsky --- 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 "$CLUS= TER_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 "= $img_name" $image_size 2>&1 + $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "= $img_name" "${misc_params[@]}" 2>&1 fi ) | _filter_img_create =20 --=20 2.21.0