On 4/15/20 12:24 PM, Klaus Jensen wrote:
From: Klaus Jensen <k.jen...@samsung.com>
Change the prefix of all nvme device related trace events to 'nvme_dev'
Another option is 'pci_nvme'. None of them make me happy but I can't
find a better name.
to not clash with trace events from the nvme block driver.
Signed-off-by: Klaus Jensen <k.jen...@samsung.com>
Acked-by: Keith Busch <kbu...@kernel.org>
Reviewed-by: Maxim Levitsky <mlevi...@redhat.com>
---
hw/block/nvme.c | 190 +++++++++++++++++++++---------------------
hw/block/trace-events | 172 +++++++++++++++++++-------------------
2 files changed, 180 insertions(+), 182 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 77f9c151a665..316cfc4d36e0 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -112,16 +112,16 @@ static void nvme_irq_assert(NvmeCtrl *n, NvmeCQueue *cq)
{
if (cq->irq_enabled) {
if (msix_enabled(&(n->parent_obj))) {
- trace_nvme_irq_msix(cq->vector);
+ trace_nvme_dev_irq_msix(cq->vector);
msix_notify(&(n->parent_obj), cq->vector);
} else {
- trace_nvme_irq_pin();
+ trace_nvme_dev_irq_pin();
assert(cq->cqid < 64);
n->irq_status |= 1 << cq->cqid;
nvme_irq_check(n);
}
} else {
- trace_nvme_irq_masked();
+ trace_nvme_dev_irq_masked();
}
}
[...]
