diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-11 19:53:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-11 19:53:15 +0000 |
| commit | a4c141dca466ed3e9451f147efe6304b1b659ff5 (patch) | |
| tree | 2a24d0b0ef53d82cff2e2169aec13abc748cfcc3 /scripts | |
| parent | 46d407f84a437f2cbd4afb2f3d23d685448ba272 (diff) | |
| parent | 35e28cb0f210cae3d9c98113d519fe5a4bef5866 (diff) | |
| download | qemu-a4c141dca466ed3e9451f147efe6304b1b659ff5.zip qemu-a4c141dca466ed3e9451f147efe6304b1b659ff5.tar.gz qemu-a4c141dca466ed3e9451f147efe6304b1b659ff5.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/tracing-pull-request' into staging
Tracing pull request
# gpg: Signature made Wed 11 Nov 2020 15:56:18 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:
scripts/tracetool: silence SystemTap dtrace(1) long long warnings
trace: remove argument from trace_init_file
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/tracetool/format/d.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.py index 353722f..ebfb714 100644 --- a/scripts/tracetool/format/d.py +++ b/scripts/tracetool/format/d.py @@ -57,6 +57,12 @@ def generate(events, backend, group): # Avoid it by changing probe type to signed char * beforehand. if type_ == 'int8_t *': type_ = 'signed char *' + + # SystemTap dtrace(1) emits a warning when long long is used + type_ = type_.replace('unsigned long long', 'uint64_t') + type_ = type_.replace('signed long long', 'int64_t') + type_ = type_.replace('long long', 'int64_t') + if name in RESERVED_WORDS: name += '_' args.append(type_ + ' ' + name) |