From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 12 Jun 2017 13:51:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
X-Git-Tag: v2.10.0-rc0~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5093f028ce6529034efc8fdc06cec2aa2e2eea63;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

# gpg: Signature made Wed 07 Jun 2017 19:55:32 BST
# 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:
  simpletrace: Improve the error message if event is not declared

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

5093f028ce6529034efc8fdc06cec2aa2e2eea63