OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Pull request 

Fix for a LTTng Userspace Tracer header problem.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl8EkEwACgkQnKSrs4Gr
 c8jLvQgAxqD0YnsiEfACIHRuSwyqybv47EOqHGpVvtNiv7hLq405sMB+z9vUFP5i
 UCop4YmLf/pV3GgyIhKUo80EwsxITgKS8Rm679g2O0SjJwkwoGHfwyT9bEDgz6hY
 eFs0A0fIDqLwLPJ6qYsx0w5KRqTpjs2W9hQ7U9XMRT4awr4MJTnhqNxwH6VK0Xi7
 same1KkLbSqSJJcD0KCutVLJpaobhBxsj8s1jIFz6VCpAEXOGnjurxjH6Of62fEN
 7DpJaY2v4s3DdpAqWK3WlhCDsR5lm1Gl4eHMO67RZ1pwhPwoo8KYz035qWxCfPcx
 J5AU7A2nJ2LuuSE2L08SMAbGPmwB5Q==
 =r0bc
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Pull request

Fix for a LTTng Userspace Tracer header problem.

# gpg: Signature made Tue 07 Jul 2020 16:10:04 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  tracetool: work around ust <sys/sdt.h> include conflict

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-07-10 09:01:28 +01:00
parent aecdfcc3f8 27e08bab94
commit b6d7e9b66f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/tracetool/backend/dtrace.py
View File

@ -40,6 +40,12 @@ def generate_h_begin(events, group):
else:
header = "trace-dtrace.h"
# Workaround for ust backend, which also includes <sys/sdt.h> and may
# require SDT_USE_VARIADIC to be defined. If dtrace includes <sys/sdt.h>
# first without defining SDT_USE_VARIADIC then ust breaks because the
# STAP_PROBEV() macro is not defined.
out('#define SDT_USE_VARIADIC 1')
out('#include "%s"' % header,
'')