Hi,
On 10/27/20 2:55 PM, Philippe Mathieu-Daudé wrote:
> What we want to trace is the block driver state and the queue index.
>
> Suggested-by: Stefan Hajnoczi <stefa...@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Reviewed-by: Eric Auger <eric.au...@redhat.com>
Thanks
Eric
> ---
> block/nvme.c | 2 +-
> block/trace-events | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/block/nvme.c b/block/nvme.c
> index 8d74401ae7a..29d2541b911 100644
> --- a/block/nvme.c
> +++ b/block/nvme.c
> @@ -292,7 +292,7 @@ static NVMeRequest *nvme_get_free_req(NVMeQueuePair *q)
>
> while (q->free_req_head == -1) {
> if (qemu_in_coroutine()) {
> - trace_nvme_free_req_queue_wait(q);
> + trace_nvme_free_req_queue_wait(q->s, q->index);
> qemu_co_queue_wait(&q->free_req_queue, &q->lock);
> } else {
> qemu_mutex_unlock(&q->lock);
> diff --git a/block/trace-events b/block/trace-events
> index 86292f3312b..cc5e2b55cb5 100644
> --- a/block/trace-events
> +++ b/block/trace-events
> @@ -154,7 +154,7 @@ nvme_rw_done(void *s, int is_write, uint64_t offset,
> uint64_t bytes, int ret) "s
> nvme_dsm(void *s, uint64_t offset, uint64_t bytes) "s %p offset 0x%"PRIx64"
> bytes %"PRId64""
> nvme_dsm_done(void *s, uint64_t offset, uint64_t bytes, int ret) "s %p
> offset 0x%"PRIx64" bytes %"PRId64" ret %d"
> nvme_dma_map_flush(void *s) "s %p"
> -nvme_free_req_queue_wait(void *q) "q %p"
> +nvme_free_req_queue_wait(void *s, unsigned q_index) "s %p q #%u"
> nvme_cmd_map_qiov(void *s, void *cmd, void *req, void *qiov, int entries) "s
> %p cmd %p req %p qiov %p entries %d"
> nvme_cmd_map_qiov_pages(void *s, int i, uint64_t page) "s %p page[%d]
> 0x%"PRIx64
> nvme_cmd_map_qiov_iov(void *s, int i, void *page, int pages) "s %p iov[%d]
> %p pages %d"
>
