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 894B6C4CEC9 for ; Tue, 17 Sep 2019 09:27:34 +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 5DDEC21852 for ; Tue, 17 Sep 2019 09:27:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DDEC21852 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]:43170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iA9ll-0000Wt-Et for qemu-devel@archiver.kernel.org; Tue, 17 Sep 2019 05:27:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34632) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iA9fC-0002BF-B9 for qemu-devel@nongnu.org; Tue, 17 Sep 2019 05:20:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iA9fA-0004ps-Q8 for qemu-devel@nongnu.org; Tue, 17 Sep 2019 05:20:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55586) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iA9f7-0004o1-KO; Tue, 17 Sep 2019 05:20:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B91E5309175F; Tue, 17 Sep 2019 09:20:40 +0000 (UTC) Received: from localhost (ovpn-116-130.ams2.redhat.com [10.36.116.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 341C260BE1; Tue, 17 Sep 2019 09:20:39 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Tue, 17 Sep 2019 11:20:04 +0200 Message-Id: <20190917092004.999-8-mreitz@redhat.com> In-Reply-To: <20190917092004.999-1-mreitz@redhat.com> References: <20190917092004.999-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 17 Sep 2019 09:20:40 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 7/7] iotests: Cache supported_formats() 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 , Thomas Huth , qemu-devel@nongnu.org, Max Reitz , Andrey Shinkevich , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Max Reitz Reviewed-by: John Snow --- tests/qemu-iotests/iotests.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.p= y index a42702b6b9..b30044e1cc 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -885,9 +885,17 @@ def qemu_pipe(*args): def supported_formats(read_only=3DFalse): '''Set 'read_only' to True to check ro-whitelist Otherwise, rw-whitelist is checked''' - format_message =3D qemu_pipe("-drive", "format=3Dhelp") - line =3D 1 if read_only else 0 - return format_message.splitlines()[line].split(":")[1].split() + + if not hasattr(supported_formats, "formats"): + supported_formats.formats =3D {} + + if read_only not in supported_formats.formats: + format_message =3D qemu_pipe("-drive", "format=3Dhelp") + line =3D 1 if read_only else 0 + supported_formats.formats[read_only] =3D \ + format_message.splitlines()[line].split(":")[1].split() + + return supported_formats.formats[read_only] =20 def skip_if_unsupported(required_formats=3D[], read_only=3DFalse): '''Skip Test Decorator --=20 2.21.0