diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-13 09:43:43 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-13 09:43:44 +0000 |
| commit | 73988d529e2edfc0c83cb73c07f818fdfebd633c (patch) | |
| tree | 522d73658f6c1023cdee283808d6979363f5fe42 /scripts/tracetool/backend/log.py | |
| parent | 1396156f50ddcfffc0e3127a005b3cdcf6fcee60 (diff) | |
| parent | 73ff061032efa0b260bcd1a177ac89b57a1642d3 (diff) | |
| download | qemu-73988d529e2edfc0c83cb73c07f818fdfebd633c.zip qemu-73988d529e2edfc0c83cb73c07f818fdfebd633c.tar.gz qemu-73988d529e2edfc0c83cb73c07f818fdfebd633c.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Mon 12 Mar 2018 15:59:54 GMT
# gpg: using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
trace: only permit standard C types and fixed size integer types
trace: remove use of QEMU specific types from trace probes
trace: include filename when printing parser error messages
simpletrace: fix timestamp argument type
log-for-trace.h: Split out parts of log.h used by trace.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/tracetool/backend/log.py')
| -rw-r--r-- | scripts/tracetool/backend/log.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py index da86f6b..78933d0 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -20,7 +20,7 @@ PUBLIC = True def generate_h_begin(events, group): - out('#include "qemu/log.h"', + out('#include "qemu/log-for-trace.h"', '') @@ -35,14 +35,13 @@ def generate_h(event, group): else: cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) - out(' if (%(cond)s) {', + out(' if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {', ' struct timeval _now;', ' gettimeofday(&_now, NULL);', - ' qemu_log_mask(LOG_TRACE,', - ' "%%d@%%zd.%%06zd:%(name)s " %(fmt)s "\\n",', - ' getpid(),', - ' (size_t)_now.tv_sec, (size_t)_now.tv_usec', - ' %(argnames)s);', + ' qemu_log("%%d@%%zd.%%06zd:%(name)s " %(fmt)s "\\n",', + ' getpid(),', + ' (size_t)_now.tv_sec, (size_t)_now.tv_usec', + ' %(argnames)s);', ' }', cond=cond, name=event.name, |