qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
	"William Cohen" <wcohen@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>
Subject: [PATCH] tracetool: strip %l and %ll from systemtap format strings
Date: Wed,  6 Jan 2021 12:19:32 +0000	[thread overview]
Message-ID: <20210106121932.1002928-1-berrange@redhat.com> (raw)

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>
---
 scripts/tracetool/format/log_stap.py | 6 ++++++
 1 file changed, 6 insertions(+)

This is an alternative approach to

  https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg00550.html

diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/format/log_stap.py
index b486beb672..7bac10784b 100644
--- a/scripts/tracetool/format/log_stap.py
+++ b/scripts/tracetool/format/log_stap.py
@@ -49,6 +49,12 @@ def c_fmt_to_stap(fmt):
         elif fmt[i] == '"' and not escape:
             if state == STATE_LITERAL:
                 state = STATE_SKIP
+                # All variables in systemtap are 64-bit in size
+                # The "%l" integer size qualifiers is thus redundant
+                # and "%ll" is not valid at all. Simply strip all
+                # size qualifiers for sanity
+                literal = literal.replace("%ll", "%")
+                literal = literal.replace("%l", "%")
                 bits.append(literal)
                 literal = ""
             else:
-- 
2.29.2



             reply	other threads:[~2021-01-06 12:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-06 12:19 Daniel P. Berrangé [this message]
2021-01-06 12:29 ` [PATCH] tracetool: strip %l and %ll from systemtap format strings Philippe Mathieu-Daudé
2021-01-06 12:43 ` Laurent Vivier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210106121932.1002928-1-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=wcohen@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).