[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 20/52] migration/rdma: Drop dead qemu_rdma_data_init() code for !
From: |
Markus Armbruster |
Subject: |
[PATCH 20/52] migration/rdma: Drop dead qemu_rdma_data_init() code for !@host_port |
Date: |
Mon, 18 Sep 2023 16:41:34 +0200 |
qemu_rdma_data_init() neglects to set an Error when it fails because
@host_port is null. Fortunately, no caller passes null, so this is
merely a latent bug. Drop the flawed code handling null argument.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
migration/rdma.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index d3dc162363..cc59155a50 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -2716,25 +2716,22 @@ static RDMAContext *qemu_rdma_data_init(const char
*host_port, Error **errp)
RDMAContext *rdma = NULL;
InetSocketAddress *addr;
- if (host_port) {
- rdma = g_new0(RDMAContext, 1);
- rdma->current_index = -1;
- rdma->current_chunk = -1;
+ rdma = g_new0(RDMAContext, 1);
+ rdma->current_index = -1;
+ rdma->current_chunk = -1;
- addr = g_new(InetSocketAddress, 1);
- if (!inet_parse(addr, host_port, NULL)) {
- rdma->port = atoi(addr->port);
- rdma->host = g_strdup(addr->host);
- rdma->host_port = g_strdup(host_port);
- } else {
- ERROR(errp, "bad RDMA migration address '%s'", host_port);
- g_free(rdma);
- rdma = NULL;
- }
-
- qapi_free_InetSocketAddress(addr);
+ addr = g_new(InetSocketAddress, 1);
+ if (!inet_parse(addr, host_port, NULL)) {
+ rdma->port = atoi(addr->port);
+ rdma->host = g_strdup(addr->host);
+ rdma->host_port = g_strdup(host_port);
+ } else {
+ ERROR(errp, "bad RDMA migration address '%s'", host_port);
+ g_free(rdma);
+ rdma = NULL;
}
+ qapi_free_InetSocketAddress(addr);
return rdma;
}
--
2.41.0
- Re: [PATCH 01/52] migration/rdma: Clean up qemu_rdma_poll()'s return type, (continued)
- [PATCH 12/52] migration/rdma: Drop qemu_rdma_search_ram_block() error handling, Markus Armbruster, 2023/09/18
- [PATCH 02/52] migration/rdma: Clean up qemu_rdma_data_init()'s return type, Markus Armbruster, 2023/09/18
- [PATCH 27/52] migration/rdma: Drop superfluous assignments to @ret, Markus Armbruster, 2023/09/18
- [PATCH 20/52] migration/rdma: Drop dead qemu_rdma_data_init() code for !@host_port,
Markus Armbruster <=
- [PATCH 46/52] migration/rdma: Silence qemu_rdma_reg_control(), Markus Armbruster, 2023/09/18
- [PATCH 06/52] migration/rdma: Clean up two more harmless signed vs. unsigned issues, Markus Armbruster, 2023/09/18
- [PATCH 32/52] migration/rdma: Fix error handling around rdma_getaddrinfo(), Markus Armbruster, 2023/09/18
- [PATCH 11/52] migration/rdma: Drop rdma_add_block() error handling, Markus Armbruster, 2023/09/18