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

qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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>

Peter Maydell 5 years ago b6d7e9b6 aecdfcc3

1 changed file

expand all

scripts

tracetool

backend

dtrace.py

scripts/tracetool/backend/dtrace.py

··· 40 40 else: 41 41 header = "trace-dtrace.h" 42 42 43 + # Workaround for ust backend, which also includes <sys/sdt.h> and may 44 + # require SDT_USE_VARIADIC to be defined. If dtrace includes <sys/sdt.h> 45 + # first without defining SDT_USE_VARIADIC then ust breaks because the 46 + # STAP_PROBEV() macro is not defined. 47 + out('#define SDT_USE_VARIADIC 1') 48 + 43 49 out('#include "%s"' % header, 44 50 '') 45 51