[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 18/40] trace: split out trace events for hw/input
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v1 18/40] trace: split out trace events for hw/input/ directory |
Date: |
Thu, 9 Jun 2016 17:58:12 +0100 |
Move all trace-events for files in the hw/input/ directory to
their own file.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
Makefile.objs | 1 +
hw/input/trace-events | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
trace-events | 24 ------------------------
3 files changed, 51 insertions(+), 24 deletions(-)
create mode 100644 hw/input/trace-events
diff --git a/Makefile.objs b/Makefile.objs
index d9c98d9..5025512 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -135,3 +135,4 @@ trace-events-y += hw/usb/trace-events
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
diff --git a/hw/input/trace-events b/hw/input/trace-events
new file mode 100644
index 0000000..c9398eb
--- /dev/null
+++ b/hw/input/trace-events
@@ -0,0 +1,50 @@
+# Trace events for debugging and performance instrumentation
+#
+# This file is processed by the tracetool script during the build.
+#
+# To add a new trace event:
+#
+# 1. Choose a name for the trace event. Declare its arguments and format
+# string.
+#
+# 2. Call the trace event from code using trace_##name, e.g. multiwrite_cb() ->
+# trace_multiwrite_cb(). The source file must #include "trace.h".
+#
+# Format of a trace event:
+#
+# [disable] <name>(<type1> <arg1>[, <type2> <arg2>] ...) "<format-string>"
+#
+# Example: g_malloc(size_t size) "size %zu"
+#
+# The "disable" keyword will build without the trace event.
+#
+# The <name> must be a valid as a C function name.
+#
+# Types should be standard C types. Use void * for pointers because the trace
+# system may not have the necessary headers included.
+#
+# The <format-string> should be a sprintf()-compatible format string.
+
+# hw/input/ps2.c
+ps2_put_keycode(void *opaque, int keycode) "%p keycode %d"
+ps2_read_data(void *opaque) "%p"
+ps2_set_ledstate(void *s, int ledstate) "%p ledstate %d"
+ps2_reset_keyboard(void *s) "%p"
+ps2_write_keyboard(void *opaque, int val) "%p val %d"
+ps2_keyboard_set_translation(void *opaque, int mode) "%p mode %d"
+ps2_mouse_send_packet(void *s, int dx1, int dy1, int dz1, int b) "%p x %d y %d
z %d bs %#x"
+ps2_mouse_event_disabled(void *opaque, int dx, int dy, int dz, int
buttons_state, int mouse_dx, int mouse_dy, int mouse_dz) "%p x %d y %d z %d bs
%#x mx %d my %d mz %d "
+ps2_mouse_event(void *opaque, int dx, int dy, int dz, int buttons_state, int
mouse_dx, int mouse_dy, int mouse_dz) "%p x %d y %d z %d bs %#x mx %d my %d mz
%d "
+ps2_mouse_fake_event(void *opaque) "%p"
+ps2_write_mouse(void *opaque, int val) "%p val %d"
+ps2_kbd_reset(void *opaque) "%p"
+ps2_mouse_reset(void *opaque) "%p"
+ps2_kbd_init(void *s) "%p"
+ps2_mouse_init(void *s) "%p"
+
+# 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"
+milkymist_softusb_mevt(uint8_t m) "m %d"
+milkymist_softusb_kevt(uint8_t m) "m %d"
+milkymist_softusb_pulse_irq(void) "Pulse IRQ"
diff --git a/trace-events b/trace-events
index 5c1cdee..33ee352 100644
--- a/trace-events
+++ b/trace-events
@@ -42,23 +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/input/ps2.c
-ps2_put_keycode(void *opaque, int keycode) "%p keycode %d"
-ps2_read_data(void *opaque) "%p"
-ps2_set_ledstate(void *s, int ledstate) "%p ledstate %d"
-ps2_reset_keyboard(void *s) "%p"
-ps2_write_keyboard(void *opaque, int val) "%p val %d"
-ps2_keyboard_set_translation(void *opaque, int mode) "%p mode %d"
-ps2_mouse_send_packet(void *s, int dx1, int dy1, int dz1, int b) "%p x %d y %d
z %d bs %#x"
-ps2_mouse_event_disabled(void *opaque, int dx, int dy, int dz, int
buttons_state, int mouse_dx, int mouse_dy, int mouse_dz) "%p x %d y %d z %d bs
%#x mx %d my %d mz %d "
-ps2_mouse_event(void *opaque, int dx, int dy, int dz, int buttons_state, int
mouse_dx, int mouse_dy, int mouse_dz) "%p x %d y %d z %d bs %#x mx %d my %d mz
%d "
-ps2_mouse_fake_event(void *opaque) "%p"
-ps2_write_mouse(void *opaque, int val) "%p val %d"
-ps2_kbd_reset(void *opaque) "%p"
-ps2_mouse_reset(void *opaque) "%p"
-ps2_kbd_init(void *s) "%p"
-ps2_mouse_init(void *s) "%p"
-
# 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"
@@ -146,13 +129,6 @@ lm32_timer_irq_state(int level) "irq state %d"
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/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"
-milkymist_softusb_mevt(uint8_t m) "m %d"
-milkymist_softusb_kevt(uint8_t m) "m %d"
-milkymist_softusb_pulse_irq(void) "Pulse IRQ"
-
# 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"
--
2.5.5
- [Qemu-devel] [PATCH v1 13/40] trace: split out trace events for hw/misc/ directory, (continued)
- [Qemu-devel] [PATCH v1 13/40] trace: split out trace events for hw/misc/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 09/40] trace: split out trace events for hw/intc/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 12/40] trace: split out trace events for hw/audio/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 10/40] trace: split out trace events for hw/net/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 16/40] trace: split out trace events for hw/nvram/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 19/40] trace: split out trace events for hw/timer/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 15/40] trace: split out trace events for hw/scsi/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 14/40] trace: split out trace events for hw/usb/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 20/40] trace: split out trace events for hw/dma/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 17/40] trace: split out trace events for hw/display/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 18/40] trace: split out trace events for hw/input/ directory,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v1 21/40] trace: split out trace events for hw/sparc/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 23/40] trace: split out trace events for hw/isa/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 26/40] trace: split out trace events for hw/ppc/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 22/40] trace: split out trace events for hw/sd/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 27/40] trace: split out trace events for hw/pci/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 24/40] trace: split out trace events for hw/i386/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 29/40] trace: split out trace events for hw/vfio/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 28/40] trace: split out trace events for hw/s390x/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 33/40] trace: split out trace events for ui/ directory, Daniel P. Berrange, 2016/06/09
- [Qemu-devel] [PATCH v1 30/40] trace: split out trace events for hw/acpi/ directory, Daniel P. Berrange, 2016/06/09