docs/devel/tracing.rst | 27 +---- qapi/trace.json | 5 +- include/qemu/osdep.h | 8 ++ tests/tracetool/all.h | 100 +++++++++++++++++++ tests/tracetool/dtrace.h | 6 +- tests/tracetool/ftrace.h | 14 ++- tests/tracetool/log.h | 26 +++-- tests/tracetool/nop.h | 25 +++++ tests/tracetool/simple.h | 10 +- tests/tracetool/syslog.h | 14 ++- tests/tracetool/ust.h | 6 +- trace/control-internal.h | 8 +- trace/control.h | 49 +-------- trace/event-internal.h | 19 +--- audio/audio-mixeng-be.c | 2 +- hw/ppc/vof.c | 13 +-- monitor/qmp.c | 4 +- stubs/trace-control.c | 6 -- tests/tracetool/all.c | 61 +++++++++++ tests/tracetool/dtrace.c | 10 +- tests/tracetool/ftrace.c | 10 +- tests/tracetool/log.c | 10 +- tests/tracetool/nop.c | 7 ++ tests/tracetool/simple.c | 12 +-- tests/tracetool/syslog.c | 10 +- tests/tracetool/ust.c | 10 +- trace/control-target.c | 29 ------ trace/control.c | 19 +--- trace/ftrace.c | 3 +- trace/qmp.c | 47 +++------ trace/simple.c | 9 +- hw/display/trace-events | 2 +- hw/xen/trace-events | 4 +- scripts/tracetool/__init__.py | 32 ++---- scripts/tracetool/backend/__init__.py | 7 +- scripts/tracetool/backend/dtrace.py | 2 - scripts/tracetool/backend/ftrace.py | 8 +- scripts/tracetool/backend/log.py | 22 ++-- scripts/tracetool/backend/simple.py | 9 +- scripts/tracetool/backend/syslog.py | 6 +- scripts/tracetool/format/c.py | 68 ++++++------- scripts/tracetool/format/d.py | 3 - scripts/tracetool/format/h.py | 48 ++++----- scripts/tracetool/format/log_stap.py | 3 - scripts/tracetool/format/rs.py | 30 +++--- scripts/tracetool/format/simpletrace_stap.py | 3 - scripts/tracetool/format/stap.py | 3 - scripts/tracetool/format/ust_events_c.py | 3 - scripts/tracetool/format/ust_events_h.py | 7 +- target/hppa/trace-events | 28 +++--- tests/tracetool/all.d | 10 ++ tests/tracetool/all.log-stap | 15 +++ tests/tracetool/all.rs | 98 ++++++++++++++++++ tests/tracetool/all.simpletrace-stap | 16 +++ tests/tracetool/all.stap | 14 +++ tests/tracetool/all.ust-events-c | 14 +++ tests/tracetool/all.ust-events-h | 56 +++++++++++ tests/tracetool/dtrace.rs | 6 +- tests/tracetool/ftrace.rs | 10 +- tests/tracetool/log.rs | 12 ++- tests/tracetool/meson.build | 4 +- tests/tracetool/nop.rs | 51 ++++++++++ tests/tracetool/simple.rs | 6 +- tests/tracetool/syslog.rs | 10 +- tests/tracetool/tracetool-test.py | 12 ++- 65 files changed, 747 insertions(+), 454 deletions(-) create mode 100644 tests/tracetool/all.h create mode 100644 tests/tracetool/nop.h create mode 100644 tests/tracetool/all.c create mode 100644 tests/tracetool/nop.c create mode 100644 tests/tracetool/all.d create mode 100644 tests/tracetool/all.log-stap create mode 100644 tests/tracetool/all.rs create mode 100644 tests/tracetool/all.simpletrace-stap create mode 100644 tests/tracetool/all.stap create mode 100644 tests/tracetool/all.ust-events-c create mode 100644 tests/tracetool/all.ust-events-h create mode 100644 tests/tracetool/nop.rs