From patchwork Mon Jul 24 17:54:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 792940 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xGTYp3zxsz9s2G for ; Tue, 25 Jul 2017 03:55:42 +1000 (AEST) Received: from localhost ([::1]:56180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZha0-0006Pt-Cw for incoming@patchwork.ozlabs.org; Mon, 24 Jul 2017 13:55:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZhZW-0006N8-9z for qemu-devel@nongnu.org; Mon, 24 Jul 2017 13:55:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZhZR-0007VA-F6 for qemu-devel@nongnu.org; Mon, 24 Jul 2017 13:55:10 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:54108) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZhZR-0007U6-3P for qemu-devel@nongnu.org; Mon, 24 Jul 2017 13:55:05 -0400 Received: from correu-1.ac.upc.es (correu-1.ac.upc.es [147.83.30.91]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v6OHt1Bq000845; Mon, 24 Jul 2017 19:55:01 +0200 Received: from localhost (unknown [31.210.188.120]) by correu-1.ac.upc.es (Postfix) with ESMTPSA id 0364A176C; Mon, 24 Jul 2017 19:54:55 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 20:54:54 +0300 Message-Id: <150091889458.30739.16324719944323757435.stgit@frigg.lan> X-Mailer: git-send-email 2.13.2 In-Reply-To: <150091574424.30739.4131793221953168474.stgit@frigg.lan> References: <150091574424.30739.4131793221953168474.stgit@frigg.lan> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id v6OHt1Bq000845 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 147.83.33.10 Subject: [Qemu-devel] [PATCH 13/13] trace: Rename C++-specific names in event arguments 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: "Emilio G. Cota" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Allows instrumentation clients in C++ to use the auto-generated headers. Signed-off-by: Lluís Vilanova --- scripts/tracetool/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 7c19dc8c94..be7f28d2be 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -42,6 +42,8 @@ def out(*lines, **kwargs): sys.stdout.writelines("\n".join(lines) + "\n") +FORBIDDEN = ["new", "class"] + class Arguments: """Event arguments description.""" @@ -85,6 +87,9 @@ class Arguments: else: arg_type, identifier = arg.rsplit(None, 1) + if identifier in FORBIDDEN: + identifier += "_" + res.append((arg_type, identifier)) return Arguments(res) @@ -230,7 +235,10 @@ class Event(object): fmt_trans = groups["fmt_trans"] if len(fmt_trans) > 0: fmt = [fmt_trans, fmt] - args = Arguments.build(groups["args"]) + try: + args = Arguments.build(groups["args"]) + except ForbiddenArgumentError as e: + error("Error: event '%s' uses forbidden argument name '%s'" % (name, e.name)) if "tcg-trans" in props: raise ValueError("Invalid property 'tcg-trans'")