[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/11] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Err
From: |
Stefan Hajnoczi |
Subject: |
[PULL 10/11] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error |
Date: |
Tue, 7 Sep 2021 09:14:02 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Pass qemu_vfio_do_mapping() an Error* argument so it can propagate
any error to callers. Replace error_report() which only report
to the monitor by the more generic error_setg_errno().
Reviewed-by: Fam Zheng <fam@euphon.net>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210902070025.197072-11-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
util/vfio-helpers.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index 66148bd381..00a80431a0 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -610,7 +610,7 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,
/* Do the DMA mapping with VFIO. */
static int qemu_vfio_do_mapping(QEMUVFIOState *s, void *host, size_t size,
- uint64_t iova)
+ uint64_t iova, Error **errp)
{
struct vfio_iommu_type1_dma_map dma_map = {
.argsz = sizeof(dma_map),
@@ -622,7 +622,7 @@ static int qemu_vfio_do_mapping(QEMUVFIOState *s, void
*host, size_t size,
trace_qemu_vfio_do_mapping(s, host, iova, size);
if (ioctl(s->container, VFIO_IOMMU_MAP_DMA, &dma_map)) {
- error_report("VFIO_MAP_DMA failed: %s", strerror(errno));
+ error_setg_errno(errp, errno, "VFIO_MAP_DMA failed");
return -errno;
}
return 0;
@@ -772,7 +772,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t
size,
mapping = qemu_vfio_add_mapping(s, host, size, index + 1, iova0);
assert(qemu_vfio_verify_mappings(s));
- ret = qemu_vfio_do_mapping(s, host, size, iova0);
+ ret = qemu_vfio_do_mapping(s, host, size, iova0, errp);
if (ret < 0) {
qemu_vfio_undo_mapping(s, mapping, NULL);
return ret;
@@ -782,7 +782,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t
size,
if (!qemu_vfio_find_temp_iova(s, size, &iova0, errp)) {
return -ENOMEM;
}
- ret = qemu_vfio_do_mapping(s, host, size, iova0);
+ ret = qemu_vfio_do_mapping(s, host, size, iova0, errp);
if (ret < 0) {
return ret;
}
--
2.31.1
- [PULL 00/11] Block patches, Stefan Hajnoczi, 2021/09/07
- [PULL 01/11] block/nvme: Use safer trace format string, Stefan Hajnoczi, 2021/09/07
- [PULL 02/11] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report(), Stefan Hajnoczi, 2021/09/07
- [PULL 03/11] util/vfio-helpers: Replace qemu_mutex_lock() calls with QEMU_LOCK_GUARD, Stefan Hajnoczi, 2021/09/07
- [PULL 04/11] util/vfio-helpers: Remove unreachable code in qemu_vfio_dma_map(), Stefan Hajnoczi, 2021/09/07
- [PULL 05/11] block/nvme: Have nvme_create_queue_pair() report errors consistently, Stefan Hajnoczi, 2021/09/07
- [PULL 06/11] util/vfio-helpers: Pass Error handle to qemu_vfio_dma_map(), Stefan Hajnoczi, 2021/09/07
- [PULL 07/11] util/vfio-helpers: Extract qemu_vfio_water_mark_reached(), Stefan Hajnoczi, 2021/09/07
- [PULL 08/11] util/vfio-helpers: Use error_setg in qemu_vfio_find_[fixed/temp]_iova, Stefan Hajnoczi, 2021/09/07
- [PULL 09/11] util/vfio-helpers: Simplify qemu_vfio_dma_map() returning directly, Stefan Hajnoczi, 2021/09/07
- [PULL 10/11] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error,
Stefan Hajnoczi <=
- [PULL 11/11] block/nvme: Only report VFIO error on failed retry, Stefan Hajnoczi, 2021/09/07
- Re: [PULL 00/11] Block patches, Peter Maydell, 2021/09/07