aadac5b3d9
* improve cross-build KVM coverage * new --without-default-features configure flag * add __repr__ for ConsoleSocket for debugging * build tcg tests with -Werror * test 32 bit builds with fedora * remove last traces of debian9 * hotfix for centos8 powertools repo * Move lots of feature detection code to meson (Alex, myself) * CFI and LTO support (Daniele) * test-char dangling pointer (Eduardo) * Build system and win32 fixes (Marc-André) * Initialization fixes (myself) * TCG include cleanup (Richard, myself) * x86 'int N' fix (Peter) -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAl/1gRUUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroPTwAf+J/ffnckmzpckB1gwZ5vEnkYNDreq NrYWDpmnOX6mICXC68WsTmyOvoAvn5es/PF36rOEZ3mDHdF7/RGn/5zxKculLTKp uISs0wdApEC5n78iQwIlec6nzgjteg+DIfaLqQ4P4sVuEtFkuAVsv5E3BJGVoHLg sXy8gTEf95KS9r5bZpzP70rAjIbmxcAjbET4fvdELjkGDNCTRKmpEYPj0sE6qaBp 0/VdqVLpLthuEQoDuEWube7Y2LA/ZuY3Gfxq1em+abXqFJBTAXBf2GET6a/BjLU6 N7wO5FEQ0CUG8fst/Zw3Xp1htGPZTYYMtr0dipYEI2np0A7/CITjTWsekg== =rsil -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging From Alex's pull request: * improve cross-build KVM coverage * new --without-default-features configure flag * add __repr__ for ConsoleSocket for debugging * build tcg tests with -Werror * test 32 bit builds with fedora * remove last traces of debian9 * hotfix for centos8 powertools repo * Move lots of feature detection code to meson (Alex, myself) * CFI and LTO support (Daniele) * test-char dangling pointer (Eduardo) * Build system and win32 fixes (Marc-André) * Initialization fixes (myself) * TCG include cleanup (Richard, myself) * x86 'int N' fix (Peter) # gpg: Signature made Wed 06 Jan 2021 09:21:25 GMT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: (52 commits) win32: drop fd registration to the main-loop on setting non-block configure: move tests/qemu-iotests/common.env generation to meson meson.build: convert --with-default-devices to meson libattr: convert to meson cap_ng: convert to meson virtfs: convert to meson seccomp: convert to meson zstd: convert to meson lzfse: convert to meson snappy: convert to meson lzo: convert to meson rbd: convert to meson libnfs: convert to meson libiscsi: convert to meson bzip2: convert to meson glusterfs: convert to meson curl: convert to meson curl: remove compatibility code, require 7.29.0 brlapi: convert to meson configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # trace/meson.build
90 lines
4.2 KiB
Meson
90 lines
4.2 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@', '@OUTPUT@' ])
|
|
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@', '@OUTPUT@' ])
|
|
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@', '@OUTPUT@' ])
|
|
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@', '@OUTPUT@' ])
|
|
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@', '@OUTPUT@' ])
|
|
specific_ss.add(when: 'CONFIG_TCG', if_true: 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@', '@OUTPUT@' ])
|
|
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@', '@OUTPUT@' ])
|
|
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'))
|