SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trace: fix compilation with lttng-ust >= 2.13

Browse Source 
On Fedora 36, with lttng-ust 2.13.1, compilation fails with:

In file included from trace/trace-ust-all.h:49085,
                 from trace/trace-ust-all.c:13:
/usr/include/lttng/tracepoint-event.h:67:10: error: #include expects "FILENAME" or <FILENAME>
   67 | #include LTTNG_UST_TRACEPOINT_INCLUDE
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

In lttng-ust commit 41858e2b6e8 ("Fix: don't do macro expansion in
tracepoint file name") from 2012, starting from lttng-ust 2.1, the API
was changed to expect TRACEPOINT_INCLUDE to be defined as a string.

In lttng-ust commit d2966b4b0b2 ("Remove TRACEPOINT_INCLUDE_FILE
macro"), in 2021, the compatibility macro was removed.

Use the "new" API from 2012, and bump the version requirement to 2.1 to
fix compilation with >= 2.13.

According to repology, all distributions we support have >= 2.1 (centos
8 has oldest with 2.8.1 afaict)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20220328084717.367993-2-marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-03-28 12:47:13 +04:00 committed by Thomas Huth
parent a136d17590
commit e32aaa5a19
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -455,8 +455,8 @@ if 'CONFIG_GIO' in config_host
endif endif
lttng = not_found lttng = not_found
if 'ust' in get_option('trace_backends') if 'ust' in get_option('trace_backends')
lttng = dependency('lttng-ust', required: true, method: 'pkg-config', lttng = dependency('lttng-ust', required: true, version: '>= 2.1',
kwargs: static_kwargs) method: 'pkg-config', kwargs: static_kwargs)
endif endif
pixman = not_found pixman = not_found
if have_system or have_tools if have_system or have_tools

4
scripts/tracetool/format/ust_events_h.py
View File

@ -29,8 +29,8 @@ def generate(events, backend, group):
'#undef TRACEPOINT_PROVIDER', '#undef TRACEPOINT_PROVIDER',
'#define TRACEPOINT_PROVIDER qemu', '#define TRACEPOINT_PROVIDER qemu',
'', '',
'#undef TRACEPOINT_INCLUDE_FILE', '#undef TRACEPOINT_INCLUDE',
'#define TRACEPOINT_INCLUDE_FILE ./%s' % include, '#define TRACEPOINT_INCLUDE "./%s"' % include,
'', '',
'#if !defined (TRACE_%s_GENERATED_UST_H) || \\' % group.upper(), '#if !defined (TRACE_%s_GENERATED_UST_H) || \\' % group.upper(),
' defined(TRACEPOINT_HEADER_MULTI_READ)', ' defined(TRACEPOINT_HEADER_MULTI_READ)',