Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
commit3a789fcca090bdcc80448f7c080122730e6d0230
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 7 Aug 2017 12:17:12 +0000 (7 13:17 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 7 Aug 2017 12:17:12 +0000 (7 13:17 +0100)
treee7dd3b0b475d1b8d245a8903e2962fb1ead020ec
parente59b1c5f677ca7e97709f606ad46947e9fdbb7bb
parentf42cf447e2310e84e119b99f7f13c8dc7a6cf3d6
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

# gpg: Signature made Mon 07 Aug 2017 12:03:54 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:
  block: move trace probes into bdrv_co_preadv|pwritev

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