70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
From b51851d9684443028c2568e70bb203481ecd533a Mon Sep 17 00:00:00 2001
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Tue, 2 Feb 2021 14:03:34 -0500
|
|
Subject: [PATCH 2/7] tracetool: also strip %l and %ll from systemtap format
|
|
strings
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
Message-id: <20210202140334.1798082-2-lvivier@redhat.com>
|
|
Patchwork-id: 100948
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH 1/1] tracetool: also strip %l and %ll from systemtap format strings
|
|
Bugzilla: 1907264
|
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
RH-Acked-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
From: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
|
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é <berrange@redhat.com>
|
|
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Tested-by: Laurent Vivier <lvivier@redhat.com>
|
|
Message-id: 20210106130239.1004729-1-berrange@redhat.com
|
|
|
|
[Fixed "simiarly" typo found by Laurent Vivier <lvivier@redhat.com>
|
|
--Stefan]
|
|
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
(cherry picked from commit 09612de7e9adbe9666a8fa4cc60bab0a29a68ed1)
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
|
|
---
|
|
scripts/tracetool/format/log_stap.py | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/format/log_stap.py
|
|
index b486beb672..2d910ced82 100644
|
|
--- a/scripts/tracetool/format/log_stap.py
|
|
+++ b/scripts/tracetool/format/log_stap.py
|
|
@@ -77,7 +77,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):
|
|
--
|
|
2.18.4
|
|
|