From: Peter Maydell Date: Mon, 14 Mar 2016 16:22:17 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=618a5a8bc52ba0f2ecbb3dffd01e657f4d841f75;p=qemu.git Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging # gpg: Signature made Mon 14 Mar 2016 11:27:01 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/tracing-pull-request: trace: separate MMIO tracepoints from TB-access tracepoints trace: include CPU index in trace_memory_region_*() Signed-off-by: Peter Maydell --- 618a5a8bc52ba0f2ecbb3dffd01e657f4d841f75