[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/9] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Erro
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 8/9] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error |
Date: |
Wed, 14 Oct 2020 13:52:52 +0200 |
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().
Signed-off-by: Philippe Mathieu-Daudé <philmd@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 c03fe0b7156..2c4598d7faa 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -609,7 +609,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),
@@ -621,7 +621,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;
@@ -757,7 +757,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t
size,
goto out;
}
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) {
qemu_vfio_undo_mapping(s, mapping, NULL);
goto out;
@@ -768,7 +768,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t
size,
ret = -ENOMEM;
goto out;
}
- ret = qemu_vfio_do_mapping(s, host, size, iova0);
+ ret = qemu_vfio_do_mapping(s, host, size, iova0, errp);
if (ret) {
goto out;
}
--
2.26.2
- [PATCH 0/9] util/vfio-helpers: Improve debugging experience, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 1/9] util/vfio-helpers: Improve reporting unsupported IOMMU type, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 2/9] util/vfio-helpers: Trace PCI I/O config accesses, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 3/9] util/vfio-helpers: Trace PCI BAR region info, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 4/9] util/vfio-helpers: Trace where BARs are mapped, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 6/9] util/vfio-helpers: Convert vfio_dump_mapping to trace events, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 7/9] util/vfio-helpers: Let qemu_vfio_dma_map() propagate Error, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 8/9] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error,
Philippe Mathieu-Daudé <=
- [PATCH 9/9] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report(), Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 5/9] util/vfio-helpers: Improve DMA trace events, Philippe Mathieu-Daudé, 2020/10/14
- Re: [PATCH 0/9] util/vfio-helpers: Improve debugging experience, Fam Zheng, 2020/10/14