From nobody Tue Feb 10 15:29:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515616104721702.1092945555874; Wed, 10 Jan 2018 12:28:24 -0800 (PST) Received: from localhost ([::1]:37693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZMyx-0002SJ-HJ for importer@patchew.org; Wed, 10 Jan 2018 15:28:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZMws-0001J6-Ni for qemu-devel@nongnu.org; Wed, 10 Jan 2018 15:26:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZMwr-0001Jo-On for qemu-devel@nongnu.org; Wed, 10 Jan 2018 15:26:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44750) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZMwr-0001I7-9W for qemu-devel@nongnu.org; Wed, 10 Jan 2018 15:26:09 -0500 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 6B89DC00DBAA; Wed, 10 Jan 2018 20:26:08 +0000 (UTC) Received: from localhost (ovpn-117-245.ams2.redhat.com [10.36.117.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEFD15F704; Wed, 10 Jan 2018 20:26:00 +0000 (UTC) From: Stefan Hajnoczi To: Date: Wed, 10 Jan 2018 20:25:51 +0000 Message-Id: <20180110202553.31889-2-stefanha@redhat.com> In-Reply-To: <20180110202553.31889-1-stefanha@redhat.com> References: <20180110202553.31889-1-stefanha@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.31]); Wed, 10 Jan 2018 20:26:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] tracetool: prefix parse errors with line numbers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Include the file line number in the message that is printed when trace-events parse errors are raised. Suggested-by: Dr. David Alan Gilbert Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake --- scripts/tracetool/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 0670ec17d5..fbccaaa0cf 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -300,13 +300,18 @@ def read_events(fobj): """ =20 events =3D [] - for line in fobj: + for lineno, line in enumerate(fobj): if not line.strip(): continue if line.lstrip().startswith('#'): continue =20 - event =3D Event.build(line) + try: + event =3D Event.build(line) + except ValueError as e: + arg0 =3D 'Error on line %d: %s' % (lineno + 1, e.args[0]) + e.args =3D (arg0,) + e.args[1:] + raise =20 # transform TCG-enabled events if "tcg" not in event.properties: --=20 2.14.3 From nobody Tue Feb 10 15:29:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515616254469978.7024777905575; Wed, 10 Jan 2018 12:30:54 -0800 (PST) Received: from localhost ([::1]:37892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZN1R-0004no-M7 for importer@patchew.org; Wed, 10 Jan 2018 15:30:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZMx5-0001Uz-Nu for qemu-devel@nongnu.org; Wed, 10 Jan 2018 15:26:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZMx2-0001cc-0Y for qemu-devel@nongnu.org; Wed, 10 Jan 2018 15:26:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57086) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZMx1-0001aN-Rn for qemu-devel@nongnu.org; Wed, 10 Jan 2018 15:26:19 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D6EF162E80; Wed, 10 Jan 2018 20:26:13 +0000 (UTC) Received: from localhost (ovpn-117-245.ams2.redhat.com [10.36.117.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8774817B52; Wed, 10 Jan 2018 20:26:09 +0000 (UTC) From: Stefan Hajnoczi To: Date: Wed, 10 Jan 2018 20:25:52 +0000 Message-Id: <20180110202553.31889-3-stefanha@redhat.com> In-Reply-To: <20180110202553.31889-1-stefanha@redhat.com> References: <20180110202553.31889-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 10 Jan 2018 20:26:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] tracetool: clarify that "formats" means "format strings" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The terminology used by tracetool is not consistent with C sprintf or docs/devel/tracing.txt. The word "formats" is sometimes used to mean "format strings". This patch clarifies comments and error messages that contain this word. Note that the error message lines are longer than 80 characters but I have not wrapped them to aid grepping. Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake --- scripts/tracetool/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index fbccaaa0cf..5db1f5c395 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -173,7 +173,7 @@ class Event(object): props : list of str Property names. fmt : str, list of str - Event printing format (or formats). + Event printing format string(s). args : Arguments Event arguments. orig : Event or None @@ -237,9 +237,9 @@ class Event(object): if "tcg-exec" in props: raise ValueError("Invalid property 'tcg-exec'") if "tcg" not in props and not isinstance(fmt, str): - raise ValueError("Only events with 'tcg' property can have two= formats") + raise ValueError("Only events with 'tcg' property can have two= format strings") if "tcg" in props and isinstance(fmt, str): - raise ValueError("Events with 'tcg' property must have two for= mats") + raise ValueError("Events with 'tcg' property must have two for= mat strings") =20 event =3D Event(name, props, fmt, args) =20 @@ -263,7 +263,7 @@ class Event(object): _FMT =3D re.compile("(%[\d\.]*\w+|%.*PRI\S+)") =20 def formats(self): - """List of argument print formats.""" + """List conversion specifiers in the argument print format string.= """ assert not isinstance(self.fmt, list) return self._FMT.findall(self.fmt) =20 --=20 2.14.3 From nobody Tue Feb 10 15:29:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515616124208884.9789470749246; Wed, 10 Jan 2018 12:28:44 -0800 (PST) Received: from localhost ([::1]:37695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZMzG-0002kS-Bu for importer@patchew.org; Wed, 10 Jan 2018 15:28:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZMx5-0001Ux-Nh for qemu-devel@nongnu.org; Wed, 10 Jan 2018 15:26:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZMx1-0001c9-PQ for qemu-devel@nongnu.org; Wed, 10 Jan 2018 15:26:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52722) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZMx1-0001ZW-I9 for qemu-devel@nongnu.org; Wed, 10 Jan 2018 15:26:19 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 773278B10A; Wed, 10 Jan 2018 20:26:18 +0000 (UTC) Received: from localhost (ovpn-117-245.ams2.redhat.com [10.36.117.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD77A80C1; Wed, 10 Jan 2018 20:26:14 +0000 (UTC) From: Stefan Hajnoczi To: Date: Wed, 10 Jan 2018 20:25:53 +0000 Message-Id: <20180110202553.31889-4-stefanha@redhat.com> In-Reply-To: <20180110202553.31889-1-stefanha@redhat.com> References: <20180110202553.31889-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 10 Jan 2018 20:26:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] tracetool: report error on foo() instead of foo(void) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" C functions with no arguments must be declared foo(void) instead of foo(). The tracetool argument list parser has never accepted an empty argument list. This patch adds a clear error message for this error case. Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake --- scripts/tracetool/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 5db1f5c395..8e9efba78f 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -75,6 +75,8 @@ class Arguments: res =3D [] for arg in arg_str.split(","): arg =3D arg.strip() + if not arg: + raise ValueError("Empty argument (did you forget to use 'v= oid'?)") if arg =3D=3D 'void': continue =20 --=20 2.14.3