[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 fixed 03/16] util: vfio-helpers: Remove Error parameter from q
From: |
David Hildenbrand |
Subject: |
[PATCH v2 fixed 03/16] util: vfio-helpers: Remove Error parameter from qemu_vfio_undo_mapping() |
Date: |
Wed, 12 Feb 2020 14:42:41 +0100 |
Everybody discards the error. Let's error_report() instead so this error
doesn't get lost.
Cc: Richard Henderson <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Cc: Marcel Apfelbaum <address@hidden>
Cc: Alex Williamson <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
util/vfio-helpers.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index d6332522c1..13dd962d95 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -540,8 +540,7 @@ static int qemu_vfio_do_mapping(QEMUVFIOState *s, void
*host, size_t size,
/**
* Undo the DMA mapping from @s with VFIO, and remove from mapping list.
*/
-static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping,
- Error **errp)
+static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping)
{
int index;
struct vfio_iommu_type1_dma_unmap unmap = {
@@ -556,7 +555,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s,
IOVAMapping *mapping,
assert(QEMU_IS_ALIGNED(mapping->size, qemu_real_host_page_size));
assert(index >= 0 && index < s->nr_mappings);
if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
- error_setg(errp, "VFIO_UNMAP_DMA failed: %d", -errno);
+ error_report("VFIO_UNMAP_DMA failed: %d", -errno);
}
memmove(mapping, &s->mappings[index + 1],
sizeof(s->mappings[0]) * (s->nr_mappings - index - 1));
@@ -621,7 +620,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t
size,
assert(qemu_vfio_verify_mappings(s));
ret = qemu_vfio_do_mapping(s, host, size, iova0);
if (ret) {
- qemu_vfio_undo_mapping(s, mapping, NULL);
+ qemu_vfio_undo_mapping(s, mapping);
goto out;
}
s->low_water_mark += size;
@@ -681,7 +680,7 @@ void qemu_vfio_dma_unmap(QEMUVFIOState *s, void *host)
if (!m) {
goto out;
}
- qemu_vfio_undo_mapping(s, m, NULL);
+ qemu_vfio_undo_mapping(s, m);
out:
qemu_mutex_unlock(&s->lock);
}
@@ -698,7 +697,7 @@ void qemu_vfio_close(QEMUVFIOState *s)
return;
}
while (s->nr_mappings) {
- qemu_vfio_undo_mapping(s, &s->mappings[s->nr_mappings - 1], NULL);
+ qemu_vfio_undo_mapping(s, &s->mappings[s->nr_mappings - 1]);
}
ram_block_notifier_remove(&s->ram_notifier);
qemu_vfio_reset(s);
--
2.24.1
- [PATCH v2 fixed 00/16] Ram blocks with resizable anonymous allocations under POSIX, David Hildenbrand, 2020/02/12
- [PATCH v2 fixed 01/16] util: vfio-helpers: Factor out and fix processing of existing ram blocks, David Hildenbrand, 2020/02/12
- [PATCH v2 fixed 02/16] util: vfio-helpers: Fix qemu_vfio_close(), David Hildenbrand, 2020/02/12
- [PATCH v2 fixed 03/16] util: vfio-helpers: Remove Error parameter from qemu_vfio_undo_mapping(),
David Hildenbrand <=
- [PATCH v2 fixed 04/16] util: vfio-helpers: Factor out removal from qemu_vfio_undo_mapping(), David Hildenbrand, 2020/02/12
- [PATCH v2 fixed 06/16] exec: Reuse qemu_ram_apply_settings() in qemu_ram_remap(), David Hildenbrand, 2020/02/12
- [PATCH v2 fixed 05/16] exec: Factor out setting ram settings (madvise ...) into qemu_ram_apply_settings(), David Hildenbrand, 2020/02/12
- [PATCH v2 fixed 07/16] exec: Drop "shared" parameter from ram_block_add(), David Hildenbrand, 2020/02/12