From nobody Sun Feb 8 22:08:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1489768640247993.6936930448543; Fri, 17 Mar 2017 09:37:20 -0700 (PDT) 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 76F25C05B1F2; Fri, 17 Mar 2017 16:37:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 43C515C887; Fri, 17 Mar 2017 16:37:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 804045EC68; Fri, 17 Mar 2017 16:37:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2HGb1Ge007130 for ; Fri, 17 Mar 2017 12:37:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E9A4187A8; Fri, 17 Mar 2017 16:37:01 +0000 (UTC) Received: from mamuti.net (ovpn-204-109.brq.redhat.com [10.40.204.109]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DD74187AC for ; Fri, 17 Mar 2017 16:37:01 +0000 (UTC) Received: by mamuti.net (Postfix, from userid 500) id 369FD1061C9; Fri, 17 Mar 2017 17:36:55 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 76F25C05B1F2 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 76F25C05B1F2 From: Jiri Denemark To: libvir-list@redhat.com Date: Fri, 17 Mar 2017 17:36:45 +0100 Message-Id: <0badc1407d6a49c9dcd9e42f558761cd536111d8.1489768416.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/14] cputest: Rename cpu-convert.py script as cpu-cpuid.py X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com 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.32]); Fri, 17 Mar 2017 16:37:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The new script is going to be more general and the original functionality can be requested by "cpu-cpuid.py convert". Signed-off-by: Jiri Denemark --- tests/cputestdata/{cpu-convert.py =3D> cpu-cpuid.py} | 17 ++++++++++++++++- tests/cputestdata/cpu-parse.sh | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) rename tests/cputestdata/{cpu-convert.py =3D> cpu-cpuid.py} (98%) diff --git a/tests/cputestdata/cpu-convert.py b/tests/cputestdata/cpu-cpuid= .py similarity index 98% rename from tests/cputestdata/cpu-convert.py rename to tests/cputestdata/cpu-cpuid.py index e069408c8..a4dc23378 100755 --- a/tests/cputestdata/cpu-convert.py +++ b/tests/cputestdata/cpu-cpuid.py @@ -222,7 +222,7 @@ def propAdd(props, feature, value): props[name] =3D value =20 =20 -for path in sys.argv[1:]: +def convert(path): props, cpuid =3D parseFeatureWords(path) =20 for feature in cpuidMap: @@ -247,3 +247,18 @@ for path in sys.argv[1:]: "id": "model-expansion"}, f, indent =3D 2, separators =3D (',', ': ')) f.write("\n") + + +if len(sys.argv) < 3: + print "Usage: %s convert json_file..." % sys.argv[0] + sys.exit(1) + +action =3D sys.argv[1] +args =3D sys.argv[2:] + +if action =3D=3D "convert": + for path in args: + convert(path) +else: + print "Unknown action: " + action + sys.exit(1) diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh index 86bcb030d..d823c399b 100755 --- a/tests/cputestdata/cpu-parse.sh +++ b/tests/cputestdata/cpu-parse.sh @@ -53,7 +53,7 @@ json <<<"$data" >$fname.json if [[ -s $fname.json ]]; then echo $fname.json if ! grep -q model-expansion $fname.json; then - $(dirname $0)/cpu-convert.py $fname.json + $(dirname $0)/cpu-cpuid.py convert $fname.json fi else rm $fname.json --=20 2.12.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list