From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
berrange@redhat.com,
"Matheus Ferst" <matheus.ferst@eldorado.org.br>,
"Stefan Hajnoczi" <stefanha@redhat.com>
Subject: [RFC PATCH] scripts/tracetool: don't barf validating TCG types
Date: Tue, 6 Apr 2021 17:53:07 +0100 [thread overview]
Message-ID: <20210406165307.5993-1-alex.bennee@linaro.org> (raw)
TCG types will be transformed into the appropriate host types later on
in the tool. Try and work around this by detecting those cases and
pressing on.
[AJB: this seems a bit too hacky - but the problem is validate_type is
buried a few layers deep. Maybe we should just drop TCGv from
ALLOWED_TYPES and manually do if bit.startswith("TCGv_") in validate_type?]
Fixes: 73ff061032 ("trace: only permit standard C types and fixed size integer types")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Matheus Ferst <matheus.ferst@eldorado.org.br>
---
scripts/tracetool/__init__.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 5bc94d95cf..ea078e34b4 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -87,10 +87,11 @@ def out(*lines, **kwargs):
"ssize_t",
"uintptr_t",
"ptrdiff_t",
- # Magic substitution is done by tracetool
+ # Magic substitution is done by tracetool TCG_2_HOST
"TCGv",
]
+
def validate_type(name):
bits = name.split(" ")
for bit in bits:
@@ -405,9 +406,13 @@ def read_events(fobj, fname):
try:
event = Event.build(line, lineno, fname)
except ValueError as e:
- arg0 = 'Error at %s:%d: %s' % (fname, lineno, e.args[0])
- e.args = (arg0,) + e.args[1:]
- raise
+ # these get translated by TCG_2_HOST later
+ if "TCGv_" not in e.args[0]:
+ arg0 = 'Error at %s:%d: %s' % (fname, lineno, e.args[0])
+ e.args = (arg0,) + e.args[1:]
+ raise
+ else:
+ pass
# transform TCG-enabled events
if "tcg" not in event.properties:
--
2.20.1
next reply other threads:[~2021-04-06 16:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 16:53 Alex Bennée [this message]
2021-04-26 14:03 ` [RFC PATCH] scripts/tracetool: don't barf validating TCG types Stefan Hajnoczi
2021-05-04 15:02 ` Alex Bennée
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=20210406165307.5993-1-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=matheus.ferst@eldorado.org.br \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@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).