[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/11] util/vfio-helpers: Simplify qemu_vfio_dma_map() returning d
From: |
Stefan Hajnoczi |
Subject: |
[PULL 09/11] util/vfio-helpers: Simplify qemu_vfio_dma_map() returning directly |
Date: |
Tue, 7 Sep 2021 09:14:01 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
To simplify qemu_vfio_dma_map():
- reduce 'ret' (returned value) scope by returning errno directly,
- remove the goto 'out' label.
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210902070025.197072-10-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
util/vfio-helpers.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index b93a3d3578..66148bd381 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -748,7 +748,6 @@ static bool qemu_vfio_water_mark_reached(QEMUVFIOState *s,
size_t size,
int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,
bool temporary, uint64_t *iova, Error **errp)
{
- int ret = 0;
int index;
IOVAMapping *mapping;
uint64_t iova0;
@@ -761,32 +760,31 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host,
size_t size,
if (mapping) {
iova0 = mapping->iova + ((uint8_t *)host - (uint8_t *)mapping->host);
} else {
+ int ret;
+
if (qemu_vfio_water_mark_reached(s, size, errp)) {
- ret = -ENOMEM;
- goto out;
+ return -ENOMEM;
}
if (!temporary) {
if (!qemu_vfio_find_fixed_iova(s, size, &iova0, errp)) {
- ret = -ENOMEM;
- goto out;
+ return -ENOMEM;
}
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);
- if (ret) {
+ if (ret < 0) {
qemu_vfio_undo_mapping(s, mapping, NULL);
- goto out;
+ return ret;
}
qemu_vfio_dump_mappings(s);
} else {
if (!qemu_vfio_find_temp_iova(s, size, &iova0, errp)) {
- ret = -ENOMEM;
- goto out;
+ return -ENOMEM;
}
ret = qemu_vfio_do_mapping(s, host, size, iova0);
- if (ret) {
- goto out;
+ if (ret < 0) {
+ return ret;
}
}
}
@@ -794,8 +792,7 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t
size,
if (iova) {
*iova = iova0;
}
-out:
- return ret;
+ return 0;
}
/* Reset the high watermark and free all "temporary" mappings. */
--
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 04/11] util/vfio-helpers: Remove unreachable code in qemu_vfio_dma_map(), 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 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 09/11] util/vfio-helpers: Simplify qemu_vfio_dma_map() returning directly,
Stefan Hajnoczi <=
- [PULL 03/11] util/vfio-helpers: Replace qemu_mutex_lock() calls with QEMU_LOCK_GUARD, 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 10/11] util/vfio-helpers: Let qemu_vfio_do_mapping() propagate Error, Stefan Hajnoczi, 2021/09/07
- [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