From: Daniel P. Berrangé Date: Wed, 6 Jan 2021 13:02:39 +0000 (+0000) Subject: tracetool: also strip %l and %ll from systemtap format strings X-Git-Tag: v6.0.0-rc0~115^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09612de7e9adbe9666a8fa4cc60bab0a29a68ed1;p=thirdparty%2Fqemu.git tracetool: also strip %l and %ll from systemtap format strings All variables are 64-bit and so %l / %ll are not required, and the latter is actually invalid: $ sudo stap -e 'probe begin{printf ("BEGIN")}' -I . parse error: invalid or missing conversion specifier saw: operator ',' at ./qemu-system-x86_64-log.stp:15118:101 source: printf("%d@%d vhost_vdpa_set_log_base dev: %p base: 0x%x size: %llu refcnt: %d fd: %d log: %p\n", pid(), gettimeofday_ns(), dev, base, size, refcnt, fd, log) ^ Signed-off-by: Daniel P. Berrangé Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Tested-by: Laurent Vivier Message-id: 20210106130239.1004729-1-berrange@redhat.com [Fixed "simiarly" typo found by Laurent Vivier --Stefan] Signed-off-by: Stefan Hajnoczi --- diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/format/log_stap.py index 3e1186ae9cc..0b6549d534a 100644 --- a/scripts/tracetool/format/log_stap.py +++ b/scripts/tracetool/format/log_stap.py @@ -78,7 +78,12 @@ def c_fmt_to_stap(fmt): elif state == STATE_LITERAL: bits.append(literal) - fmt = re.sub("%(\d*)z(x|u|d)", "%\\1\\2", "".join(bits)) + # All variables in systemtap are 64-bit in size + # The "%l" integer size qualifier is thus redundant + # and "%ll" is not valid at all. Similarly the size_t + # based "%z" size qualifier is not valid. We just + # strip all size qualifiers for sanity. + fmt = re.sub("%(\d*)(l+|z)(x|u|d)", "%\\1\\3", "".join(bits)) return fmt def generate(events, backend, group):