diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-04-25 09:13:07 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-04-25 09:13:07 +0100 |
| commit | 3f1b44bdc11d7f66a5514471b298b0f7b4498065 (patch) | |
| tree | fbf2ff8b91b82cc16751e0353e087ce9a018713d /scripts/tracetool/backend/ftrace.py | |
| parent | ac5f7bf8e208cd7893dbb1a9520559e569a4677c (diff) | |
| parent | 9d672e290475001fcecdcc9dc79ad088ff89d17f (diff) | |
| download | focaccia-qemu-3f1b44bdc11d7f66a5514471b298b0f7b4498065.tar.gz focaccia-qemu-3f1b44bdc11d7f66a5514471b298b0f7b4498065.zip | |
Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging
Pull request (v2) I dropped the zoned storage patches that had CI failures. This pull request only contains fixes now. # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmRGwoIACgkQnKSrs4Gr # c8jyeAf+JqYgJ0sG7rkYwGNUnmdyzjcZh8sokmIoR0a1VbFjpG54QqvvsSdrtZ5V # +XdYPgn3ASqyw6/737chw8BBQ1YQEtALCXCk9vx2/Vpmmd6NUkJcxTLvV17o8wit # asMO14R8p4b/9NUbRnMA+OcnJ1R0y0nKaw0fK4v2DjCN3Uy7b7zJ5Xb5Mg1lkrN6 # RCB6uobWwN58LqY90lN2m1EMvBy0hhI5P1wDjcuZjG1/GnnvVzrIVMOC0ddiLgRH # 0vh9MvdSjOwkdM1J9eJyeijfyEjKS9e/E/c4WrjUs+gH5wcb9zNMNFOGeG7Ih2U0 # wEUIpe2y3YjSHTSTGZLYGguCGmJPZQ== # =MKCk # -----END PGP SIGNATURE----- # gpg: Signature made Mon 24 Apr 2023 06:55:14 PM BST # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] * tag 'block-pull-request' of https://gitlab.com/stefanha/qemu: tracetool: use relative paths for '#line' preprocessor directives block/dmg: Declare a type definition for DMG uncompress function Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'scripts/tracetool/backend/ftrace.py')
| -rw-r--r-- | scripts/tracetool/backend/ftrace.py | 4 |
1 files changed, 3 insertions, 1 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 @@ __maintainer__ = "Stefan Hajnoczi" __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) |