From nobody Mon Feb 9 20:35:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1609771066; cv=none; d=zohomail.com; s=zohoarc; b=G26ayHS6NzKFG6sIGdYNz7GPT7GWm22I4A2vKjJotAkTXOwWAneBC0Cgq0FVPsPXrDk1ZvyVOHlaMosbBXt15ndHY/TYBL0AzOlBjOEfX3YszF/4595CPJ2DHqEYz2B91jus+3d2K/bu99Q3WPHvve1lvOQiGyFE27UX+ofr55w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609771066; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6BSbfoYZQUCUaGY/gemcWXuxJ/ui53Ca+rS+uU1wPRs=; b=no+gSuS6uBuIK6JPj/2Kjm3PPDolZiCJSHzgrE3cN3XDzKtYAjjhHHRwhb2g/7JuiyqSTcup+TKgxrj5rTMgfF0Yb/2tRQL0lvLfDS+ge/K8wFNmAc45ytXvIjHr8NHtg49Q2AnTu0ZNqNDqrxZ2RpGmMIq9JgPmwBI5KzFHsu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1609771066953784.1128935565873; Mon, 4 Jan 2021 06:37:46 -0800 (PST) Received: from localhost ([::1]:50752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwQzR-0002o5-Rk for importer@patchew.org; Mon, 04 Jan 2021 09:37:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwQuE-0006S9-1a for qemu-devel@nongnu.org; Mon, 04 Jan 2021 09:32:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kwQuB-00012G-Ue for qemu-devel@nongnu.org; Mon, 04 Jan 2021 09:32:21 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-457-0L6NDBQSPL2gejYWkrGmjw-1; Mon, 04 Jan 2021 09:32:16 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id F1899100E420; Mon, 4 Jan 2021 14:32:14 +0000 (UTC) Received: from localhost (ovpn-113-37.ams2.redhat.com [10.36.113.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 938575D9D5; Mon, 4 Jan 2021 14:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609770739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6BSbfoYZQUCUaGY/gemcWXuxJ/ui53Ca+rS+uU1wPRs=; b=Sby93aluLCgFtvUna3RzVkQfzwCf4kLlDoa3C39WtbKCcEVZ40JgfnW4WeXRS06WBKHVQa b32grzMKUwqXzH4zr1pfVivtxDte1Jo7tUqwbmpxRUgafGttISYy8q5kBac6bpwg7UxLWu ja7+lrfovYdVJSgr0LFIvEUphot7cOo= X-MC-Unique: 0L6NDBQSPL2gejYWkrGmjw-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL 4/5] tracetool: add input filename and line number to Event Date: Mon, 4 Jan 2021 14:31:53 +0000 Message-Id: <20210104143154.462212-5-stefanha@redhat.com> In-Reply-To: <20210104143154.462212-1-stefanha@redhat.com> References: <20210104143154.462212-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Eduardo Habkost , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Store the input filename and line number in Event. A later patch will use this to improve error messages. Signed-off-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Message-Id: <20200827142915.108730-4-stefanha@redhat.com> --- scripts/tracetool/__init__.py | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index da5004ea45..96b1cd69a5 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -218,6 +218,10 @@ class Event(object): Properties of the event. args : Arguments The event arguments. + lineno : int + The line number in the input file. + filename : str + The path to the input file. =20 """ =20 @@ -230,7 +234,7 @@ class Event(object): =20 _VALID_PROPS =3D set(["disable", "tcg", "tcg-trans", "tcg-exec", "vcpu= "]) =20 - def __init__(self, name, props, fmt, args, orig=3DNone, + def __init__(self, name, props, fmt, args, lineno, filename, orig=3DNo= ne, event_trans=3DNone, event_exec=3DNone): """ Parameters @@ -243,6 +247,10 @@ class Event(object): Event printing format string(s). args : Arguments Event arguments. + lineno : int + The line number in the input file. + filename : str + The path to the input file. orig : Event or None Original Event before transformation/generation. event_trans : Event or None @@ -255,6 +263,8 @@ class Event(object): self.properties =3D props self.fmt =3D fmt self.args =3D args + self.lineno =3D int(lineno) + self.filename =3D str(filename) self.event_trans =3D event_trans self.event_exec =3D event_exec =20 @@ -276,16 +286,21 @@ class Event(object): def copy(self): """Create a new copy.""" return Event(self.name, list(self.properties), self.fmt, - self.args.copy(), self, self.event_trans, self.event_= exec) + self.args.copy(), self.lineno, self.filename, + self, self.event_trans, self.event_exec) =20 @staticmethod - def build(line_str): + def build(line_str, lineno, filename): """Build an Event instance from a string. =20 Parameters ---------- line_str : str Line describing the event. + lineno : int + Line number in input file. + filename : str + Path to input file. """ m =3D Event._CRE.match(line_str) assert m is not None @@ -315,7 +330,7 @@ class Event(object): if "tcg" in props and isinstance(fmt, str): raise ValueError("Events with 'tcg' property must have two for= mat strings") =20 - event =3D Event(name, props, fmt, args) + event =3D Event(name, props, fmt, args, lineno, filename) =20 # add implicit arguments when using the 'vcpu' property import tracetool.vcpu @@ -360,6 +375,8 @@ class Event(object): list(self.properties), self.fmt, self.args.transform(*trans), + self.lineno, + self.filename, self) =20 =20 @@ -386,7 +403,7 @@ def read_events(fobj, fname): continue =20 try: - event =3D Event.build(line) + event =3D Event.build(line, lineno, fname) except ValueError as e: arg0 =3D 'Error at %s:%d: %s' % (fname, lineno, e.args[0]) e.args =3D (arg0,) + e.args[1:] --=20 2.29.2