From nobody Wed Apr 16 07:45:39 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682358977; cv=none; d=zohomail.com; s=zohoarc; b=EokwR6V3GldnwVZUH3xiwVfcIy5o2QYehhLsd0ue0SC/1pBLtd67UxWnBDP7jf63bVVeFzP67MbQF6Mvo9nkDo32Tji2ph/i+3r6hnJWBWDkYjul+XD9YSqML13FWO0qEieRsPmXdumcGhUQ7iqGbze3hYzrPnrK4J/4OT8n3u0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682358977; h=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=eqZK9/+gQ+RYD/sl35HuMKvZlCTpzsr62KI4FGTu1OM=; b=BgVB8+dP/ZmpFoD7ogxFR+UFQ7I00YYOoYi5eMwmCfo1uVARB0j9R++STMPW5WXmr+Uk/Is4l8nX1AkmqoFURckDlUxKD4/DIDnbX5c8yfC1HIJsuIMjI59D0t3/KOO0DMSDI3W+GCdAryYTYb8ZZXzeg19uF1mo7Mq66+rhv38= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682358977192148.64817700233766; Mon, 24 Apr 2023 10:56:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pr0PX-00080l-N6; Mon, 24 Apr 2023 13:55:35 -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 1pr0PV-0007zf-6c for qemu-devel@nongnu.org; Mon, 24 Apr 2023 13:55:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pr0PT-0007tw-Kn for qemu-devel@nongnu.org; Mon, 24 Apr 2023 13:55:32 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-125-a13CMNJWMV-GGwqWelNAJQ-1; Mon, 24 Apr 2023 13:55:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8E9993814588; Mon, 24 Apr 2023 17:55:25 +0000 (UTC) Received: from localhost (unknown [10.39.195.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id E719A2166B2A; Mon, 24 Apr 2023 17:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682358931; 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=eqZK9/+gQ+RYD/sl35HuMKvZlCTpzsr62KI4FGTu1OM=; b=gnhfZZGYTcBwPFnaw6FtuRB/QDp7IYRPKn1T43nlmHcgys3c1LkkSqDJnm3DOMz60jLTM5 Y9539M1Lv8U2IZd012durHDU+/LlzOc1OUkaxloEq/QdBotAwBPL3Y4MNM/Nnb2BGZH/To H7e1gg9joaSq9zWOiL2H6VzkMrfHQDY= X-MC-Unique: a13CMNJWMV-GGwqWelNAJQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, Hanna Reitz , Stefan Hajnoczi , Richard Henderson , Thomas De Schampheleire Subject: [PULL 2/2] tracetool: use relative paths for '#line' preprocessor directives Date: Mon, 24 Apr 2023 13:55:18 -0400 Message-Id: <20230424175518.325931-3-stefanha@redhat.com> In-Reply-To: <20230424175518.325931-1-stefanha@redhat.com> References: <20230424175518.325931-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.129.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1682358978860100001 Content-Type: text/plain; charset="utf-8" From: Thomas De Schampheleire The event filename is an absolute path. Convert it to a relative path when writing '#line' directives, to preserve reproducibility of the generated output when different base paths are used. Signed-off-by: Thomas De Schampheleire Signed-off-by: Stefan Hajnoczi Message-Id: <20230406080045.21696-1-thomas.de_schampheleire@nokia.com> --- scripts/tracetool/backend/ftrace.py | 4 +++- scripts/tracetool/backend/log.py | 4 +++- scripts/tracetool/backend/syslog.py | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backen= d/ftrace.py index 5fa30ccc08..baed2ae61c 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -12,6 +12,8 @@ __email__ =3D "stefanha@redhat.com" =20 =20 +import os.path + from tracetool import out =20 =20 @@ -45,7 +47,7 @@ def generate_h(event, group): args=3Devent.args, event_id=3D"TRACE_" + event.name.upper(), event_lineno=3Devent.lineno, - event_filename=3Devent.filename, + event_filename=3Dos.path.relpath(event.filename), fmt=3Devent.fmt.rstrip("\n"), argnames=3Dargnames) =20 diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index 17ba1cd90e..de27b7e62e 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -12,6 +12,8 @@ __email__ =3D "stefanha@redhat.com" =20 =20 +import os.path + from tracetool import out =20 =20 @@ -53,7 +55,7 @@ def generate_h(event, group): ' }', cond=3Dcond, event_lineno=3Devent.lineno, - event_filename=3Devent.filename, + event_filename=3Dos.path.relpath(event.filename), name=3Devent.name, fmt=3Devent.fmt.rstrip("\n"), argnames=3Dargnames) diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/syslog.py index 5a3a00fe31..012970f6cc 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -12,6 +12,8 @@ __email__ =3D "stefanha@redhat.com" =20 =20 +import os.path + from tracetool import out =20 =20 @@ -41,7 +43,7 @@ def generate_h(event, group): ' }', cond=3Dcond, event_lineno=3Devent.lineno, - event_filename=3Devent.filename, + event_filename=3Dos.path.relpath(event.filename), name=3Devent.name, fmt=3Devent.fmt.rstrip("\n"), argnames=3Dargnames) --=20 2.39.2