From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
"Daniel P. Berrange" <berrange@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 3/8] trace: move hw/mem/pc-dimm.c trace points into correct file
Date: Wed, 28 Sep 2016 22:31:28 +0100 [thread overview]
Message-ID: <1475098293-13262-4-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1475098293-13262-1-git-send-email-stefanha@redhat.com>
From: "Daniel P. Berrange" <berrange@redhat.com>
The trace points for hw/mem/pc-dimm.c were mistakenly put
in the hw/i386/trace-events file, instead of hw/mem/trace-events
in
commit 5eb76e480b42206d3640c1aab8a376ba350f70bb
Author: Daniel P. Berrange <berrange@redhat.com>
Date: Thu Jun 16 09:40:10 2016 +0100
trace: split out trace events for hw/i386/ directory
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1473872624-23285-4-git-send-email-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
Makefile.objs | 1 +
hw/i386/trace-events | 4 ----
hw/mem/trace-events | 5 +++++
3 files changed, 6 insertions(+), 4 deletions(-)
create mode 100644 hw/mem/trace-events
diff --git a/Makefile.objs b/Makefile.objs
index 7301544..571ac11 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -142,6 +142,7 @@ trace-events-y += hw/dma/trace-events
trace-events-y += hw/sparc/trace-events
trace-events-y += hw/sd/trace-events
trace-events-y += hw/isa/trace-events
+trace-events-y += hw/mem/trace-events
trace-events-y += hw/i386/trace-events
trace-events-y += hw/9pfs/trace-events
trace-events-y += hw/ppc/trace-events
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
index 1938b98..d2b4973 100644
--- a/hw/i386/trace-events
+++ b/hw/i386/trace-events
@@ -7,10 +7,6 @@ xen_platform_log(char *s) "xen platform: %s"
xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space (address %"PRIx64")"
xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (address %"PRIx64")"
-# hw/i386/pc.c
-mhp_pc_dimm_assigned_slot(int slot) "%d"
-mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64
-
# hw/i386/x86-iommu.c
x86_iommu_iec_notify(bool global, uint32_t index, uint32_t mask) "Notify IEC invalidation: global=%d index=%" PRIu32 " mask=%" PRIu32
diff --git a/hw/mem/trace-events b/hw/mem/trace-events
new file mode 100644
index 0000000..323c3c1
--- /dev/null
+++ b/hw/mem/trace-events
@@ -0,0 +1,5 @@
+# See docs/trace-events.txt for syntax documentation.
+
+# hw/mem/pc-dimm.c
+mhp_pc_dimm_assigned_slot(int slot) "%d"
+mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64
--
2.7.4
next prev parent reply other threads:[~2016-09-28 21:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-28 21:31 [Qemu-devel] [PULL 0/8] Tracing patches Stefan Hajnoczi
2016-09-28 21:31 ` [Qemu-devel] [PULL 1/8] trace: move util/buffer.c trace points into correct file Stefan Hajnoczi
2016-09-28 21:31 ` [Qemu-devel] [PULL 2/8] trace: move util/qemu-coroutine*.c " Stefan Hajnoczi
2016-09-28 21:31 ` Stefan Hajnoczi [this message]
2016-09-28 21:31 ` [Qemu-devel] [PULL 4/8] trace: move hw/virtio/virtio-balloon.c " Stefan Hajnoczi
2016-09-28 21:31 ` [Qemu-devel] [PULL 5/8] trace: Properly initialize dynamic event states in hot-plugged vCPUs Stefan Hajnoczi
2016-09-28 21:31 ` [Qemu-devel] [PULL 6/8] trace: Add event "guest_cpu_enter" Stefan Hajnoczi
2016-09-28 21:31 ` [Qemu-devel] [PULL 7/8] trace: Add event "guest_cpu_reset" Stefan Hajnoczi
2016-09-28 21:31 ` [Qemu-devel] [PULL 8/8] trace: Document the execution mode of guest events Stefan Hajnoczi
2016-09-29 18:47 ` [Qemu-devel] [PULL 0/8] Tracing patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475098293-13262-4-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).