[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/16] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Er
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 11/16] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error |
Date: |
Tue, 20 Oct 2020 19:24:23 +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().
Reviewed-by: Fam Zheng <fam@euphon.net>
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 8c075d9aae7..fb180becc4f 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -639,7 +639,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),
@@ -651,7 +651,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;
@@ -787,7 +787,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;
@@ -798,7 +798,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 06/16] util/vfio-helpers: Trace PCI BAR region info, (continued)
- [PATCH 06/16] util/vfio-helpers: Trace PCI BAR region info, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 07/16] util/vfio-helpers: Trace where BARs are mapped, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 08/16] util/vfio-helpers: Improve DMA trace events, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 09/16] util/vfio-helpers: Convert vfio_dump_mapping to trace events, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 10/16] util/vfio-helpers: Let qemu_vfio_dma_map() propagate Error, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 11/16] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error,
Philippe Mathieu-Daudé <=
- [PATCH 12/16] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report(), Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 13/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_init_irqs(), Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 15/16] block/nvme: Switch to using the MSIX API, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 14/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_set_irq(), Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 16/16] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq(), Philippe Mathieu-Daudé, 2020/10/20