[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/52] migration/rdma: Put @errp parameter last
From: |
Markus Armbruster |
Subject: |
[PATCH 09/52] migration/rdma: Put @errp parameter last |
Date: |
Mon, 18 Sep 2023 16:41:23 +0200 |
include/qapi/error.h demands:
* - Functions that use Error to report errors have an Error **errp
* parameter. It should be the last parameter, except for functions
* taking variable arguments.
qemu_rdma_connect() does not conform. Clean it up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
migration/rdma.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 4339fcc7b2..2b40bbcbb0 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -2532,7 +2532,8 @@ static int qemu_get_cm_event_timeout(RDMAContext *rdma,
}
}
-static int qemu_rdma_connect(RDMAContext *rdma, Error **errp, bool return_path)
+static int qemu_rdma_connect(RDMAContext *rdma, bool return_path,
+ Error **errp)
{
RDMACapabilities cap = {
.version = RDMA_CONTROL_VERSION_CURRENT,
@@ -4175,7 +4176,7 @@ void rdma_start_outgoing_migration(void *opaque,
}
trace_rdma_start_outgoing_migration_after_rdma_source_init();
- ret = qemu_rdma_connect(rdma, errp, false);
+ ret = qemu_rdma_connect(rdma, false, errp);
if (ret) {
goto err;
@@ -4196,7 +4197,7 @@ void rdma_start_outgoing_migration(void *opaque,
goto return_path_err;
}
- ret = qemu_rdma_connect(rdma_return_path, errp, true);
+ ret = qemu_rdma_connect(rdma_return_path, true, errp);
if (ret) {
goto return_path_err;
--
2.41.0
- Re: [PATCH 11/52] migration/rdma: Drop rdma_add_block() error handling, (continued)
[PATCH 34/52] migration/rdma: Convert qemu_rdma_exchange_recv() to Error, Markus Armbruster, 2023/09/18
[PATCH 30/52] migration/rdma: Delete inappropriate error_report() in macro ERROR(), Markus Armbruster, 2023/09/18
[PATCH 14/52] migration/rdma: Use bool for two RDMAContext flags, Markus Armbruster, 2023/09/18
[PATCH 09/52] migration/rdma: Put @errp parameter last,
Markus Armbruster <=
[PATCH 03/52] migration/rdma: Clean up rdma_delete_block()'s return type, Markus Armbruster, 2023/09/18
[PATCH 40/52] migration/rdma: Convert qemu_rdma_write() to Error, Markus Armbruster, 2023/09/18
[PATCH 28/52] migration/rdma: Check negative error values the same way everywhere, Markus Armbruster, 2023/09/18