diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-05 13:09:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-05 13:09:10 +0000 |
| commit | 74a0a6fcecb9e31bc60875b57c69db537ad385d1 (patch) | |
| tree | fcb03d5f4d1cfb066bc8f1bcbe12c025ccb202be /scripts/tracetool/backend/syslog.py | |
| parent | e551455f1e7a3d7eee9e11e2903e4050bc5511ae (diff) | |
| parent | 7fb48c0ee1bbf5cc4c905e900b054096250e9f39 (diff) | |
| download | focaccia-qemu-74a0a6fcecb9e31bc60875b57c69db537ad385d1.tar.gz focaccia-qemu-74a0a6fcecb9e31bc60875b57c69db537ad385d1.zip | |
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request' into staging
Pull request Show trace-events filename/lineno in fmt string errors and send -d trace:help output to stdout for consistency. # gpg: Signature made Mon 04 Jan 2021 14:26:58 GMT # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha-gitlab/tags/tracing-pull-request: tracetool: show trace-events filename/lineno in fmt string errors tracetool: add input filename and line number to Event tracetool: add out_lineno and out_next_lineno to out() tracetool: add output filename command-line argument trace: Send "-d trace:help" output to stdout Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/tracetool/backend/syslog.py')
| -rw-r--r-- | scripts/tracetool/backend/syslog.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py index 1373a90192..5a3a00fe31 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -35,9 +35,13 @@ def generate_h(event, group): cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) out(' if (%(cond)s) {', + '#line %(event_lineno)d "%(event_filename)s"', ' syslog(LOG_INFO, "%(name)s " %(fmt)s %(argnames)s);', + '#line %(out_next_lineno)d "%(out_filename)s"', ' }', cond=cond, + event_lineno=event.lineno, + event_filename=event.filename, name=event.name, fmt=event.fmt.rstrip("\n"), argnames=argnames) |