summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Hajnoczi2020-10-20 11:40:43 +0200
committerStefan Hajnoczi2020-11-11 14:10:38 +0100
commit35e28cb0f210cae3d9c98113d519fe5a4bef5866 (patch)
tree5f4810550e9c7d9df6db8180b01f573918631e90
parenttrace: remove argument from trace_init_file (diff)
downloadqemu-35e28cb0f210cae3d9c98113d519fe5a4bef5866.tar.gz
qemu-35e28cb0f210cae3d9c98113d519fe5a4bef5866.tar.xz
qemu-35e28cb0f210cae3d9c98113d519fe5a4bef5866.zip
scripts/tracetool: silence SystemTap dtrace(1) long long warnings
SystemTap's dtrace(1) prints the following warning when it encounters long long arguments: Warning: /usr/bin/dtrace:trace/trace-dtrace-hw_virtio.dtrace:76: syntax error near: probe vhost_vdpa_dev_start Warning: Proceeding as if --no-pyparsing was given. Use the uint64_t and int64_t types, respectively. This works with all host CPU 32- and 64-bit data models (ILP32, LP64, and LLP64) that QEMU supports. Reported-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20201020094043.159935-1-stefanha@redhat.com Suggested-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--scripts/tracetool/format/d.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.py
index 353722f89c..ebfb714200 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)