[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/17] block/nvme: Simplify completion trace events
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 13/17] block/nvme: Simplify completion trace events |
Date: |
Thu, 25 Jun 2020 20:48:34 +0200 |
The queues are tied to the hardware, logging the block
driver using them is irrelevant.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 6 +++---
block/trace-events | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 4d2f31a9b3..7b983ba4e1 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -323,9 +323,9 @@ static bool nvme_process_completion(BDRVNVMeState *s,
NVMeQueuePair *q)
NVMeRequest req;
NvmeCqe *c;
- trace_nvme_process_completion(s, q->index, q->inflight);
+ trace_nvme_process_completion(q->index, q->inflight);
if (q->busy || s->plugged) {
- trace_nvme_process_completion_queue_busy(s, q->index);
+ trace_nvme_process_completion_queue_busy(q->index);
return false;
}
q->busy = true;
@@ -347,7 +347,7 @@ static bool nvme_process_completion(BDRVNVMeState *s,
NVMeQueuePair *q)
continue;
}
assert(cid <= NVME_QUEUE_SIZE);
- trace_nvme_complete_command(s, q->index, cid);
+ trace_nvme_complete_command(q->index, cid);
preq = &q->reqs[cid - 1];
req = *preq;
assert(req.cid == cid);
diff --git a/block/trace-events b/block/trace-events
index f0c476110b..8c29818093 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -157,9 +157,9 @@ vxhs_get_creds(const char *cacert, const char *client_key,
const char *client_ce
nvme_kick(int queue) "queue %d"
nvme_dma_flush_queue_wait(void *s) "s %p"
nvme_error(int cmd_specific, int sq_head, int sqid, int cid, int status)
"cmd_specific %d sq_head %d sqid %d cid %d status 0x%x"
-nvme_process_completion(void *s, int index, int inflight) "s %p queue %d
inflight %d"
-nvme_process_completion_queue_busy(void *s, int index) "s %p queue %d"
-nvme_complete_command(void *s, int index, int cid) "s %p queue %d cid %d"
+nvme_process_completion(int index, int inflight) "queue %d inflight %d"
+nvme_process_completion_queue_busy(int index) "queue %d"
+nvme_complete_command(int index, int cid) "queue %d cid %d"
nvme_submit_command(void *s, int index, int cid) "s %p queue %d cid %d"
nvme_submit_command_raw(int c0, int c1, int c2, int c3, int c4, int c5, int
c6, int c7) "%02x %02x %02x %02x %02x %02x %02x %02x"
nvme_handle_event(void *s) "s %p"
--
2.21.3
- [PATCH 08/17] block/nvme: Use correct type void*, (continued)
- [PATCH 08/17] block/nvme: Use correct type void*, Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 09/17] block/nvme: Remove unused argument from nvme_free_queue_pair(), Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 10/17] block/nvme: Simplify nvme_init_queue() arguments, Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 11/17] block/nvme: Simplify nvme_create_queue_pair() arguments, Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 12/17] block/nvme: Simplify nvme_kick trace event, Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 13/17] block/nvme: Simplify completion trace events,
Philippe Mathieu-Daudé <=
- [PATCH 14/17] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE, Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 16/17] block/nvme: Check BDRVNVMeState::plugged out of nvme_kick(), Philippe Mathieu-Daudé, 2020/06/25
- [RFC PATCH 15/17] block/nvme: Use per-queue AIO context, Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 17/17] block/nvme: Check BDRVNVMeState::plugged out of nvme_process_completion, Philippe Mathieu-Daudé, 2020/06/25