From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Lluís Vilanova" <vilanova@ac.upc.edu>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v2 13/40] trace: split out trace events for hw/misc/ directory
Date: Thu, 16 Jun 2016 09:39:59 +0100 [thread overview]
Message-ID: <1466066426-16657-14-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1466066426-16657-1-git-send-email-berrange@redhat.com>
Move all trace-events for files in the hw/misc/ directory to
their own file.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
Makefile.objs | 1 +
hw/misc/trace-events | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
trace-events | 51 ---------------------------------------------------
3 files changed, 53 insertions(+), 51 deletions(-)
create mode 100644 hw/misc/trace-events
diff --git a/Makefile.objs b/Makefile.objs
index 9d5f64d..4f0ccbe 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -130,3 +130,4 @@ trace-events-y += hw/intc/trace-events
trace-events-y += hw/net/trace-events
trace-events-y += hw/virtio/trace-events
trace-events-y += hw/audio/trace-events
+trace-events-y += hw/misc/trace-events
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
new file mode 100644
index 0000000..16b6701
--- /dev/null
+++ b/hw/misc/trace-events
@@ -0,0 +1,52 @@
+# See docs/trace-events.txt for syntax documentation.
+
+# hw/misc/eccmemctl.c
+ecc_mem_writel_mer(uint32_t val) "Write memory enable %08x"
+ecc_mem_writel_mdr(uint32_t val) "Write memory delay %08x"
+ecc_mem_writel_mfsr(uint32_t val) "Write memory fault status %08x"
+ecc_mem_writel_vcr(uint32_t val) "Write slot configuration %08x"
+ecc_mem_writel_dr(uint32_t val) "Write diagnostic %08x"
+ecc_mem_writel_ecr0(uint32_t val) "Write event count 1 %08x"
+ecc_mem_writel_ecr1(uint32_t val) "Write event count 2 %08x"
+ecc_mem_readl_mer(uint32_t ret) "Read memory enable %08x"
+ecc_mem_readl_mdr(uint32_t ret) "Read memory delay %08x"
+ecc_mem_readl_mfsr(uint32_t ret) "Read memory fault status %08x"
+ecc_mem_readl_vcr(uint32_t ret) "Read slot configuration %08x"
+ecc_mem_readl_mfar0(uint32_t ret) "Read memory fault address 0 %08x"
+ecc_mem_readl_mfar1(uint32_t ret) "Read memory fault address 1 %08x"
+ecc_mem_readl_dr(uint32_t ret) "Read diagnostic %08x"
+ecc_mem_readl_ecr0(uint32_t ret) "Read event count 1 %08x"
+ecc_mem_readl_ecr1(uint32_t ret) "Read event count 2 %08x"
+ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId64" = %02x"
+ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x"
+
+# hw/misc/slavio_misc.c
+slavio_misc_update_irq_raise(void) "Raise IRQ"
+slavio_misc_update_irq_lower(void) "Lower IRQ"
+slavio_set_power_fail(int power_failing, uint8_t config) "Power fail: %d, config: %d"
+slavio_cfg_mem_writeb(uint32_t val) "Write config %02x"
+slavio_cfg_mem_readb(uint32_t ret) "Read config %02x"
+slavio_diag_mem_writeb(uint32_t val) "Write diag %02x"
+slavio_diag_mem_readb(uint32_t ret) "Read diag %02x"
+slavio_mdm_mem_writeb(uint32_t val) "Write modem control %02x"
+slavio_mdm_mem_readb(uint32_t ret) "Read modem control %02x"
+slavio_aux1_mem_writeb(uint32_t val) "Write aux1 %02x"
+slavio_aux1_mem_readb(uint32_t ret) "Read aux1 %02x"
+slavio_aux2_mem_writeb(uint32_t val) "Write aux2 %02x"
+slavio_aux2_mem_readb(uint32_t ret) "Read aux2 %02x"
+apc_mem_writeb(uint32_t val) "Write power management %02x"
+apc_mem_readb(uint32_t ret) "Read power management %02x"
+slavio_sysctrl_mem_writel(uint32_t val) "Write system control %08x"
+slavio_sysctrl_mem_readl(uint32_t ret) "Read system control %08x"
+slavio_led_mem_writew(uint32_t val) "Write diagnostic LED %04x"
+slavio_led_mem_readw(uint32_t ret) "Read diagnostic LED %04x"
+
+# hw/misc/milkymist-hpdmc.c
+milkymist_hpdmc_memory_read(uint32_t addr, uint32_t value) "addr=%08x value=%08x"
+milkymist_hpdmc_memory_write(uint32_t addr, uint32_t value) "addr=%08x value=%08x"
+
+# hw/misc/milkymist-pfpu.c
+milkymist_pfpu_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x"
+milkymist_pfpu_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x"
+milkymist_pfpu_vectout(uint32_t a, uint32_t b, uint32_t dma_ptr) "a %08x b %08x dma_ptr %08x"
+milkymist_pfpu_pulse_irq(void) "Pulse IRQ"
diff --git a/trace-events b/trace-events
index b8cfcd8..605bd40 100644
--- a/trace-events
+++ b/trace-events
@@ -46,26 +46,6 @@ virtio_balloon_to_target(uint64_t target, uint32_t num_pages) "balloon target: %
nvram_read(uint32_t addr, uint32_t ret) "read addr %d: 0x%02x"
nvram_write(uint32_t addr, uint32_t old, uint32_t val) "write addr %d: 0x%02x -> 0x%02x"
-# hw/misc/eccmemctl.c
-ecc_mem_writel_mer(uint32_t val) "Write memory enable %08x"
-ecc_mem_writel_mdr(uint32_t val) "Write memory delay %08x"
-ecc_mem_writel_mfsr(uint32_t val) "Write memory fault status %08x"
-ecc_mem_writel_vcr(uint32_t val) "Write slot configuration %08x"
-ecc_mem_writel_dr(uint32_t val) "Write diagnostic %08x"
-ecc_mem_writel_ecr0(uint32_t val) "Write event count 1 %08x"
-ecc_mem_writel_ecr1(uint32_t val) "Write event count 2 %08x"
-ecc_mem_readl_mer(uint32_t ret) "Read memory enable %08x"
-ecc_mem_readl_mdr(uint32_t ret) "Read memory delay %08x"
-ecc_mem_readl_mfsr(uint32_t ret) "Read memory fault status %08x"
-ecc_mem_readl_vcr(uint32_t ret) "Read slot configuration %08x"
-ecc_mem_readl_mfar0(uint32_t ret) "Read memory fault address 0 %08x"
-ecc_mem_readl_mfar1(uint32_t ret) "Read memory fault address 1 %08x"
-ecc_mem_readl_dr(uint32_t ret) "Read diagnostic %08x"
-ecc_mem_readl_ecr0(uint32_t ret) "Read event count 1 %08x"
-ecc_mem_readl_ecr1(uint32_t ret) "Read event count 2 %08x"
-ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId64" = %02x"
-ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x"
-
# hw/nvram/fw_cfg.c
fw_cfg_select(void *s, uint16_t key, int ret) "%p key %d = %d"
fw_cfg_read(void *s, uint64_t ret) "%p = %"PRIx64
@@ -96,27 +76,6 @@ ps2_mouse_reset(void *opaque) "%p"
ps2_kbd_init(void *s) "%p"
ps2_mouse_init(void *s) "%p"
-# hw/misc/slavio_misc.c
-slavio_misc_update_irq_raise(void) "Raise IRQ"
-slavio_misc_update_irq_lower(void) "Lower IRQ"
-slavio_set_power_fail(int power_failing, uint8_t config) "Power fail: %d, config: %d"
-slavio_cfg_mem_writeb(uint32_t val) "Write config %02x"
-slavio_cfg_mem_readb(uint32_t ret) "Read config %02x"
-slavio_diag_mem_writeb(uint32_t val) "Write diag %02x"
-slavio_diag_mem_readb(uint32_t ret) "Read diag %02x"
-slavio_mdm_mem_writeb(uint32_t val) "Write modem control %02x"
-slavio_mdm_mem_readb(uint32_t ret) "Read modem control %02x"
-slavio_aux1_mem_writeb(uint32_t val) "Write aux1 %02x"
-slavio_aux1_mem_readb(uint32_t ret) "Read aux1 %02x"
-slavio_aux2_mem_writeb(uint32_t val) "Write aux2 %02x"
-slavio_aux2_mem_readb(uint32_t ret) "Read aux2 %02x"
-apc_mem_writeb(uint32_t val) "Write power management %02x"
-apc_mem_readb(uint32_t ret) "Read power management %02x"
-slavio_sysctrl_mem_writel(uint32_t val) "Write system control %08x"
-slavio_sysctrl_mem_readl(uint32_t ret) "Read system control %08x"
-slavio_led_mem_writew(uint32_t val) "Write diagnostic LED %04x"
-slavio_led_mem_readw(uint32_t ret) "Read diagnostic LED %04x"
-
# hw/timer/slavio_timer.c
slavio_timer_get_out(uint64_t limit, uint32_t counthigh, uint32_t count) "limit %"PRIx64" count %x%08x"
slavio_timer_irq(uint32_t counthigh, uint32_t count) "callback: count %x%08x"
@@ -589,20 +548,10 @@ megasas_mmio_invalid_readl(unsigned long addr) "addr 0x%lx"
megasas_mmio_writel(const char *reg, uint32_t val) "reg %s: 0x%x"
megasas_mmio_invalid_writel(uint32_t addr, uint32_t val) "addr 0x%x: 0x%x"
-# hw/misc/milkymist-hpdmc.c
-milkymist_hpdmc_memory_read(uint32_t addr, uint32_t value) "addr=%08x value=%08x"
-milkymist_hpdmc_memory_write(uint32_t addr, uint32_t value) "addr=%08x value=%08x"
-
# hw/sd/milkymist-memcard.c
milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x"
milkymist_memcard_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x"
-# hw/misc/milkymist-pfpu.c
-milkymist_pfpu_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x"
-milkymist_pfpu_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x"
-milkymist_pfpu_vectout(uint32_t a, uint32_t b, uint32_t dma_ptr) "a %08x b %08x dma_ptr %08x"
-milkymist_pfpu_pulse_irq(void) "Pulse IRQ"
-
# hw/input/milkymist-softusb.c
milkymist_softusb_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x"
milkymist_softusb_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x"
--
2.5.5
next prev parent reply other threads:[~2016-06-16 8:41 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 8:39 [Qemu-devel] [PATCH v2 00/40] Split up the trace-events file Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 01/40] trace: add build framework for merging trace-events files Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 02/40] trace: split out trace events for util/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 03/40] trace: split out trace events for crypto/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 04/40] trace: split out trace events for io/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 05/40] trace: split out trace events for migration/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 06/40] trace: split out trace events for block/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 07/40] trace: split out trace events for hw/block/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 08/40] trace: split out trace events for hw/char/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 09/40] trace: split out trace events for hw/intc/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 10/40] trace: split out trace events for hw/net/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 11/40] trace: split out trace events for hw/virtio/ directory Daniel P. Berrange
2016-06-16 8:39 ` [Qemu-devel] [PATCH v2 12/40] trace: split out trace events for hw/audio/ directory Daniel P. Berrange
2016-06-16 8:39 ` Daniel P. Berrange [this message]
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 14/40] trace: split out trace events for hw/usb/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 15/40] trace: split out trace events for hw/scsi/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 16/40] trace: split out trace events for hw/nvram/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 17/40] trace: split out trace events for hw/display/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 18/40] trace: split out trace events for hw/input/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 19/40] trace: split out trace events for hw/timer/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 20/40] trace: split out trace events for hw/dma/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 21/40] trace: split out trace events for hw/sparc/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 22/40] trace: split out trace events for hw/sd/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 23/40] trace: split out trace events for hw/isa/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 24/40] trace: split out trace events for hw/i386/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 25/40] trace: split out trace events for hw/9pfs/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 26/40] trace: split out trace events for hw/ppc/ directory Daniel P. Berrange
2016-06-16 9:49 ` Thomas Huth
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 27/40] trace: split out trace events for hw/pci/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 28/40] trace: split out trace events for hw/s390x/ directory Daniel P. Berrange
2016-06-16 9:57 ` Cornelia Huck
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 29/40] trace: split out trace events for hw/vfio/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 30/40] trace: split out trace events for hw/acpi/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 31/40] trace: split out trace events for hw/arm/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 32/40] trace: split out trace events for hw/alpha/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 33/40] trace: split out trace events for ui/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 34/40] trace: split out trace events for audio/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 35/40] trace: split out trace events for net/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 36/40] trace: split out trace events for target-sparc/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 37/40] trace: split out trace events for target-s390x/ directory Daniel P. Berrange
2016-06-16 9:58 ` Cornelia Huck
2016-06-17 13:29 ` Stefan Hajnoczi
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 38/40] trace: split out trace events for target-ppc/ directory Daniel P. Berrange
2016-06-16 9:51 ` Thomas Huth
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 39/40] trace: split out trace events for qom/ directory Daniel P. Berrange
2016-06-16 8:40 ` [Qemu-devel] [PATCH v2 40/40] trace: split out trace events for linux-user/ directory Daniel P. Berrange
2016-06-16 12:51 ` Laurent Vivier
2016-06-16 13:00 ` [Qemu-devel] [PATCH v2 00/40] Split up the trace-events file Peter Maydell
2016-06-16 13:07 ` Daniel P. Berrange
2016-06-17 13:30 ` 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=1466066426-16657-14-git-send-email-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vilanova@ac.upc.edu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.