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.py | |
| parent | 1396156f50ddcfffc0e3127a005b3cdcf6fcee60 (diff) | |
| parent | 73ff061032efa0b260bcd1a177ac89b57a1642d3 (diff) | |
| download | qemu-73988d529e2edfc0c83cb73c07f818fdfebd633c.tar.gz | |
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.py')
| -rwxr-xr-x | scripts/tracetool.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/tracetool.py b/scripts/tracetool.py index c55a21518b..fe2b0771f2 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -142,7 +142,7 @@ def main(args): events = [] for arg in args: with open(arg, "r") as fh: - events.extend(tracetool.read_events(fh)) + events.extend(tracetool.read_events(fh, arg)) try: tracetool.generate(events, arg_group, arg_format, arg_backends, |