Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
commit11ed801d3df3c6e46b2f1f97dcfbf4ca3a2a2f4f
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 30 Jan 2018 09:47:51 +0000 (30 09:47 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 30 Jan 2018 09:47:51 +0000 (30 09:47 +0000)
tree04e6a5e6c5e68d91dedeec9d2a83c19a9f43d78d
parent30d9fefe1aca1e92c785214aa9201fd7c2287d56
parent24f4d3d3aeabf83445839099d6d66cbb3089c37a
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

# gpg: Signature made Mon 29 Jan 2018 15:49:05 GMT
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  tracetool: report error on foo() instead of foo(void)
  tracetool: clarify that "formats" means "format strings"
  tracetool: prefix parse errors with line numbers

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