[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/42] trace: split out trace events for hw/block/ di
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 09/42] trace: split out trace events for hw/block/ directory |
Date: |
Fri, 17 Jun 2016 16:59:20 +0100 |
From: "Daniel P. Berrange" <address@hidden>
Move all trace-events for files in the hw/block/ directory to
their own file.
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
Makefile.objs | 1 +
hw/block/trace-events | 17 +++++++++++++++++
trace-events | 16 ----------------
3 files changed, 18 insertions(+), 16 deletions(-)
create mode 100644 hw/block/trace-events
diff --git a/Makefile.objs b/Makefile.objs
index 998f356..7c1da65 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -124,3 +124,4 @@ trace-events-y += crypto/trace-events
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
diff --git a/hw/block/trace-events b/hw/block/trace-events
new file mode 100644
index 0000000..31df44b
--- /dev/null
+++ b/hw/block/trace-events
@@ -0,0 +1,17 @@
+# See docs/trace-events.txt for syntax documentation.
+
+# hw/block/virtio-blk.c
+virtio_blk_req_complete(void *req, int status) "req %p status %d"
+virtio_blk_rw_complete(void *req, int ret) "req %p ret %d"
+virtio_blk_handle_write(void *req, uint64_t sector, size_t nsectors) "req %p
sector %"PRIu64" nsectors %zu"
+virtio_blk_handle_read(void *req, uint64_t sector, size_t nsectors) "req %p
sector %"PRIu64" nsectors %zu"
+virtio_blk_submit_multireq(void *mrb, int start, int num_reqs, uint64_t
offset, size_t size, bool is_write) "mrb %p start %d num_reqs %d offset
%"PRIu64" size %zu is_write %d"
+
+# hw/block/dataplane/virtio-blk.c
+virtio_blk_data_plane_start(void *s) "dataplane %p"
+virtio_blk_data_plane_stop(void *s) "dataplane %p"
+virtio_blk_data_plane_process_request(void *s, unsigned int out_num, unsigned
int in_num, unsigned int head) "dataplane %p out_num %u in_num %u head %u"
+
+# hw/block/hd-geometry.c
+hd_geometry_lchs_guess(void *blk, int cyls, int heads, int secs) "blk %p LCHS
%d %d %d"
+hd_geometry_guess(void *blk, uint32_t cyls, uint32_t heads, uint32_t secs, int
trans) "blk %p CHS %u %u %u trans %d"
diff --git a/trace-events b/trace-events
index 7f19abd..8a9c3df 100644
--- a/trace-events
+++ b/trace-events
@@ -50,18 +50,6 @@ virtio_console_flush_buf(unsigned int port, size_t len,
ssize_t ret) "port %u, i
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/block/virtio-blk.c
-virtio_blk_req_complete(void *req, int status) "req %p status %d"
-virtio_blk_rw_complete(void *req, int ret) "req %p ret %d"
-virtio_blk_handle_write(void *req, uint64_t sector, size_t nsectors) "req %p
sector %"PRIu64" nsectors %zu"
-virtio_blk_handle_read(void *req, uint64_t sector, size_t nsectors) "req %p
sector %"PRIu64" nsectors %zu"
-virtio_blk_submit_multireq(void *mrb, int start, int num_reqs, uint64_t
offset, size_t size, bool is_write) "mrb %p start %d num_reqs %d offset
%"PRIu64" size %zu is_write %d"
-
-# hw/block/dataplane/virtio-blk.c
-virtio_blk_data_plane_start(void *s) "dataplane %p"
-virtio_blk_data_plane_stop(void *s) "dataplane %p"
-virtio_blk_data_plane_process_request(void *s, unsigned int out_num, unsigned
int in_num, unsigned int head) "dataplane %p out_num %u in_num %u head %u"
-
# 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"
@@ -128,10 +116,6 @@ fw_cfg_select(void *s, uint16_t key, int ret) "%p key %d =
%d"
fw_cfg_read(void *s, uint64_t ret) "%p = %"PRIx64
fw_cfg_add_file(void *s, int index, char *name, size_t len) "%p #%d: %s (%zd
bytes)"
-# hw/block/hd-geometry.c
-hd_geometry_lchs_guess(void *blk, int cyls, int heads, int secs) "blk %p LCHS
%d %d %d"
-hd_geometry_guess(void *blk, uint32_t cyls, uint32_t heads, uint32_t secs, int
trans) "blk %p CHS %u %u %u trans %d"
-
# hw/display/jazz_led.c
jazz_led_read(uint64_t addr, uint8_t val) "read addr=0x%"PRIx64": 0x%x"
jazz_led_write(uint64_t addr, uint8_t new) "write addr=0x%"PRIx64": 0x%x"
--
2.5.5
- [Qemu-devel] [PULL 00/42] Tracing patches, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 01/42] exec: [tcg] Track which vCPU is performing translation and execution, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 02/42] trace: [all] Add "guest_mem_before" event, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 05/42] trace: split out trace events for crypto/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 04/42] trace: split out trace events for util/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 03/42] trace: add build framework for merging trace-events files, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 06/42] trace: split out trace events for io/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 07/42] trace: split out trace events for migration/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 09/42] trace: split out trace events for hw/block/ directory,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 08/42] trace: split out trace events for block/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 10/42] trace: split out trace events for hw/char/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 11/42] trace: split out trace events for hw/intc/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 12/42] trace: split out trace events for hw/net/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 13/42] trace: split out trace events for hw/virtio/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 15/42] trace: split out trace events for hw/misc/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 14/42] trace: split out trace events for hw/audio/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 16/42] trace: split out trace events for hw/usb/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 20/42] trace: split out trace events for hw/input/ directory, Stefan Hajnoczi, 2016/06/17
- [Qemu-devel] [PULL 19/42] trace: split out trace events for hw/display/ directory, Stefan Hajnoczi, 2016/06/17