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 22/42] trace: split out trace events for hw/dma/ directory
Date: Mon, 20 Jun 2016 21:29:42 +0100 [thread overview]
Message-ID: <1466454602-28778-23-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1466454602-28778-1-git-send-email-stefanha@redhat.com>
From: "Daniel P. Berrange" <berrange@redhat.com>
Move all trace-events for files in the hw/dma/ directory to
their own file.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1466066426-16657-21-git-send-email-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
Makefile.objs | 1 +
hw/dma/trace-events | 32 ++++++++++++++++++++++++++++++++
trace-events | 31 -------------------------------
3 files changed, 33 insertions(+), 31 deletions(-)
create mode 100644 hw/dma/trace-events
diff --git a/Makefile.objs b/Makefile.objs
index fbd8454..b05f290 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -137,3 +137,4 @@ trace-events-y += hw/nvram/trace-events
trace-events-y += hw/display/trace-events
trace-events-y += hw/input/trace-events
trace-events-y += hw/timer/trace-events
+trace-events-y += hw/dma/trace-events
diff --git a/hw/dma/trace-events b/hw/dma/trace-events
new file mode 100644
index 0000000..d8a5674
--- /dev/null
+++ b/hw/dma/trace-events
@@ -0,0 +1,32 @@
+# See docs/trace-events.txt for syntax documentation.
+
+# hw/dma/rc4030.c
+jazzio_read(uint64_t addr, uint32_t ret) "read reg[0x%"PRIx64"] = 0x%x"
+jazzio_write(uint64_t addr, uint32_t val) "write reg[0x%"PRIx64"] = 0x%x"
+rc4030_read(uint64_t addr, uint32_t ret) "read reg[0x%"PRIx64"] = 0x%x"
+rc4030_write(uint64_t addr, uint32_t val) "write reg[0x%"PRIx64"] = 0x%x"
+
+# hw/dma/sparc32_dma.c
+ledma_memory_read(uint64_t addr) "DMA read addr 0x%"PRIx64
+ledma_memory_write(uint64_t addr) "DMA write addr 0x%"PRIx64
+sparc32_dma_set_irq_raise(void) "Raise IRQ"
+sparc32_dma_set_irq_lower(void) "Lower IRQ"
+espdma_memory_read(uint32_t addr) "DMA read addr 0x%08x"
+espdma_memory_write(uint32_t addr) "DMA write addr 0x%08x"
+sparc32_dma_mem_readl(uint64_t addr, uint32_t ret) "read dmareg %"PRIx64": 0x%08x"
+sparc32_dma_mem_writel(uint64_t addr, uint32_t old, uint32_t val) "write dmareg %"PRIx64": 0x%08x -> 0x%08x"
+sparc32_dma_enable_raise(void) "Raise DMA enable"
+sparc32_dma_enable_lower(void) "Lower DMA enable"
+
+# hw/dma/sun4m_iommu.c
+sun4m_iommu_mem_readl(uint64_t addr, uint32_t ret) "read reg[%"PRIx64"] = %x"
+sun4m_iommu_mem_writel(uint64_t addr, uint32_t val) "write reg[%"PRIx64"] = %x"
+sun4m_iommu_mem_writel_ctrl(uint64_t iostart) "iostart = %"PRIx64
+sun4m_iommu_mem_writel_tlbflush(uint32_t val) "tlb flush %x"
+sun4m_iommu_mem_writel_pgflush(uint32_t val) "page flush %x"
+sun4m_iommu_page_get_flags(uint64_t pa, uint64_t iopte, uint32_t ret) "get flags addr %"PRIx64" => pte %"PRIx64", *pte = %x"
+sun4m_iommu_translate_pa(uint64_t addr, uint64_t pa, uint32_t iopte) "xlate dva %"PRIx64" => pa %"PRIx64" iopte = %x"
+sun4m_iommu_bad_addr(uint64_t addr) "bad addr %"PRIx64
+
+# hw/dma/i8257.c
+i8257_unregistered_dma(int nchan, int dma_pos, int dma_len) "unregistered DMA channel used nchan=%d dma_pos=%d dma_len=%d"
diff --git a/trace-events b/trace-events
index cdfd7ee..b87ccb3 100644
--- a/trace-events
+++ b/trace-events
@@ -42,40 +42,12 @@ virtio_balloon_get_config(uint32_t num_pages, uint32_t actual) "num_pages: %d ac
virtio_balloon_set_config(uint32_t actual, uint32_t oldactual) "actual: %d oldactual: %d"
virtio_balloon_to_target(uint64_t target, uint32_t num_pages) "balloon target: %"PRIx64" num_pages: %d"
-# hw/dma/rc4030.c
-jazzio_read(uint64_t addr, uint32_t ret) "read reg[0x%"PRIx64"] = 0x%x"
-jazzio_write(uint64_t addr, uint32_t val) "write reg[0x%"PRIx64"] = 0x%x"
-rc4030_read(uint64_t addr, uint32_t ret) "read reg[0x%"PRIx64"] = 0x%x"
-rc4030_write(uint64_t addr, uint32_t val) "write reg[0x%"PRIx64"] = 0x%x"
-
-# hw/dma/sparc32_dma.c
-ledma_memory_read(uint64_t addr) "DMA read addr 0x%"PRIx64
-ledma_memory_write(uint64_t addr) "DMA write addr 0x%"PRIx64
-sparc32_dma_set_irq_raise(void) "Raise IRQ"
-sparc32_dma_set_irq_lower(void) "Lower IRQ"
-espdma_memory_read(uint32_t addr) "DMA read addr 0x%08x"
-espdma_memory_write(uint32_t addr) "DMA write addr 0x%08x"
-sparc32_dma_mem_readl(uint64_t addr, uint32_t ret) "read dmareg %"PRIx64": 0x%08x"
-sparc32_dma_mem_writel(uint64_t addr, uint32_t old, uint32_t val) "write dmareg %"PRIx64": 0x%08x -> 0x%08x"
-sparc32_dma_enable_raise(void) "Raise DMA enable"
-sparc32_dma_enable_lower(void) "Lower DMA enable"
-
# hw/sparc/sun4m.c
sun4m_cpu_interrupt(unsigned int level) "Set CPU IRQ %d"
sun4m_cpu_reset_interrupt(unsigned int level) "Reset CPU IRQ %d"
sun4m_cpu_set_irq_raise(int level) "Raise CPU IRQ %d"
sun4m_cpu_set_irq_lower(int level) "Lower CPU IRQ %d"
-# hw/dma/sun4m_iommu.c
-sun4m_iommu_mem_readl(uint64_t addr, uint32_t ret) "read reg[%"PRIx64"] = %x"
-sun4m_iommu_mem_writel(uint64_t addr, uint32_t val) "write reg[%"PRIx64"] = %x"
-sun4m_iommu_mem_writel_ctrl(uint64_t iostart) "iostart = %"PRIx64
-sun4m_iommu_mem_writel_tlbflush(uint32_t val) "tlb flush %x"
-sun4m_iommu_mem_writel_pgflush(uint32_t val) "page flush %x"
-sun4m_iommu_page_get_flags(uint64_t pa, uint64_t iopte, uint32_t ret) "get flags addr %"PRIx64" => pte %"PRIx64", *pte = %x"
-sun4m_iommu_translate_pa(uint64_t addr, uint64_t pa, uint32_t iopte) "xlate dva %"PRIx64" => pa %"PRIx64" iopte = %x"
-sun4m_iommu_bad_addr(uint64_t addr) "bad addr %"PRIx64
-
# vl.c
vm_state_notify(int running, int reason) "running %d reason %d"
load_file(const char *name, const char *path) "name %s location %s"
@@ -534,9 +506,6 @@ kvm_clear_cmma(int rc) "CMMA: clearing with result code %d"
kvm_failed_cpu_state_set(int cpu_index, uint8_t state, const char *msg) "Warning: Unable to set cpu %d state %" PRIu8 " to KVM: %s"
kvm_sigp_finished(uint8_t order, int cpu_index, int dst_index, int cc) "SIGP: Finished order %u on cpu %d -> cpu %d with cc=%d"
-# hw/dma/i8257.c
-i8257_unregistered_dma(int nchan, int dma_pos, int dma_len) "unregistered DMA channel used nchan=%d dma_pos=%d dma_len=%d"
-
# target-s390x/cpu.c
cpu_set_state(int cpu_index, uint8_t state) "setting cpu %d state to %" PRIu8
cpu_halt(int cpu_index) "halting cpu %d"
--
2.5.5
next prev parent reply other threads:[~2016-06-20 20:31 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 20:29 [Qemu-devel] [PULL 00/42] Tracing patches Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 01/42] exec: [tcg] Track which vCPU is performing translation and execution Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 02/42] trace: [all] Add "guest_mem_before" event Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 03/42] trace: add build framework for merging trace-events files Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 04/42] trace: split out trace events for util/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 05/42] trace: split out trace events for crypto/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 06/42] trace: split out trace events for io/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 07/42] trace: split out trace events for migration/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 08/42] trace: split out trace events for block/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 09/42] trace: split out trace events for hw/block/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 10/42] trace: split out trace events for hw/char/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 11/42] trace: split out trace events for hw/intc/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 12/42] trace: split out trace events for hw/net/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 13/42] trace: split out trace events for hw/virtio/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 14/42] trace: split out trace events for hw/audio/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 15/42] trace: split out trace events for hw/misc/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 16/42] trace: split out trace events for hw/usb/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 17/42] trace: split out trace events for hw/scsi/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 18/42] trace: split out trace events for hw/nvram/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 19/42] trace: split out trace events for hw/display/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 20/42] trace: split out trace events for hw/input/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 21/42] trace: split out trace events for hw/timer/ directory Stefan Hajnoczi
2016-06-20 20:29 ` Stefan Hajnoczi [this message]
2016-06-20 20:29 ` [Qemu-devel] [PULL 23/42] trace: split out trace events for hw/sparc/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 24/42] trace: split out trace events for hw/sd/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 25/42] trace: split out trace events for hw/isa/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 26/42] trace: split out trace events for hw/i386/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 27/42] trace: split out trace events for hw/9pfs/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 28/42] trace: split out trace events for hw/ppc/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 29/42] trace: split out trace events for hw/pci/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 30/42] trace: split out trace events for hw/s390x/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 31/42] trace: split out trace events for hw/vfio/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 32/42] trace: split out trace events for hw/acpi/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 33/42] trace: split out trace events for hw/arm/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 34/42] trace: split out trace events for hw/alpha/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 35/42] trace: split out trace events for ui/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 36/42] trace: split out trace events for audio/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 37/42] trace: split out trace events for net/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 38/42] trace: split out trace events for target-sparc/ directory Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 39/42] trace: split out trace events for target-s390x/ directory Stefan Hajnoczi
2016-06-20 20:30 ` [Qemu-devel] [PULL 40/42] trace: split out trace events for target-ppc/ directory Stefan Hajnoczi
2016-06-20 20:30 ` [Qemu-devel] [PULL 41/42] trace: split out trace events for qom/ directory Stefan Hajnoczi
2016-06-20 20:30 ` [Qemu-devel] [PULL 42/42] trace: split out trace events for linux-user/ directory Stefan Hajnoczi
2016-06-21 9:35 ` [Qemu-devel] [PULL 00/42] Tracing patches Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2016-06-17 15:59 Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 22/42] trace: split out trace events for hw/dma/ directory Stefan Hajnoczi
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=1466454602-28778-23-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).