On Wed, Jul 29, 2020 at 04:39:26PM +0100, Stefan Hajnoczi wrote:
> The dtrace backend defines SDT_USE_VARIADIC as a workaround for a
> conflict with a LTTng UST header file, which requires SDT_USE_VARIADIC
> to be defined.
>
> LTTng UST <lttng/tracepoint.h> breaks if included after generated dtrace
> headers because SDT_USE_VARIADIC will already be defined:
>
> #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
> #define SDT_USE_VARIADIC <-- error, it's already defined
> #include <sys/sdt.h>
>
> Be more careful when defining SDT_USE_VARIADIC. This fixes the build
> when both the dtrace and ust tracers are enabled at the same time.
>
> Fixes: 27e08bab94f7c6ebe0b75938c98c394c969e3fd8 ("tracetool: work around ust
> <sys/sdt.h> include conflict")
> Signed-off-by: Stefan Hajnoczi <[email protected]>
> ---
> scripts/tracetool/backend/dtrace.py | 4 ++++
> 1 file changed, 4 insertions(+)Thanks, applied to my tracing tree: https://github.com/stefanha/qemu/commits/tracing Stefan
signature.asc
Description: PGP signature
