summaryrefslogtreecommitdiff
path: root/hw/isa/trace-events
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-08-15 18:27:51 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-08-15 18:27:51 +0100
commitaba5d9766454ed4b72d0deb43bbad0356eeb336e (patch)
tree8c7dfdcce7a3862095eb6ba2aba14a990c31335c /hw/isa/trace-events
parente57218b6ed9d8e45585eea8fe1dc49068f51a1d2 (diff)
parente723b8710356163e0f1722b94f988a8ddf83f17a (diff)
downloadqemu-aba5d9766454ed4b72d0deb43bbad0356eeb336e.tar.gz
qemu-aba5d9766454ed4b72d0deb43bbad0356eeb336e.tar.bz2
qemu-aba5d9766454ed4b72d0deb43bbad0356eeb336e.zip
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Fri 12 Aug 2016 11:48:03 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: trace-events: fix first line comment in trace-events Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/isa/trace-events')
-rw-r--r--hw/isa/trace-events2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/isa/trace-events b/hw/isa/trace-events
index 686282fd19..9faca41a97 100644
--- a/hw/isa/trace-events
+++ b/hw/isa/trace-events
@@ -1,4 +1,4 @@
-# See docs/trace-events.txt for syntax documentation.
+# See docs/tracing.txt for syntax documentation.
# hw/isa/pc87312.c
pc87312_io_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"