diff options
| author | Richard Henderson | 2022-04-26 16:54:22 +0200 |
|---|---|---|
| committer | Richard Henderson | 2022-04-26 16:54:22 +0200 |
| commit | 80a172de5592b5c33aa6bc30da6f16c4ad1ae390 (patch) | |
| tree | 451a54f38e808e462e696b69fc1c2f3d9a93c464 /hw/virtio | |
| parent | Merge tag 'pull-block-2022-04-25' of https://gitlab.com/hreitz/qemu into staging (diff) | |
| parent | docs: Replace HomeBrew -> Homebrew (diff) | |
| download | qemu-80a172de5592b5c33aa6bc30da6f16c4ad1ae390.tar.gz qemu-80a172de5592b5c33aa6bc30da6f16c4ad1ae390.tar.xz qemu-80a172de5592b5c33aa6bc30da6f16c4ad1ae390.zip | |
Merge tag 'trivial-branch-for-7.1-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging
Pull request trivial patches 20220426
# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmJn6XkSHGxhdXJlbnRA
# dml2aWVyLmV1AAoJEPMMOL0/L748TVwP/0zbxhynu1Eff4jsSHEMmk7UCkNvFNs+
# htebWHrLViUhHnRzJZJl2GNnw7X4p3A+IqnzBDqDBN3ikfnjbu+D33Sze25vVkpD
# OVAJAhP7SA4jO2IdKrGgXoP7vGWrE4YGMnvhaJjEmGiKrm79oFSwIM6Cay/3IApm
# 87ngcRQyb4lr66wJP+i6sr6jCU0Hq8nbmdeKYKNDAYKGqaDmuipbh+8Dt+FXzFWZ
# N2l4CjtypQjF3U3s6FmL/8OWBJCQRLZkaNMH2Zv2ne9iWa1wBy4wuQ4qiFGz6b5L
# g1uBHRIDsMhAggYc97mqJesz5gbAYwSVJ1abe7ZmZSzOCXMFsdXbRpPIh4ZSIjCW
# OOwT+WkP5Yrlwyf1+K4YYx2CCsw713p0b8c9xlvP5xjF8gANfZeC1lH05ZHt3yoS
# W+q2jHhPszigY0xjhM1xa6B21a+ZWhvfa3uZnDoGXOY3Xri/Itv9h0GVGxA/ccTs
# rDtV1lK7oqWErxN6G6/rnAMo2vgJZ+CRwqubgE/vPhkOcDDtmwlDRNbqGfhGYPpx
# n4Ytu5ygxv1+6DbkPx4RCVJ725fybGMUPlBi1iL9l7DYg5QiKlHXUQxkeJ8YllOf
# unGAsfOhFZhJ7gMZlfQERQRZQGJjvTopl+zf49/HDT+NiRlxGAE4lTmHXG6vA7kX
# po+0LJ+pbrX+
# =NHM0
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 26 Apr 2022 05:45:45 AM PDT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [undefined]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [undefined]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* tag 'trivial-branch-for-7.1-pull-request' of https://gitlab.com/laurent_vivier/qemu:
docs: Replace HomeBrew -> Homebrew
docs: Replace Qemu -> QEMU
target/mips: Remove stale TODO file
vdpa: Add missing tracing to batch mapping functions
hw/pvrdma: Some cosmetic fixes
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/virtio')
| -rw-r--r-- | hw/virtio/trace-events | 2 | ||||
| -rw-r--r-- | hw/virtio/vhost-vdpa.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index a5102eac9e..333348d9d5 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -25,6 +25,8 @@ vhost_user_postcopy_waker_nomatch(const char *rb, uint64_t rb_offset) "%s + 0x%" # vhost-vdpa.c vhost_vdpa_dma_map(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, uint64_t size, uint64_t uaddr, uint8_t perm, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" uaddr: 0x%"PRIx64" perm: 0x%"PRIx8" type: %"PRIu8 vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, uint64_t size, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8 +vhost_vdpa_listener_begin_batch(void *v, int fd, uint32_t msg_type, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 +vhost_vdpa_listener_commit(void *v, int fd, uint32_t msg_type, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 vhost_vdpa_listener_region_add(void *vdpa, uint64_t iova, uint64_t llend, void *vaddr, bool readonly) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64" vaddr: %p read-only: %d" vhost_vdpa_listener_region_del(void *vdpa, uint64_t iova, uint64_t llend) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64 vhost_vdpa_add_status(void *dev, uint8_t status) "dev: %p status: 0x%"PRIx8 diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index b57be529c7..a30510ed17 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -129,6 +129,7 @@ static void vhost_vdpa_listener_begin_batch(struct vhost_vdpa *v) .iotlb.type = VHOST_IOTLB_BATCH_BEGIN, }; + trace_vhost_vdpa_listener_begin_batch(v, fd, msg.type, msg.iotlb.type); if (write(fd, &msg, sizeof(msg)) != sizeof(msg)) { error_report("failed to write, fd=%d, errno=%d (%s)", fd, errno, strerror(errno)); @@ -163,6 +164,7 @@ static void vhost_vdpa_listener_commit(MemoryListener *listener) msg.type = v->msg_type; msg.iotlb.type = VHOST_IOTLB_BATCH_END; + trace_vhost_vdpa_listener_commit(v, fd, msg.type, msg.iotlb.type); if (write(fd, &msg, sizeof(msg)) != sizeof(msg)) { error_report("failed to write, fd=%d, errno=%d (%s)", fd, errno, strerror(errno)); |