The queues are tied to the hardware, logging the block driver using them is irrelevant.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- 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
