diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-06-12 10:59:47 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-06-12 10:59:47 -0700 |
| commit | f3e8cc47de2bc537d4991e883a85208e4e1c0f98 (patch) | |
| tree | 5d7631b761c3d5fb5718d6d5ee8e4ccdff32a745 /scripts/tracetool/__init__.py | |
| parent | 80e8f0602168f451a93e71cbb1d59e93d745e62e (diff) | |
| parent | 4c2b6f328742084a5bd770af7c3a2ef07828c41c (diff) | |
| download | focaccia-qemu-f3e8cc47de2bc537d4991e883a85208e4e1c0f98.tar.gz focaccia-qemu-f3e8cc47de2bc537d4991e883a85208e4e1c0f98.zip | |
Merge tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu into staging
Pull request Cleanups from Philippe Mathieu-Daudé. # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmZnNCQACgkQnKSrs4Gr # c8hRQgf/WDNO0IvplK4U9PO5+Zm165xqY6lttfgniJzT2jb4p/dg0LiNOSqHx53Q # 2eM/YJl7GxSXwnIESqNVuVxixh8DvExmOtM8RJm3HyJWtZoKfgMOV/dzHEhST3xj # PglIEwL5Cm14skhQAVhJXzFlDjZ8seoz+YCbLhcYWk2B3an+5PvFySbp4iHS9cXJ # lZUZx/aa9xjviwzMbsMxzFt3rA22pgNaxemV40FBIMWC0H+jP5pgBdZXE2n8jJvB # 9eXZyG1kdkJKXO2DMhPYuG4rEEWOhV6dckXzmxCQEbHlGTH7X3Pn1F5B3+agi9g3 # 39U1Z+WFb8JFLOQMCQ3jlcbkIfULzQ== # =wqXR # -----END PGP SIGNATURE----- # gpg: Signature made Mon 10 Jun 2024 10:13:08 AM PDT # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] * tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu: tracetool: Forbid newline character in event format hw/vfio: Remove newline character in trace events hw/usb: Remove newline character in trace events hw/sh4: Remove newline character in trace events backends/tpm: Remove newline character in trace event tracetool: Remove unused vcpu.py script Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'scripts/tracetool/__init__.py')
| -rw-r--r-- | scripts/tracetool/__init__.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index b887540a55..bc03238c0f 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -301,18 +301,14 @@ class Event(object): if fmt.endswith(r'\n"'): raise ValueError("Event format must not end with a newline " "character") + if '\\n' in fmt: + raise ValueError("Event format must not use new line character") if len(fmt_trans) > 0: fmt = [fmt_trans, fmt] args = Arguments.build(groups["args"]) - event = Event(name, props, fmt, args, lineno, filename) - - # add implicit arguments when using the 'vcpu' property - import tracetool.vcpu - event = tracetool.vcpu.transform_event(event) - - return event + return Event(name, props, fmt, args, lineno, filename) def __repr__(self): """Evaluable string representation for this object.""" |