From nobody Sat Nov 15 00:06:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1759161105; cv=none; d=zohomail.com; s=zohoarc; b=I3kRS9ZP4bpMBnyG9ro5RuXmUqoIowA4zgRE46hRy4DN4w7FvKrR/mZV4s+Tqhz4ScLZxBV4qpSOiI7XCjzhb8EH3ZG6VVYJ8Hk7W/eQxAtPYR/U7lR7fmCaKshpQ3w6Cug+m/gWhnBqdLtk8O4AXDbFdZuL8k8JxYSMbu+Zf1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759161105; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BPzxrddqtL0TItlI5LLtoSQbI5T1+Lsx8CSDc/Du130=; b=F5NVBpd18ycfmbiwWhEAsay7xq0CfOtYo/JMXouA5XXwV1qPuIaW1A093Vk3uJLrNq7MeY/aCclYZAtPON6dqQc7XRXm+oVxPCXnyWRnjvO+g4IHd9Btc3o0awil4i8UVR7P5G12dyF4Y+xczZui4ONrbWj14njIU3rsIEJDadc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759161105392237.43570032598313; Mon, 29 Sep 2025 08:51:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3G8x-0000ve-6F; Mon, 29 Sep 2025 11:50:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3G8d-0000mC-Uq for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:50:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3G8P-0000KL-4a for qemu-devel@nongnu.org; Mon, 29 Sep 2025 11:50:06 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-gJEM3_k7NMmgKflsDV5PYQ-1; Mon, 29 Sep 2025 11:49:48 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-634bff4ccc6so3805188a12.1 for ; Mon, 29 Sep 2025 08:49:47 -0700 (PDT) Received: from [192.168.10.48] ([176.206.127.188]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b3545a983ffsm953498566b.94.2025.09.29.08.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Sep 2025 08:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759160990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BPzxrddqtL0TItlI5LLtoSQbI5T1+Lsx8CSDc/Du130=; b=hCdBHFNEWyLG7WQZ34XaR60YortL1P5j0MpMoQGdIbBZBbva0Qzuo54rNcK9NxXdpp0fcx aBAoX7BoY4I6WCV0iZ+By+9ybQ3hXeUZ121dmdAnf7ILV2Y6XsrvW1iA0hoWHrsv/06Qeh k7R9tTAlbM1btbmhlpg/RQ64iH4IW7I= X-MC-Unique: gJEM3_k7NMmgKflsDV5PYQ-1 X-Mimecast-MFC-AGG-ID: gJEM3_k7NMmgKflsDV5PYQ_1759160987 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759160986; x=1759765786; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BPzxrddqtL0TItlI5LLtoSQbI5T1+Lsx8CSDc/Du130=; b=N8Md/c/LStfGtaVPEnfGK1ffdQAl2qo1PvxX7cFWwnErhRnUSn5xJjiCACpWMxTe6N 0jpePAEh25fW3IWViwJq2ttAjaXq/xV3Aez/VOTWRJA+2PEGtUXxXMcyWggVu85yo7aZ P+1iyGEgBYGhiSfo+Crdi27t/ihfHZ6WUHXfMcaIUI+z8hN+dhFcbj0YyGxQaOqya1ta z3HY+ne3FLMzvYZjohG6QWZSquFaoD/6zmontIjXCXAnjSVG/GdOSHLqc/9hkvdKWJM2 VaAT3oXQCULCTSvo62aMle8Aw/8xcWm8SPIXm6fqH59XSh3TBCzL8lmYxATAhcZ6tmXD VMoA== X-Gm-Message-State: AOJu0Yz833i+6iKYQK3f9XJvh7RYJblhAuj7hzZtzc1uef5M5pp7jOVf lvv6PoqtACHScN2FOqX7L4BGminAz1Hd+D/ejdpB/bFbra8b1ld9iSM1iAjw3dX2KwIZT1qjdDQ YZRIi4aVN148Y6vQGuWgP+Qp6eCA69JTqUXrwINpKkW6aV7e7hDZDmu2j54u9ocnaFmDfj3fZHK zuYN7CelArb7RGqww5E5s5kfQRWqVtrmpQ4UdxZNRE X-Gm-Gg: ASbGncuJGrINZgZMJ8PJb5cNHmL8/rhEfGgUjmAu8MNvU/uAAsgYIdXYZoSoDqkvI6i DdCdR19L2ymv8pUJXFqtPZjjA4huFYE5Y2jSYYVo834zUVH4dB4n9wgRJEo+pwq9wPgOrwVPNXH u1G5Wgi+toTLf27uEH7q7hhPPMFu4JWsd1AnL4Abts8iyB/hL8LIsTzWN6m5XzS4uOF2qEQ/bKo aLDO/3jyDNrWAet35Dqsnm3XtDpXgQ/veps1xztPc2gsfd1NjbVL2MFtA/NnYiRUacvUmoktr9i d3fHVjy8zElI1n5Tu3KeVr85ZT2vfNxU9k+piYy8MKpCogWU/srju4PtyZZhUjaDfXZIwy+XfnV xVhGiDZ38+inLq3paeDjpjepyfbmhEQmGFZNJ/jND6yFGGQ== X-Received: by 2002:a17:907:6093:b0:ae1:a6a0:f2fe with SMTP id a640c23a62f3a-b34bad28537mr1913857966b.36.1759160985558; Mon, 29 Sep 2025 08:49:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG21EHXJbWMybWv0lsGwuZFID3E8aCqbDC3DKgYJf6kzYsdtFqtEWU8jK5Bb3ncnCzjZgj+nw== X-Received: by 2002:a17:907:6093:b0:ae1:a6a0:f2fe with SMTP id a640c23a62f3a-b34bad28537mr1913855166b.36.1759160985043; Mon, 29 Sep 2025 08:49:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Tanish Desai , Stefan Hajnoczi , Manos Pitsidianakis , Mads Ynddal , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Zhao Liu , qemu-rust@nongnu.org Subject: [PATCH 02/16] tracetool: remove dead code Date: Mon, 29 Sep 2025 17:49:24 +0200 Message-ID: <20250929154938.594389-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929154938.594389-1-pbonzini@redhat.com> References: <20250929154938.594389-1-pbonzini@redhat.com> MIME-Version: 1.0 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.513, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1759161106986116600 Content-Type: text/plain; charset="utf-8" Remove a bunch of dead code from tracetool. In particular, there are no tcg-exec events anymore and the sub-event functionality was only used for it. Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- scripts/tracetool/__init__.py | 45 +++----------------- scripts/tracetool/format/h.py | 5 --- scripts/tracetool/format/log_stap.py | 2 - scripts/tracetool/format/simpletrace_stap.py | 2 - 4 files changed, 6 insertions(+), 48 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 1d5238a0843..4ef1dc1fca3 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -15,7 +15,6 @@ import os import re import sys -import weakref from pathlib import PurePath =20 import tracetool.backend @@ -122,10 +121,6 @@ def __init__(self, args): else: self._args.append(arg) =20 - def copy(self): - """Create a new copy.""" - return Arguments(list(self._args)) - @staticmethod def build(arg_str): """Build and Arguments instance from an argument string. @@ -222,13 +217,12 @@ class Event(object): r"(?P\w+)" r"\((?P[^)]*)\)" r"\s*" - r"(?:(?:(?P\".+),)?\s*(?P\".+))?" + r"(?P\".+)?" r"\s*") =20 _VALID_PROPS =3D set(["disable"]) =20 - def __init__(self, name, props, fmt, args, lineno, filename, orig=3DNo= ne, - event_trans=3DNone, event_exec=3DNone): + def __init__(self, name, props, fmt, args, lineno, filename): """ Parameters ---------- @@ -236,20 +230,14 @@ def __init__(self, name, props, fmt, args, lineno, fi= lename, orig=3DNone, Event name. props : list of str Property names. - fmt : str, list of str - Event printing format string(s). + fmt : str + Event printing format string. 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 - Generated translation-time event ("tcg" property). - event_exec : Event or None - Generated execution-time event ("tcg" property). =20 """ self.name =3D name @@ -258,29 +246,16 @@ def __init__(self, name, props, fmt, args, lineno, fi= lename, orig=3DNone, 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 if len(args) > 10: raise ValueError("Event '%s' has more than maximum permitted " "argument count" % name) =20 - if orig is None: - self.original =3D weakref.ref(self) - else: - self.original =3D orig - unknown_props =3D set(self.properties) - self._VALID_PROPS if len(unknown_props) > 0: raise ValueError("Unknown properties: %s" % ", ".join(unknown_props)) - assert isinstance(self.fmt, str) or len(self.fmt) =3D=3D 2 =20 - def copy(self): - """Create a new copy.""" - return Event(self.name, list(self.properties), self.fmt, - self.args.copy(), self.lineno, self.filename, - self, self.event_trans, self.event_exec) =20 @staticmethod def build(line_str, lineno, filename): @@ -302,8 +277,7 @@ def build(line_str, lineno, filename): name =3D groups["name"] props =3D groups["props"].split() fmt =3D groups["fmt"] - fmt_trans =3D groups["fmt_trans"] - if fmt.find("%m") !=3D -1 or fmt_trans.find("%m") !=3D -1: + if fmt.find("%m") !=3D -1: raise ValueError("Event format '%m' is forbidden, pass the err= or " "as an explicit trace argument") if fmt.endswith(r'\n"'): @@ -312,29 +286,22 @@ def build(line_str, lineno, filename): if '\\n' in fmt: raise ValueError("Event format must not use new line character= ") =20 - if len(fmt_trans) > 0: - fmt =3D [fmt_trans, fmt] args =3D Arguments.build(groups["args"]) =20 return Event(name, props, fmt, args, lineno, posix_relpath(filenam= e)) =20 def __repr__(self): """Evaluable string representation for this object.""" - if isinstance(self.fmt, str): - fmt =3D self.fmt - else: - fmt =3D "%s, %s" % (self.fmt[0], self.fmt[1]) return "Event('%s %s(%s) %s')" % (" ".join(self.properties), self.name, self.args, - fmt) + self.fmt) # Star matching on PRI is dangerous as one might have multiple # arguments with that format, hence the non-greedy version of it. _FMT =3D re.compile(r"(%[\d\.]*\w+|%.*?PRI\S+)") =20 def formats(self): """List conversion specifiers in the argument print format string.= """ - assert not isinstance(self.fmt, list) return self._FMT.findall(self.fmt) =20 QEMU_TRACE =3D "trace_%(name)s" diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index b42a8268a81..bd9e0ca7f23 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -40,11 +40,6 @@ def generate(events, backend, group): enabled =3D 0 else: enabled =3D 1 - if "tcg-exec" in e.properties: - # a single define for the two "sub-events" - out('#define TRACE_%(name)s_ENABLED %(enabled)d', - name=3De.original.name.upper(), - enabled=3Denabled) out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled)) =20 backend.generate_begin(events, group) diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/forma= t/log_stap.py index 710d62bffe4..5b1bbe907ff 100644 --- a/scripts/tracetool/format/log_stap.py +++ b/scripts/tracetool/format/log_stap.py @@ -18,8 +18,6 @@ from tracetool.backend.simple import is_string from tracetool.format.stap import stap_escape =20 -def global_var_name(name): - return probeprefix().replace(".", "_") + "_" + name =20 STATE_SKIP =3D 0 STATE_LITERAL =3D 1 diff --git a/scripts/tracetool/format/simpletrace_stap.py b/scripts/traceto= ol/format/simpletrace_stap.py index 72971133bf0..ac39a492d96 100644 --- a/scripts/tracetool/format/simpletrace_stap.py +++ b/scripts/tracetool/format/simpletrace_stap.py @@ -17,8 +17,6 @@ from tracetool.backend.simple import is_string from tracetool.format.stap import stap_escape =20 -def global_var_name(name): - return probeprefix().replace(".", "_") + "_" + name =20 def generate(events, backend, group): out('/* This file is autogenerated by tracetool, do not edit. */', --=20 2.51.0