Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jun 2014 15:25:34 +0000 (16:25 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jun 2014 15:25:34 +0000 (16:25 +0100)
commit14ac57339288c07b47e7e91fa192735158aa6a1e
treed24b742f3c7322d489548a9d74b4bd88b6bb4923
parent4a331bb33bdf112ba95470e5d6ea3561b049c280
parenta35d9be622a85d9ad6be5448e78c8a3f95ee5f00
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Tracing pull request

# gpg: Signature made Mon 09 Jun 2014 14:44:18 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  trace: Replace fprintf with error_report and print location
  trace: Multi-backend tracing
  trace: Replace error with warning if event is not defined
  simpletrace: add support for trace record pid field
  trace: add pid field to simpletrace record

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>