From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Raphael Norwitz" <raphael.norwitz@nutanix.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Julia Suvorova" <jusual@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
qemu-block@nongnu.org, "Cornelia Huck" <cohuck@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Stefano Garzarella" <sgarzare@redhat.com>,
kvm@vger.kernel.org, virtio-fs@redhat.com,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>, "Fam Zheng" <fam@euphon.net>,
"Aarushi Mehta" <mehta.aaru20@gmail.com>,
"Thomas De Schampheleire" <thomas.de_schampheleire@nokia.com>
Subject: [PULL 10/20] tracetool: use relative paths for '#line' preprocessor directives
Date: Thu, 20 Apr 2023 08:09:38 -0400 [thread overview]
Message-ID: <20230420120948.436661-11-stefanha@redhat.com> (raw)
In-Reply-To: <20230420120948.436661-1-stefanha@redhat.com>
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
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 <thomas.de_schampheleire@nokia.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
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/backend/ftrace.py
index 5fa30ccc08..baed2ae61c 100644
--- a/scripts/tracetool/backend/ftrace.py
+++ b/scripts/tracetool/backend/ftrace.py
@@ -12,6 +12,8 @@
__email__ = "stefanha@redhat.com"
+import os.path
+
from tracetool import out
@@ -45,7 +47,7 @@ def generate_h(event, group):
args=event.args,
event_id="TRACE_" + event.name.upper(),
event_lineno=event.lineno,
- event_filename=event.filename,
+ event_filename=os.path.relpath(event.filename),
fmt=event.fmt.rstrip("\n"),
argnames=argnames)
diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
index 17ba1cd90e..de27b7e62e 100644
--- a/scripts/tracetool/backend/log.py
+++ b/scripts/tracetool/backend/log.py
@@ -12,6 +12,8 @@
__email__ = "stefanha@redhat.com"
+import os.path
+
from tracetool import out
@@ -53,7 +55,7 @@ def generate_h(event, group):
' }',
cond=cond,
event_lineno=event.lineno,
- event_filename=event.filename,
+ event_filename=os.path.relpath(event.filename),
name=event.name,
fmt=event.fmt.rstrip("\n"),
argnames=argnames)
diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py
index 5a3a00fe31..012970f6cc 100644
--- a/scripts/tracetool/backend/syslog.py
+++ b/scripts/tracetool/backend/syslog.py
@@ -12,6 +12,8 @@
__email__ = "stefanha@redhat.com"
+import os.path
+
from tracetool import out
@@ -41,7 +43,7 @@ def generate_h(event, group):
' }',
cond=cond,
event_lineno=event.lineno,
- event_filename=event.filename,
+ event_filename=os.path.relpath(event.filename),
name=event.name,
fmt=event.fmt.rstrip("\n"),
argnames=argnames)
--
2.39.2
next prev parent reply other threads:[~2023-04-20 12:14 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 12:09 [PULL 00/20] Block patches Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 01/20] block/block-common: add zoned device structs Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 02/20] block/file-posix: introduce helper functions for sysfs attributes Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 03/20] block/block-backend: add block layer APIs resembling Linux ZonedBlockDevice ioctls Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 04/20] block/raw-format: add zone operations to pass through requests Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 05/20] block: add zoned BlockDriver check to block layer Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 06/20] iotests: test new zone operations Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 07/20] block: add some trace events for new block layer APIs Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 08/20] docs/zoned-storage: add zoned device documentation Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 09/20] block/dmg: Declare a type definition for DMG uncompress function Stefan Hajnoczi
2023-04-20 12:09 ` Stefan Hajnoczi [this message]
2023-04-20 12:09 ` [PULL 11/20] file-posix: add tracking of the zone write pointers Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 12/20] block: introduce zone append write for zoned devices Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 13/20] qemu-iotests: test zone append operation Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 14/20] block: add some trace events for zone append Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 15/20] include: update virtio_blk headers to v6.3-rc1 Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 16/20] virtio-blk: add zoned storage emulation for zoned devices Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 17/20] block: add accounting for zone append operation Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 18/20] virtio-blk: add some trace events for zoned emulation Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 19/20] docs/zoned-storage:add zoned emulation use case Stefan Hajnoczi
2023-04-20 12:09 ` [PULL 20/20] tracing: install trace events file only if necessary Stefan Hajnoczi
2023-12-06 10:26 ` Carlos Santos
2023-12-07 11:11 ` Stefan Hajnoczi
2023-12-11 21:49 ` Carlos Santos
2023-04-21 19:01 ` [PULL 00/20] Block patches Richard Henderson
2023-04-24 16:47 ` Stefan Hajnoczi
2023-04-24 17:52 ` Stefan Hajnoczi
2023-04-24 18:02 ` Sam Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230420120948.436661-11-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=cohuck@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=jusual@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mehta.aaru20@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael.norwitz@nutanix.com \
--cc=sgarzare@redhat.com \
--cc=thomas.de_schampheleire@nokia.com \
--cc=thuth@redhat.com \
--cc=virtio-fs@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).