Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
commit5c6b3c50cca2106e5fbcbc6efa94c2f8b9d29fd8
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 15 Aug 2014 15:37:17 +0000 (15 16:37 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 15 Aug 2014 15:37:17 +0000 (15 16:37 +0100)
tree130b8de581b48b1bf1862b4f5f1e8001955cc47e
parentf2fb1da9412ae7b4cb512cfbd86c0185f191e2f9
parent4ac4458076e1aaf3b01a6361154117df20e22215
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Tracing pull request

* remotes/stefanha/tags/tracing-pull-request:
  virtio-rng: add some trace events
  trace: add some tcg tracing support
  trace: teach lttng backend to use format strings
  trace: [tcg] Include TCG-tracing header on all targets
  trace: [tcg] Include event definitions in "trace.h"
  trace: [tcg] Generate TCG tracing routines
  trace: [tcg] Include TCG-tracing helpers
  trace: [tcg] Define TCG tracing helper routine wrappers
  trace: [tcg] Define TCG tracing helper routines
  trace: [tcg] Declare TCG tracing helper routines
  trace: [tcg] Add 'tcg' event property
  trace: [tcg] Argument type transformation machinery
  trace: [tcg] Argument type transformation rules
  trace: [tcg] Add documentation
  trace: install simpletrace SystemTap tapset
  simpletrace: add simpletrace.py --no-header option
  trace: add tracetool simpletrace_stap format
  trace: extract stap_escape() function for reuse

Conflicts:
Makefile.objs
Makefile
Makefile.objs