From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: kvm@vger.kernel.org,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Eric Blake" <eblake@redhat.com>, "Fam Zheng" <fam@euphon.net>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Keith Busch" <kbusch@kernel.org>,
"Max Reitz" <mreitz@redhat.com>,
qemu-block@nongnu.org, "Kevin Wolf" <kwolf@redhat.com>,
"Coiby Xu" <Coiby.Xu@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Klaus Jensen" <its@irrelevant.dk>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Eric Auger" <eric.auger@redhat.com>
Subject: [PULL 32/33] util/vfio-helpers: Convert vfio_dump_mapping to trace events
Date: Wed, 4 Nov 2020 15:18:27 +0000 [thread overview]
Message-ID: <20201104151828.405824-33-stefanha@redhat.com> (raw)
In-Reply-To: <20201104151828.405824-1-stefanha@redhat.com>
From: Philippe Mathieu-Daudé <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>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20201103020733.2303148-7-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Eric Auger <eric.auger@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 c24a510df8..73f7bfa754 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -521,23 +521,12 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device, Error **errp)
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 08239941cb..61e0d4bcdf 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.28.0
next prev parent reply other threads:[~2020-11-04 15:22 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 15:17 [PULL 00/33] Block patches Stefan Hajnoczi
2020-11-04 15:17 ` [PULL 01/33] accel/kvm: add PIO ioeventfds only in case kvm_eventfds_allowed is true Stefan Hajnoczi
2020-11-04 15:17 ` [PULL 02/33] softmmu/memory: fix memory_region_ioeventfd_equal() Stefan Hajnoczi
2020-11-04 15:17 ` [PULL 03/33] MAINTAINERS: Cover "block/nvme.h" file Stefan Hajnoczi
2020-11-04 15:17 ` [PULL 04/33] block/nvme: Use hex format to display offset in trace events Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 05/33] block/nvme: Report warning with warn_report() Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 06/33] block/nvme: Trace controller capabilities Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 07/33] block/nvme: Trace nvme_poll_queue() per queue Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 08/33] block/nvme: Improve nvme_free_req_queue_wait() trace information Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 09/33] block/nvme: Trace queue pair creation/deletion Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 10/33] block/nvme: Move definitions before structure declarations Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 11/33] block/nvme: Use unsigned integer for queue counter/size Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 12/33] block/nvme: Make nvme_identify() return boolean indicating error Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 13/33] block/nvme: Make nvme_init_queue() " Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 14/33] block/nvme: Introduce Completion Queue definitions Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 15/33] block/nvme: Use definitions instead of magic values in add_io_queue() Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 16/33] block/nvme: Correctly initialize Admin Queue Attributes Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 17/33] block/nvme: Simplify ADMIN queue access Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 18/33] block/nvme: Simplify nvme_cmd_sync() Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 19/33] block/nvme: Set request_alignment at initialization Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 20/33] block/nvme: Correct minimum device page size Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 21/33] block/nvme: Change size and alignment of IDENTIFY response buffer Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 22/33] block/nvme: Change size and alignment of queue Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 23/33] block/nvme: Change size and alignment of prp_list_pages Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 24/33] block/nvme: Align iov's va and size on host page size Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 25/33] block/nvme: Fix use of write-only doorbells page on Aarch64 arch Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 26/33] block/nvme: Fix nvme_submit_command() on big-endian host Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 27/33] util/vfio-helpers: Improve reporting unsupported IOMMU type Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 28/33] util/vfio-helpers: Trace PCI I/O config accesses Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 29/33] util/vfio-helpers: Trace PCI BAR region info Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 30/33] util/vfio-helpers: Trace where BARs are mapped Stefan Hajnoczi
2020-11-04 15:18 ` [PULL 31/33] util/vfio-helpers: Improve DMA trace events Stefan Hajnoczi
2020-11-04 15:18 ` Stefan Hajnoczi [this message]
2020-11-04 15:18 ` [PULL 33/33] util/vfio-helpers: Assert offset is aligned to page size Stefan Hajnoczi
2020-11-04 20:59 ` [PULL 00/33] Block patches Peter Maydell
2020-11-23 12:55 ` Philippe Mathieu-Daudé
2020-11-23 14:47 ` Peter Maydell
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=20201104151828.405824-33-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=eric.auger@redhat.com \
--cc=fam@euphon.net \
--cc=its@irrelevant.dk \
--cc=kbusch@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).