The following changes since commit f0fb8b7180fdcf536ea635a0720e1496110ecb3b:
Merge branch 'omap-for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm into pm (2011-08-29 23:59:06 +0200) are available in the git repository at: ssh://repo.or.cz/srv/git/qemu/stefanha.git tracing LluĂs (14): build: Fix linkage of QEMU_PROG build: [simple] Include qemu-timer-common.o in trace-obj-y trace: [configure] rename CONFIG_*_TRACE into CONFIG_TRACE_* trace: [make] replace 'ifeq' with values in CONFIG_TRACE_* trace: move backend-specific code into the trace/ directory trace: avoid conditional code compilation during option parsing trace: generalize the "property" concept in the trace-events file trace: separate trace event control and query routines from the simple backend trace: always compile support for controlling and querying trace event states trace: add "-trace events" argument to control initial state trace: always use the "nop" backend on events with the "disable" keyword trace: [simple] disable all trace points by default trace: [stderr] add support for dynamically enabling/disabling events trace: enable all events Stefan Hajnoczi (1): simpletrace: fix process() argument count Makefile | 1 + Makefile.objs | 22 +- Makefile.target | 8 +- configure | 27 ++- docs/tracing.txt | 73 +++-- hmp-commands.hx | 11 +- monitor.c | 26 +- qemu-config.c | 7 +- qemu-options.hx | 27 ++- scripts/simpletrace.py | 4 +- scripts/tracetool | 116 ++++---- tests/test_path.c | 2 +- trace-events | 651 +++++++++++++++++++-------------------- trace/control.c | 42 +++ trace/control.h | 41 +++ trace/default.c | 41 +++ simpletrace.c => trace/simple.c | 27 +- simpletrace.h => trace/simple.h | 16 +- trace/stderr.c | 37 +++ trace/stderr.h | 11 + vl.c | 19 +- 21 files changed, 719 insertions(+), 490 deletions(-) create mode 100644 trace/control.c create mode 100644 trace/control.h create mode 100644 trace/default.c rename simpletrace.c => trace/simple.c (94%) rename simpletrace.h => trace/simple.h (75%) create mode 100644 trace/stderr.c create mode 100644 trace/stderr.h