From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
qemu-block@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 09/16] util/vfio-helpers: Convert vfio_dump_mapping to trace events
Date: Tue, 20 Oct 2020 19:24:21 +0200 [thread overview]
Message-ID: <20201020172428.2220726-10-philmd@redhat.com> (raw)
In-Reply-To: <20201020172428.2220726-1-philmd@redhat.com>
The QEMU_VFIO_DEBUG definition is only modifiable at build-time.
Trace events can be enabled at run-time. As we prefer the latter,
convert qemu_vfio_dump_mappings() to use trace events instead
of fprintf().
Reviewed-by: Fam Zheng <fam@euphon.net>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
util/vfio-helpers.c | 19 ++++---------------
util/trace-events | 1 +
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index 98a377a01a8..6a5100f4892 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -551,23 +551,12 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device, size_t *min_page_size,
return s;
}
-static void qemu_vfio_dump_mapping(IOVAMapping *m)
-{
- if (QEMU_VFIO_DEBUG) {
- printf(" vfio mapping %p %" PRIx64 " to %" PRIx64 "\n", m->host,
- (uint64_t)m->size, (uint64_t)m->iova);
- }
-}
-
static void qemu_vfio_dump_mappings(QEMUVFIOState *s)
{
- int i;
-
- if (QEMU_VFIO_DEBUG) {
- printf("vfio mappings\n");
- for (i = 0; i < s->nr_mappings; ++i) {
- qemu_vfio_dump_mapping(&s->mappings[i]);
- }
+ for (int i = 0; i < s->nr_mappings; ++i) {
+ trace_qemu_vfio_dump_mapping(s->mappings[i].host,
+ s->mappings[i].iova,
+ s->mappings[i].size);
}
}
diff --git a/util/trace-events b/util/trace-events
index c396ef4d622..3c36def9f30 100644
--- a/util/trace-events
+++ b/util/trace-events
@@ -80,6 +80,7 @@ qemu_mutex_unlock(void *mutex, const char *file, const int line) "released mutex
qemu_vfio_dma_reset_temporary(void *s) "s %p"
qemu_vfio_ram_block_added(void *s, void *p, size_t size) "s %p host %p size 0x%zx"
qemu_vfio_ram_block_removed(void *s, void *p, size_t size) "s %p host %p size 0x%zx"
+qemu_vfio_dump_mapping(void *host, uint64_t iova, size_t size) "vfio mapping %p to iova 0x%08" PRIx64 " size 0x%zx"
qemu_vfio_find_mapping(void *s, void *p) "s %p host %p"
qemu_vfio_new_mapping(void *s, void *host, size_t size, int index, uint64_t iova) "s %p host %p size 0x%zx index %d iova 0x%"PRIx64
qemu_vfio_do_mapping(void *s, void *host, uint64_t iova, size_t size) "s %p host %p <-> iova 0x%"PRIx64 " size 0x%zx"
--
2.26.2
next prev parent reply other threads:[~2020-10-20 17:35 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 17:24 [PATCH 00/16] util/vfio-helpers: Allow using multiple MSIX IRQs Philippe Mathieu-Daudé
2020-10-20 17:24 ` [PATCH 01/16] block/nvme: Correct minimum device page size Philippe Mathieu-Daudé
2020-10-22 13:52 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 02/16] util/vfio-helpers: Improve reporting unsupported IOMMU type Philippe Mathieu-Daudé
2020-10-22 13:53 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 03/16] util/vfio-helpers: Pass minimum page size to qemu_vfio_open_pci() Philippe Mathieu-Daudé
2020-10-22 14:00 ` Stefan Hajnoczi
2020-10-24 19:52 ` Philippe Mathieu-Daudé
2020-10-20 17:24 ` [PATCH 04/16] util/vfio-helpers: Report error when IOMMU page size is not supported Philippe Mathieu-Daudé
2020-10-22 15:21 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 05/16] util/vfio-helpers: Trace PCI I/O config accesses Philippe Mathieu-Daudé
2020-10-22 14:13 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 06/16] util/vfio-helpers: Trace PCI BAR region info Philippe Mathieu-Daudé
2020-10-22 14:13 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 07/16] util/vfio-helpers: Trace where BARs are mapped Philippe Mathieu-Daudé
2020-10-22 14:13 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 08/16] util/vfio-helpers: Improve DMA trace events Philippe Mathieu-Daudé
2020-10-22 14:17 ` Stefan Hajnoczi
2020-10-20 17:24 ` Philippe Mathieu-Daudé [this message]
2020-10-22 14:20 ` [PATCH 09/16] util/vfio-helpers: Convert vfio_dump_mapping to " Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 10/16] util/vfio-helpers: Let qemu_vfio_dma_map() propagate Error Philippe Mathieu-Daudé
2020-10-22 14:23 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 11/16] util/vfio-helpers: Let qemu_vfio_do_mapping() " Philippe Mathieu-Daudé
2020-10-22 14:24 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 12/16] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report() Philippe Mathieu-Daudé
2020-10-22 14:25 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 13/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_init_irqs() Philippe Mathieu-Daudé
2020-10-22 14:34 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 14/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_set_irq() Philippe Mathieu-Daudé
2020-10-22 14:47 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 15/16] block/nvme: Switch to using the MSIX API Philippe Mathieu-Daudé
2020-10-22 14:49 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 16/16] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq() Philippe Mathieu-Daudé
2020-10-22 14:50 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201020172428.2220726-10-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).