v2: * Previous version was interleaved with an older pull request and the email thread was a mess. Resending.
The following changes since commit 959e41473f2179850578482052fb73b913bc4e42: slirp/arp: do not special-case bogus IP addresses (2014-06-09 01:49:28 +0200) are available in the git repository at: git://github.com/stefanha/qemu.git tags/tracing-pull-request for you to fetch changes up to a35d9be622a85d9ad6be5448e78c8a3f95ee5f00: trace: Replace fprintf with error_report and print location (2014-06-09 15:43:40 +0200) ---------------------------------------------------------------- Tracing pull request ---------------------------------------------------------------- Alexey Kardashevskiy (2): trace: Replace error with warning if event is not defined trace: Replace fprintf with error_report and print location LluĂs Vilanova (1): trace: Multi-backend tracing Stefan Hajnoczi (2): trace: add pid field to simpletrace record simpletrace: add support for trace record pid field .travis.yml | 8 ++-- Makefile | 4 +- Makefile.target | 4 +- configure | 47 ++++++++++--------- docs/tracing.txt | 4 +- qemu-io.c | 2 +- scripts/simpletrace.py | 26 ++++++----- scripts/tracetool.py | 43 +++++++++--------- scripts/tracetool/__init__.py | 24 +++++----- scripts/tracetool/backend/__init__.py | 15 +++--- trace/Makefile.objs | 32 ++++++------- trace/control-internal.h | 4 +- trace/control.c | 86 +++++++++++++++++++++++++++-------- trace/control.h | 27 ++--------- trace/default.c | 40 ---------------- trace/ftrace.c | 25 +--------- trace/ftrace.h | 5 ++ trace/simple.c | 27 +++-------- trace/simple.h | 1 + trace/stderr.c | 30 ------------ vl.c | 4 +- 21 files changed, 195 insertions(+), 263 deletions(-) delete mode 100644 trace/default.c delete mode 100644 trace/stderr.c -- 1.9.3