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 21/42] trace: split out trace events for hw/timer/ directory
Date: Fri, 17 Jun 2016 16:59:32 +0100 [thread overview]
Message-ID: <1466179193-11232-22-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1466179193-11232-1-git-send-email-stefanha@redhat.com>
From: "Daniel P. Berrange" <berrange@redhat.com>
Move all trace-events for files in the hw/timer/ directory to
their own file.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1466066426-16657-20-git-send-email-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
Makefile.objs | 1 +
hw/timer/trace-events | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
trace-events | 50 --------------------------------------------------
3 files changed, 52 insertions(+), 50 deletions(-)
create mode 100644 hw/timer/trace-events
diff --git a/Makefile.objs b/Makefile.objs
index 5025512..fbd8454 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -136,3 +136,4 @@ trace-events-y += hw/scsi/trace-events
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
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
new file mode 100644
index 0000000..19db4bf
--- /dev/null
+++ b/hw/timer/trace-events
@@ -0,0 +1,51 @@
+# See docs/trace-events.txt for syntax documentation.
+
+# 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"
+slavio_timer_mem_readl_invalid(uint64_t addr) "invalid read address %"PRIx64
+slavio_timer_mem_readl(uint64_t addr, uint32_t ret) "read %"PRIx64" = %08x"
+slavio_timer_mem_writel(uint64_t addr, uint32_t val) "write %"PRIx64" = %08x"
+slavio_timer_mem_writel_limit(unsigned int timer_index, uint64_t count) "processor %d user timer set to %016"PRIx64
+slavio_timer_mem_writel_counter_invalid(void) "not user timer"
+slavio_timer_mem_writel_status_start(unsigned int timer_index) "processor %d user timer started"
+slavio_timer_mem_writel_status_stop(unsigned int timer_index) "processor %d user timer stopped"
+slavio_timer_mem_writel_mode_user(unsigned int timer_index) "processor %d changed from counter to user timer"
+slavio_timer_mem_writel_mode_counter(unsigned int timer_index) "processor %d changed from user timer to counter"
+slavio_timer_mem_writel_mode_invalid(void) "not system timer"
+slavio_timer_mem_writel_invalid(uint64_t addr) "invalid write address %"PRIx64
+
+# hw/timer/grlib_gptimer.c
+grlib_gptimer_enable(int id, uint32_t count) "timer:%d set count 0x%x and run"
+grlib_gptimer_disabled(int id, uint32_t config) "timer:%d Timer disable config 0x%x"
+grlib_gptimer_restart(int id, uint32_t reload) "timer:%d reload val: 0x%x"
+grlib_gptimer_set_scaler(uint32_t scaler, uint32_t freq) "scaler:0x%x freq: 0x%x"
+grlib_gptimer_hit(int id) "timer:%d HIT"
+grlib_gptimer_readl(int id, uint64_t addr, uint32_t val) "timer:%d addr 0x%"PRIx64" 0x%x"
+grlib_gptimer_writel(int id, uint64_t addr, uint32_t val) "timer:%d addr 0x%"PRIx64" 0x%x"
+
+# hw/timer/lm32_timer.c
+lm32_timer_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
+lm32_timer_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
+lm32_timer_hit(void) "timer hit"
+lm32_timer_irq_state(int level) "irq state %d"
+
+# hw/timer/milkymist-sysctl.c
+milkymist_sysctl_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x"
+milkymist_sysctl_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x"
+milkymist_sysctl_icap_write(uint32_t value) "value %08x"
+milkymist_sysctl_start_timer0(void) "Start timer0"
+milkymist_sysctl_stop_timer0(void) "Stop timer0"
+milkymist_sysctl_start_timer1(void) "Start timer1"
+milkymist_sysctl_stop_timer1(void) "Stop timer1"
+milkymist_sysctl_pulse_irq_timer0(void) "Pulse IRQ Timer0"
+milkymist_sysctl_pulse_irq_timer1(void) "Pulse IRQ Timer1"
+
+# hw/timer/aspeed_timer.c
+aspeed_timer_ctrl_enable(uint8_t i, bool enable) "Timer %" PRIu8 ": %d"
+aspeed_timer_ctrl_external_clock(uint8_t i, bool enable) "Timer %" PRIu8 ": %d"
+aspeed_timer_ctrl_overflow_interrupt(uint8_t i, bool enable) "Timer %" PRIu8 ": %d"
+aspeed_timer_ctrl_pulse_enable(uint8_t i, bool enable) "Timer %" PRIu8 ": %d"
+aspeed_timer_set_ctrl2(uint32_t value) "Value: 0x%" PRIx32
+aspeed_timer_set_value(int timer, int reg, uint32_t value) "Timer %d register %d: 0x%" PRIx32
+aspeed_timer_read(uint64_t offset, unsigned size, uint64_t value) "From 0x%" PRIx64 ": of size %u: 0x%" PRIx64
diff --git a/trace-events b/trace-events
index 7f63d5b..cdfd7ee 100644
--- a/trace-events
+++ b/trace-events
@@ -42,21 +42,6 @@ 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/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"
-slavio_timer_mem_readl_invalid(uint64_t addr) "invalid read address %"PRIx64
-slavio_timer_mem_readl(uint64_t addr, uint32_t ret) "read %"PRIx64" = %08x"
-slavio_timer_mem_writel(uint64_t addr, uint32_t val) "write %"PRIx64" = %08x"
-slavio_timer_mem_writel_limit(unsigned int timer_index, uint64_t count) "processor %d user timer set to %016"PRIx64
-slavio_timer_mem_writel_counter_invalid(void) "not user timer"
-slavio_timer_mem_writel_status_start(unsigned int timer_index) "processor %d user timer started"
-slavio_timer_mem_writel_status_stop(unsigned int timer_index) "processor %d user timer stopped"
-slavio_timer_mem_writel_mode_user(unsigned int timer_index) "processor %d changed from counter to user timer"
-slavio_timer_mem_writel_mode_counter(unsigned int timer_index) "processor %d changed from user timer to counter"
-slavio_timer_mem_writel_mode_invalid(void) "not system timer"
-slavio_timer_mem_writel_invalid(uint64_t addr) "invalid write address %"PRIx64
-
# 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"
@@ -99,15 +84,6 @@ system_wakeup_request(int reason) "reason=%d"
qemu_system_shutdown_request(void) ""
qemu_system_powerdown_request(void) ""
-# hw/timer/grlib_gptimer.c
-grlib_gptimer_enable(int id, uint32_t count) "timer:%d set count 0x%x and run"
-grlib_gptimer_disabled(int id, uint32_t config) "timer:%d Timer disable config 0x%x"
-grlib_gptimer_restart(int id, uint32_t reload) "timer:%d reload val: 0x%x"
-grlib_gptimer_set_scaler(uint32_t scaler, uint32_t freq) "scaler:0x%x freq: 0x%x"
-grlib_gptimer_hit(int id) "timer:%d HIT"
-grlib_gptimer_readl(int id, uint64_t addr, uint32_t val) "timer:%d addr 0x%"PRIx64" 0x%x"
-grlib_gptimer_writel(int id, uint64_t addr, uint32_t val) "timer:%d addr 0x%"PRIx64" 0x%x"
-
# hw/sparc/leon3.c
leon3_set_irq(int intno) "Set CPU IRQ %d"
leon3_reset_irq(int intno) "Reset CPU IRQ %d"
@@ -119,27 +95,10 @@ spice_vmc_register_interface(void *scd) "spice vmc registered interface %p"
spice_vmc_unregister_interface(void *scd) "spice vmc unregistered interface %p"
spice_vmc_event(int event) "spice vmc event %d"
-# hw/timer/lm32_timer.c
-lm32_timer_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
-lm32_timer_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
-lm32_timer_hit(void) "timer hit"
-lm32_timer_irq_state(int level) "irq state %d"
-
# 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/timer/milkymist-sysctl.c
-milkymist_sysctl_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x"
-milkymist_sysctl_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x"
-milkymist_sysctl_icap_write(uint32_t value) "value %08x"
-milkymist_sysctl_start_timer0(void) "Start timer0"
-milkymist_sysctl_stop_timer0(void) "Stop timer0"
-milkymist_sysctl_start_timer1(void) "Start timer1"
-milkymist_sysctl_stop_timer1(void) "Stop timer1"
-milkymist_sysctl_pulse_irq_timer0(void) "Pulse IRQ Timer0"
-milkymist_sysctl_pulse_irq_timer1(void) "Pulse IRQ Timer1"
-
# hw/isa/pc87312.c
pc87312_io_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
pc87312_io_write(uint32_t addr, uint32_t val) "write addr=%x val=%x"
@@ -619,15 +578,6 @@ user_host_signal(void *env, int host_sig, int target_sig) "env=%p signal %d (tar
user_queue_signal(void *env, int target_sig) "env=%p signal %d"
user_s390x_restore_sigregs(void *env, uint64_t sc_psw_addr, uint64_t env_psw_addr) "env=%p frame psw.addr %"PRIx64 " current psw.addr %"PRIx64
-# hw/timer/aspeed_timer.c
-aspeed_timer_ctrl_enable(uint8_t i, bool enable) "Timer %" PRIu8 ": %d"
-aspeed_timer_ctrl_external_clock(uint8_t i, bool enable) "Timer %" PRIu8 ": %d"
-aspeed_timer_ctrl_overflow_interrupt(uint8_t i, bool enable) "Timer %" PRIu8 ": %d"
-aspeed_timer_ctrl_pulse_enable(uint8_t i, bool enable) "Timer %" PRIu8 ": %d"
-aspeed_timer_set_ctrl2(uint32_t value) "Value: 0x%" PRIx32
-aspeed_timer_set_value(int timer, int reg, uint32_t value) "Timer %d register %d: 0x%" PRIx32
-aspeed_timer_read(uint64_t offset, unsigned size, uint64_t value) "From 0x%" PRIx64 ": of size %u: 0x%" PRIx64
-
### Guest events, keep at bottom
# @vaddr: Access' virtual address.
--
2.5.5
next prev parent reply other threads:[~2016-06-17 16:01 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-17 15:59 [Qemu-devel] [PULL 00/42] Tracing patches Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 01/42] exec: [tcg] Track which vCPU is performing translation and execution Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 02/42] trace: [all] Add "guest_mem_before" event Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 03/42] trace: add build framework for merging trace-events files Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 04/42] trace: split out trace events for util/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 05/42] trace: split out trace events for crypto/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 06/42] trace: split out trace events for io/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 07/42] trace: split out trace events for migration/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 08/42] trace: split out trace events for block/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 09/42] trace: split out trace events for hw/block/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 10/42] trace: split out trace events for hw/char/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 11/42] trace: split out trace events for hw/intc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 12/42] trace: split out trace events for hw/net/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 13/42] trace: split out trace events for hw/virtio/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 14/42] trace: split out trace events for hw/audio/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 15/42] trace: split out trace events for hw/misc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 16/42] trace: split out trace events for hw/usb/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 17/42] trace: split out trace events for hw/scsi/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 18/42] trace: split out trace events for hw/nvram/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 19/42] trace: split out trace events for hw/display/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 20/42] trace: split out trace events for hw/input/ directory Stefan Hajnoczi
2016-06-17 15:59 ` Stefan Hajnoczi [this message]
2016-06-17 15:59 ` [Qemu-devel] [PULL 22/42] trace: split out trace events for hw/dma/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 23/42] trace: split out trace events for hw/sparc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 24/42] trace: split out trace events for hw/sd/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 25/42] trace: split out trace events for hw/isa/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 26/42] trace: split out trace events for hw/i386/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 27/42] trace: split out trace events for hw/9pfs/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 28/42] trace: split out trace events for hw/ppc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 29/42] trace: split out trace events for hw/pci/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 30/42] trace: split out trace events for hw/s390x/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 31/42] trace: split out trace events for hw/vfio/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 32/42] trace: split out trace events for hw/acpi/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 33/42] trace: split out trace events for hw/arm/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 34/42] trace: split out trace events for hw/alpha/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 35/42] trace: split out trace events for ui/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 36/42] trace: split out trace events for audio/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 37/42] trace: split out trace events for net/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 38/42] trace: split out trace events for target-sparc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 39/42] trace: split out trace events for target-s390x/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 40/42] trace: split out trace events for target-ppc/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 41/42] trace: split out trace events for qom/ directory Stefan Hajnoczi
2016-06-17 15:59 ` [Qemu-devel] [PULL 42/42] trace: split out trace events for linux-user/ directory Stefan Hajnoczi
2016-06-20 8:45 ` [Qemu-devel] [PULL 00/42] Tracing patches Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2016-06-20 20:29 Stefan Hajnoczi
2016-06-20 20:29 ` [Qemu-devel] [PULL 21/42] trace: split out trace events for hw/timer/ 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=1466179193-11232-22-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).