4b265c79a8
QEMU binaries no longer launch successfully with recent SystemTap releases. This is because modular QEMU builds link the sdt semaphores into the main binary instead of into the shared objects where they are used. The symbol visibility of semaphores is 'hidden' and the dynamic linker prints an error during module loading: $ ./configure --enable-trace-backends=dtrace --enable-modules ... ... Failed to open module: /builddir/build/BUILD/qemu-4.2.0/s390x-softmmu/../block-curl.so: undefined symbol: qemu_curl_close_semaphore The long-term solution is to generate per-module dtrace .o files and link them into the module instead of the main binary. In the short term we can define STAP_SDT_V2 so dtrace(1) produces a .o file with 'default' symbol visibility instead of 'hidden'. This workaround is small and easier to merge for QEMU 5.2 and downstream backports. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1898700 Cc: wcohen@redhat.com Cc: fche@redhat.com Cc: kraxel@redhat.com Cc: rjones@redhat.com Cc: ddepaula@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com> Message-id: 20201119141457.844452-1-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
96 lines
4.4 KiB
Meson
96 lines
4.4 KiB
Meson
specific_ss.add(files('control-target.c'))
|
|
|
|
trace_events_files = []
|
|
foreach dir : [ '.' ] + trace_events_subdirs
|
|
trace_events_file = meson.source_root() / dir / 'trace-events'
|
|
trace_events_files += [ trace_events_file ]
|
|
group_name = dir == '.' ? 'root' : dir.underscorify()
|
|
group = '--group=' + group_name
|
|
fmt = '@0@-' + group_name + '.@1@'
|
|
|
|
trace_h = custom_target(fmt.format('trace', 'h'),
|
|
output: fmt.format('trace', 'h'),
|
|
input: trace_events_file,
|
|
command: [ tracetool, group, '--format=h', '@INPUT@' ],
|
|
capture: true)
|
|
genh += trace_h
|
|
trace_c = custom_target(fmt.format('trace', 'c'),
|
|
output: fmt.format('trace', 'c'),
|
|
input: trace_events_file,
|
|
command: [ tracetool, group, '--format=c', '@INPUT@' ],
|
|
capture: true)
|
|
if 'CONFIG_TRACE_UST' in config_host
|
|
trace_ust_h = custom_target(fmt.format('trace-ust', 'h'),
|
|
output: fmt.format('trace-ust', 'h'),
|
|
input: trace_events_file,
|
|
command: [ tracetool, group, '--format=ust-events-h', '@INPUT@' ],
|
|
capture: true)
|
|
trace_ss.add(trace_ust_h, lttng, urcubp)
|
|
genh += trace_ust_h
|
|
endif
|
|
trace_ss.add(trace_h, trace_c)
|
|
if 'CONFIG_TRACE_DTRACE' in config_host
|
|
trace_dtrace = custom_target(fmt.format('trace-dtrace', 'dtrace'),
|
|
output: fmt.format('trace-dtrace', 'dtrace'),
|
|
input: trace_events_file,
|
|
command: [ tracetool, group, '--format=d', '@INPUT@' ],
|
|
capture: true)
|
|
trace_dtrace_h = custom_target(fmt.format('trace-dtrace', 'h'),
|
|
output: fmt.format('trace-dtrace', 'h'),
|
|
input: trace_dtrace,
|
|
command: [ 'dtrace', '-DSTAP_SDT_V2', '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ])
|
|
trace_ss.add(trace_dtrace_h)
|
|
if host_machine.system() != 'darwin'
|
|
trace_dtrace_o = custom_target(fmt.format('trace-dtrace', 'o'),
|
|
output: fmt.format('trace-dtrace', 'o'),
|
|
input: trace_dtrace,
|
|
command: [ 'dtrace', '-DSTAP_SDT_V2', '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ])
|
|
trace_ss.add(trace_dtrace_o)
|
|
endif
|
|
|
|
genh += trace_dtrace_h
|
|
endif
|
|
endforeach
|
|
|
|
trace_events_all = custom_target('trace-events-all',
|
|
output: 'trace-events-all',
|
|
input: trace_events_files,
|
|
command: [ 'cat', '@INPUT@' ],
|
|
capture: true,
|
|
install: true,
|
|
install_dir: qemu_datadir)
|
|
|
|
foreach d : [
|
|
['generated-tcg-tracers.h', 'tcg-h'],
|
|
['generated-helpers.c', 'tcg-helper-c'],
|
|
['generated-helpers.h', 'tcg-helper-h'],
|
|
['generated-helpers-wrappers.h', 'tcg-helper-wrapper-h'],
|
|
]
|
|
gen = custom_target(d[0],
|
|
output: d[0],
|
|
input: meson.source_root() / 'trace-events',
|
|
command: [ tracetool, '--group=root', '--format=@0@'.format(d[1]), '@INPUT@' ],
|
|
capture: true)
|
|
specific_ss.add(gen)
|
|
endforeach
|
|
|
|
if 'CONFIG_TRACE_UST' in config_host
|
|
trace_ust_all_h = custom_target('trace-ust-all.h',
|
|
output: 'trace-ust-all.h',
|
|
input: trace_events_files,
|
|
command: [ tracetool, '--group=all', '--format=ust-events-h', '@INPUT@' ],
|
|
capture: true)
|
|
trace_ust_all_c = custom_target('trace-ust-all.c',
|
|
output: 'trace-ust-all.c',
|
|
input: trace_events_files,
|
|
command: [ tracetool, '--group=all', '--format=ust-events-c', '@INPUT@' ],
|
|
capture: true)
|
|
trace_ss.add(trace_ust_all_h, trace_ust_all_c)
|
|
genh += trace_ust_all_h
|
|
endif
|
|
|
|
trace_ss.add(when: 'CONFIG_TRACE_SIMPLE', if_true: files('simple.c'))
|
|
trace_ss.add(when: 'CONFIG_TRACE_FTRACE', if_true: files('ftrace.c'))
|
|
trace_ss.add(files('control.c'))
|
|
trace_ss.add(files('qmp.c'))
|