The following changes since commit 88afdc92b644120e0182c8567e1b1d236e471b12:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2021-09-05 15:48:42 +0100) are available in the Git repository at: https://gitlab.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 9bd2788f49c331b02372cc257b11e4c984d39708: block/nvme: Only report VFIO error on failed retry (2021-09-07 09:08:24 +0100) ---------------------------------------------------------------- Pull request Userspace NVMe driver patches. ---------------------------------------------------------------- Philippe Mathieu-Daudé (11): block/nvme: Use safer trace format string util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report() util/vfio-helpers: Replace qemu_mutex_lock() calls with QEMU_LOCK_GUARD util/vfio-helpers: Remove unreachable code in qemu_vfio_dma_map() block/nvme: Have nvme_create_queue_pair() report errors consistently util/vfio-helpers: Pass Error handle to qemu_vfio_dma_map() util/vfio-helpers: Extract qemu_vfio_water_mark_reached() util/vfio-helpers: Use error_setg in qemu_vfio_find_[fixed/temp]_iova util/vfio-helpers: Simplify qemu_vfio_dma_map() returning directly util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error block/nvme: Only report VFIO error on failed retry include/qemu/vfio-helpers.h | 2 +- block/nvme.c | 29 +++++++---- util/vfio-helpers.c | 99 ++++++++++++++++++++----------------- block/trace-events | 2 +- 4 files changed, 76 insertions(+), 56 deletions(-) -- 2.31.1
