mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report stringified errno in VFIO related errors

Browse Source 
In a few places we report errno formatted as a negative integer.
This is not as user friendly as it can be. Use strerror() and/or
error_setg_errno() instead.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Message-Id: <4949c3ecf1a32189b8a4b5eb4b0fd04c1122501d.1581674006.git.mprivozn@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Michal Privoznik 2020-02-14 10:55:19 +01:00 committed by Laurent Vivier
parent 4065bb25e9
commit b09d51c909
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/vfio/common.c
View File

@ -319,7 +319,7 @@ static int vfio_dma_unmap(VFIOContainer *container,
unmap.size -= 1ULL << ctz64(container->pgsizes); unmap.size -= 1ULL << ctz64(container->pgsizes);
continue; continue;
} }
error_report("VFIO_UNMAP_DMA: %d", -errno); error_report("VFIO_UNMAP_DMA failed: %s", strerror(errno));
return -errno; return -errno;
} }
@ -352,7 +352,7 @@ static int vfio_dma_map(VFIOContainer *container, hwaddr iova,
return 0; return 0;
} }
error_report("VFIO_MAP_DMA: %d", -errno); error_report("VFIO_MAP_DMA failed: %s", strerror(errno));
return -errno; return -errno;
} }

6
util/vfio-helpers.c
View File

@ -545,7 +545,7 @@ static int qemu_vfio_do_mapping(QEMUVFIOState *s, void *host, size_t size,
trace_qemu_vfio_do_mapping(s, host, size, iova); trace_qemu_vfio_do_mapping(s, host, size, iova);
if (ioctl(s->container, VFIO_IOMMU_MAP_DMA, &dma_map)) { if (ioctl(s->container, VFIO_IOMMU_MAP_DMA, &dma_map)) {
error_report("VFIO_MAP_DMA: %d", -errno); error_report("VFIO_MAP_DMA failed: %s", strerror(errno));
return -errno; return -errno;
} }
return 0; return 0;
@ -570,7 +570,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping,
assert(QEMU_IS_ALIGNED(mapping->size, qemu_real_host_page_size)); assert(QEMU_IS_ALIGNED(mapping->size, qemu_real_host_page_size));
assert(index >= 0 && index < s->nr_mappings); assert(index >= 0 && index < s->nr_mappings);
if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) { if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
error_setg(errp, "VFIO_UNMAP_DMA failed: %d", -errno); error_setg_errno(errp, errno, "VFIO_UNMAP_DMA failed");
} }
memmove(mapping, &s->mappings[index + 1], memmove(mapping, &s->mappings[index + 1],
sizeof(s->mappings[0]) * (s->nr_mappings - index - 1)); sizeof(s->mappings[0]) * (s->nr_mappings - index - 1));
@ -669,7 +669,7 @@ int qemu_vfio_dma_reset_temporary(QEMUVFIOState *s)
trace_qemu_vfio_dma_reset_temporary(s); trace_qemu_vfio_dma_reset_temporary(s);
qemu_mutex_lock(&s->lock); qemu_mutex_lock(&s->lock);
if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) { if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
error_report("VFIO_UNMAP_DMA: %d", -errno); error_report("VFIO_UNMAP_DMA failed: %s", strerror(errno));
qemu_mutex_unlock(&s->lock); qemu_mutex_unlock(&s->lock);
return -errno; return -errno;
} }