[Qemu-devel] [PULL 10/42] trace: split out trace events for hw/char/ directory
From: "Daniel P. Berrange" Move all trace-events for files in the hw/char/ directory to their own file. Signed-off-by: Daniel P. Berrange Message-id: 1466066426-16657-9-git-send-email-berra...@redhat.com Signed-off-by: Stefan Hajnoczi --- Makefile.objs| 1 + hw/char/trace-events | 49 + trace-events | 48 3 files changed, 50 insertions(+), 48 deletions(-) create mode 100644 hw/char/trace-events diff --git a/Makefile.objs b/Makefile.objs index 7c1da65..8c7d8a9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -125,3 +125,4 @@ trace-events-y += io/trace-events trace-events-y += migration/trace-events trace-events-y += block/trace-events trace-events-y += hw/block/trace-events +trace-events-y += hw/char/trace-events diff --git a/hw/char/trace-events b/hw/char/trace-events new file mode 100644 index 000..005fcd8 --- /dev/null +++ b/hw/char/trace-events @@ -0,0 +1,49 @@ +# See docs/trace-events.txt for syntax documentation. + +# hw/char/virtio-serial-bus.c +virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16_t value) "port %u, event %u, value %u" +virtio_serial_throttle_port(unsigned int port, bool throttle) "port %u, throttle %d" +virtio_serial_handle_control_message(uint16_t event, uint16_t value) "event %u, value %u" +virtio_serial_handle_control_message_port(unsigned int port) "port %u" + +# hw/char/virtio-console.c +virtio_console_flush_buf(unsigned int port, size_t len, ssize_t ret) "port %u, in_len %zu, out_len %zd" +virtio_console_chr_read(unsigned int port, int size) "port %u, size %d" +virtio_console_chr_event(unsigned int port, int event) "port %u, event %d" + +# hw/char/grlib_apbuart.c +grlib_apbuart_event(int event) "event:%d" +grlib_apbuart_writel_unknown(uint64_t addr, uint32_t value) "addr 0x%"PRIx64" value 0x%x" +grlib_apbuart_readl_unknown(uint64_t addr) "addr 0x%"PRIx64 + +# hw/char/lm32_juart.c +lm32_juart_get_jtx(uint32_t value) "jtx 0x%08x" +lm32_juart_set_jtx(uint32_t value) "jtx 0x%08x" +lm32_juart_get_jrx(uint32_t value) "jrx 0x%08x" +lm32_juart_set_jrx(uint32_t value) "jrx 0x%08x" + +# hw/char/lm32_uart.c +lm32_uart_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +lm32_uart_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +lm32_uart_irq_state(int level) "irq state %d" + +# hw/char/milkymist-uart.c +milkymist_uart_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x" +milkymist_uart_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x" +milkymist_uart_raise_irq(void) "Raise IRQ" +milkymist_uart_lower_irq(void) "Lower IRQ" + +# hw/char/escc.c +escc_put_queue(char channel, int b) "channel %c put: 0x%02x" +escc_get_queue(char channel, int val) "channel %c get 0x%02x" +escc_update_irq(int irq) "IRQ = %d" +escc_update_parameters(char channel, int speed, int parity, int data_bits, int stop_bits) "channel %c: speed=%d parity=%c data=%d stop=%d" +escc_mem_writeb_ctrl(char channel, uint32_t reg, uint32_t val) "Write channel %c, reg[%d] = %2.2x" +escc_mem_writeb_data(char channel, uint32_t val) "Write channel %c, ch %d" +escc_mem_readb_ctrl(char channel, uint32_t reg, uint8_t val) "Read channel %c, reg[%d] = %2.2x" +escc_mem_readb_data(char channel, uint32_t ret) "Read channel %c, ch %d" +escc_serial_receive_byte(char channel, int ch) "channel %c put ch %d" +escc_sunkbd_event_in(int ch, const char *name, int down) "QKeyCode 0x%2.2x [%s], down %d" +escc_sunkbd_event_out(int ch) "Translated keycode 0x%2.2x" +escc_kbd_command(int val) "Command %d" +escc_sunmouse_event(int dx, int dy, int buttons_state) "dx=%d dy=%d buttons=%01x" diff --git a/trace-events b/trace-events index ee73165..25fb18d 100644 --- a/trace-events +++ b/trace-events @@ -39,17 +39,6 @@ virtio_rng_guest_not_ready(void *rng) "rng %p: guest not ready" virtio_rng_pushed(void *rng, size_t len) "rng %p: %zd bytes pushed" virtio_rng_request(void *rng, size_t size, unsigned quota) "rng %p: %zd bytes requested, %u bytes quota left" -# hw/char/virtio-serial-bus.c -virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16_t value) "port %u, event %u, value %u" -virtio_serial_throttle_port(unsigned int port, bool throttle) "port %u, throttle %d" -virtio_serial_handle_control_message(uint16_t event, uint16_t value) "event %u, value %u" -virtio_serial_handle_control_message_port(unsigned int port) "port %u" - -# hw/char/virtio-console.c -virtio_console_flush_buf(unsigned int port, size_t len, ssize_t ret) "port %u, in_len %zu, out_len %zd" -virtio_console_chr_read(unsigned int port, int size) "port %u, size %d" -virtio_console_chr_event(unsigned int port, int event) "port %u, event %d" - # thread-pool.c thread_pool_submit(void *pool, void *req, void *opaque) "pool %p req %p opaque %p" thread_pool_complete(void *pool, void *req, void *opaque, int ret) "pool %p req %p opaque %p ret %d"
[Qemu-devel] [PULL 10/42] trace: split out trace events for hw/char/ directory
From: "Daniel P. Berrange" Move all trace-events for files in the hw/char/ directory to their own file. Signed-off-by: Daniel P. Berrange Message-id: 1466066426-16657-9-git-send-email-berra...@redhat.com Signed-off-by: Stefan Hajnoczi --- Makefile.objs| 1 + hw/char/trace-events | 49 + trace-events | 48 3 files changed, 50 insertions(+), 48 deletions(-) create mode 100644 hw/char/trace-events diff --git a/Makefile.objs b/Makefile.objs index 7c1da65..8c7d8a9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -125,3 +125,4 @@ trace-events-y += io/trace-events trace-events-y += migration/trace-events trace-events-y += block/trace-events trace-events-y += hw/block/trace-events +trace-events-y += hw/char/trace-events diff --git a/hw/char/trace-events b/hw/char/trace-events new file mode 100644 index 000..005fcd8 --- /dev/null +++ b/hw/char/trace-events @@ -0,0 +1,49 @@ +# See docs/trace-events.txt for syntax documentation. + +# hw/char/virtio-serial-bus.c +virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16_t value) "port %u, event %u, value %u" +virtio_serial_throttle_port(unsigned int port, bool throttle) "port %u, throttle %d" +virtio_serial_handle_control_message(uint16_t event, uint16_t value) "event %u, value %u" +virtio_serial_handle_control_message_port(unsigned int port) "port %u" + +# hw/char/virtio-console.c +virtio_console_flush_buf(unsigned int port, size_t len, ssize_t ret) "port %u, in_len %zu, out_len %zd" +virtio_console_chr_read(unsigned int port, int size) "port %u, size %d" +virtio_console_chr_event(unsigned int port, int event) "port %u, event %d" + +# hw/char/grlib_apbuart.c +grlib_apbuart_event(int event) "event:%d" +grlib_apbuart_writel_unknown(uint64_t addr, uint32_t value) "addr 0x%"PRIx64" value 0x%x" +grlib_apbuart_readl_unknown(uint64_t addr) "addr 0x%"PRIx64 + +# hw/char/lm32_juart.c +lm32_juart_get_jtx(uint32_t value) "jtx 0x%08x" +lm32_juart_set_jtx(uint32_t value) "jtx 0x%08x" +lm32_juart_get_jrx(uint32_t value) "jrx 0x%08x" +lm32_juart_set_jrx(uint32_t value) "jrx 0x%08x" + +# hw/char/lm32_uart.c +lm32_uart_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +lm32_uart_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" +lm32_uart_irq_state(int level) "irq state %d" + +# hw/char/milkymist-uart.c +milkymist_uart_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x" +milkymist_uart_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x" +milkymist_uart_raise_irq(void) "Raise IRQ" +milkymist_uart_lower_irq(void) "Lower IRQ" + +# hw/char/escc.c +escc_put_queue(char channel, int b) "channel %c put: 0x%02x" +escc_get_queue(char channel, int val) "channel %c get 0x%02x" +escc_update_irq(int irq) "IRQ = %d" +escc_update_parameters(char channel, int speed, int parity, int data_bits, int stop_bits) "channel %c: speed=%d parity=%c data=%d stop=%d" +escc_mem_writeb_ctrl(char channel, uint32_t reg, uint32_t val) "Write channel %c, reg[%d] = %2.2x" +escc_mem_writeb_data(char channel, uint32_t val) "Write channel %c, ch %d" +escc_mem_readb_ctrl(char channel, uint32_t reg, uint8_t val) "Read channel %c, reg[%d] = %2.2x" +escc_mem_readb_data(char channel, uint32_t ret) "Read channel %c, ch %d" +escc_serial_receive_byte(char channel, int ch) "channel %c put ch %d" +escc_sunkbd_event_in(int ch, const char *name, int down) "QKeyCode 0x%2.2x [%s], down %d" +escc_sunkbd_event_out(int ch) "Translated keycode 0x%2.2x" +escc_kbd_command(int val) "Command %d" +escc_sunmouse_event(int dx, int dy, int buttons_state) "dx=%d dy=%d buttons=%01x" diff --git a/trace-events b/trace-events index 8a9c3df..4fa15dc 100644 --- a/trace-events +++ b/trace-events @@ -39,17 +39,6 @@ virtio_rng_guest_not_ready(void *rng) "rng %p: guest not ready" virtio_rng_pushed(void *rng, size_t len) "rng %p: %zd bytes pushed" virtio_rng_request(void *rng, size_t size, unsigned quota) "rng %p: %zd bytes requested, %u bytes quota left" -# hw/char/virtio-serial-bus.c -virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16_t value) "port %u, event %u, value %u" -virtio_serial_throttle_port(unsigned int port, bool throttle) "port %u, throttle %d" -virtio_serial_handle_control_message(uint16_t event, uint16_t value) "event %u, value %u" -virtio_serial_handle_control_message_port(unsigned int port) "port %u" - -# hw/char/virtio-console.c -virtio_console_flush_buf(unsigned int port, size_t len, ssize_t ret) "port %u, in_len %zu, out_len %zd" -virtio_console_chr_read(unsigned int port, int size) "port %u, size %d" -virtio_console_chr_event(unsigned int port, int event) "port %u, event %d" - # thread-pool.c thread_pool_submit(void *pool, void *req, void *opaque) "pool %p req %p opaque %p" thread_pool_complete(void *pool, void *req, void *opaque, int ret) "pool %p req %p opaque %p ret %d"
