From nobody Mon Sep 16 18:55:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695048213; cv=none; d=zohomail.com; s=zohoarc; b=JGcj2NjvpasOsDliojMj1eguJYLIqgn/Cd4nPRdamJOGb4hlb8oFUXjuYhdX69fP9oHDRdsVwdpTa8CuGRbPdhTcQ8BHOPPUFPcpHMyuwTsuf1UzRgnriAVkp5p7qoPEWub52P0168ol9hVIGtbv1asUBLaIAf4SrN34/5Ls0y4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048213; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mfbNMHp4BPlTVbRuD5c1c/wdQ195dV1K9Pq5WQMIfIc=; b=RrMAotWy8kDqr6WSjruALxLEEnKVAwxULwvI7PRjBIWJXnYe52J4+Tty02TYU6uognh41aK5NYO1rQV29iYLwDdIkswWHgAwSD5dEYFKh+jwzGkpOndVS2gmsBGK3obq3Fjb0aUKmgDBKA8qMyyx+tkvcW2yNEjsSRXK+h+ZAiM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695048213935882.0288945576195; Mon, 18 Sep 2023 07:43:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiFSW-00036b-U8; Mon, 18 Sep 2023 10:42:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiFSG-0002vl-3c for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiFS2-0002cC-J9 for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:27 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-64-pjDR_SLWNbuHOrq3ZXzIiA-1; Mon, 18 Sep 2023 10:42:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B27D5101B044 for ; Mon, 18 Sep 2023 14:42:10 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.127]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5893D1CBC0 for ; Mon, 18 Sep 2023 14:42:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 48B3321E6895; Mon, 18 Sep 2023 16:42:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695048133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mfbNMHp4BPlTVbRuD5c1c/wdQ195dV1K9Pq5WQMIfIc=; b=cph5lG16ujFagkeN0oRe4kWNM1iExuRPvB7ahT4kkShRbtQaUI8N2uLhMW/W50KVPTjN+x 5ngx+gm3lWV4KbLTHY+6qCFfH6B6Sb53oazcveTBuAh2iDS3AtzrN3BpoaDivJsnF7fIGx QDuOviHP306X0As8W7bCxeaaAajfT/0= X-MC-Unique: pjDR_SLWNbuHOrq3ZXzIiA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com Subject: [PATCH 33/52] migration/rdma: Drop "@errp is clear" guards around error_setg() Date: Mon, 18 Sep 2023 16:41:47 +0200 Message-ID: <20230918144206.560120-34-armbru@redhat.com> In-Reply-To: <20230918144206.560120-1-armbru@redhat.com> References: <20230918144206.560120-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695048214646100009 Content-Type: text/plain; charset="utf-8" These guards are all redundant now. Signed-off-by: Markus Armbruster Reviewed-by: Li Zhijian --- migration/rdma.c | 164 +++++++++++++++-------------------------------- 1 file changed, 51 insertions(+), 113 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index d29affe410..c88cd1f468 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -852,10 +852,8 @@ static int qemu_rdma_broken_ipv6_kernel(struct ibv_con= text *verbs, Error **errp) =20 if (ibv_query_port(verbs, 1, &port_attr)) { ibv_close_device(verbs); - if (errp && !*errp) { - error_setg(errp, - "RDMA ERROR: Could not query initial IB por= t"); - } + error_setg(errp, + "RDMA ERROR: Could not query initial IB port"); return -1; } =20 @@ -878,12 +876,10 @@ static int qemu_rdma_broken_ipv6_kernel(struct ibv_co= ntext *verbs, Error **errp) " migrate over the IB fabric until the ker= nel " " fixes the bug.\n"); } else { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: " - "You only have RoCE / iWARP devices in your= systems" - " and your management software has specifie= d '[::]'" - ", but IPv6 over RoCE / iWARP is not suppor= ted in Linux."); - } + error_setg(errp, "RDMA ERROR: " + "You only have RoCE / iWARP devices in your sys= tems" + " and your management software has specified '[= ::]'" + ", but IPv6 over RoCE / iWARP is not supported = in Linux."); return -1; } } @@ -899,18 +895,14 @@ static int qemu_rdma_broken_ipv6_kernel(struct ibv_co= ntext *verbs, Error **errp) =20 /* IB ports start with 1, not 0 */ if (ibv_query_port(verbs, 1, &port_attr)) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: Could not query initial IB port"= ); - } + error_setg(errp, "RDMA ERROR: Could not query initial IB port"); return -1; } =20 if (port_attr.link_layer =3D=3D IBV_LINK_LAYER_ETHERNET) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: " - "Linux kernel's RoCE / iWARP does not support IPv6 " - "(but patches on linux-rdma in progress)"); - } + error_setg(errp, "RDMA ERROR: " + "Linux kernel's RoCE / iWARP does not support IPv6 " + "(but patches on linux-rdma in progress)"); return -1; } =20 @@ -935,27 +927,21 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, = Error **errp) struct rdma_addrinfo *e; =20 if (rdma->host =3D=3D NULL || !strcmp(rdma->host, "")) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: RDMA hostname has not been set"); - } + error_setg(errp, "RDMA ERROR: RDMA hostname has not been set"); return -1; } =20 /* create CM channel */ rdma->channel =3D rdma_create_event_channel(); if (!rdma->channel) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: could not create CM channel"); - } + error_setg(errp, "RDMA ERROR: could not create CM channel"); return -1; } =20 /* create CM id */ ret =3D rdma_create_id(rdma->channel, &rdma->cm_id, NULL, RDMA_PS_TCP); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: could not create channel id"); - } + error_setg(errp, "RDMA ERROR: could not create channel id"); goto err_resolve_create_id; } =20 @@ -964,10 +950,8 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, E= rror **errp) =20 ret =3D rdma_getaddrinfo(rdma->host, port_str, NULL, &res); if (ret) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: could not rdma_getaddrinfo addre= ss %s", - rdma->host); - } + error_setg(errp, "RDMA ERROR: could not rdma_getaddrinfo address %= s", + rdma->host); goto err_resolve_get_addr; } =20 @@ -1009,18 +993,14 @@ route: =20 ret =3D rdma_get_cm_event(rdma->channel, &cm_event); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: could not perform event_addr_res= olved"); - } + error_setg(errp, "RDMA ERROR: could not perform event_addr_resolve= d"); goto err_resolve_get_addr; } =20 if (cm_event->event !=3D RDMA_CM_EVENT_ADDR_RESOLVED) { - if (errp && !*errp) { - error_setg(errp, - "RDMA ERROR: result not equal to event_addr_resolve= d %s", - rdma_event_str(cm_event->event)); - } + error_setg(errp, + "RDMA ERROR: result not equal to event_addr_resolved %s= ", + rdma_event_str(cm_event->event)); error_report("rdma_resolve_addr"); rdma_ack_cm_event(cm_event); goto err_resolve_get_addr; @@ -1030,25 +1010,19 @@ route: /* resolve route */ ret =3D rdma_resolve_route(rdma->cm_id, RDMA_RESOLVE_TIMEOUT_MS); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: could not resolve rdma route"); - } + error_setg(errp, "RDMA ERROR: could not resolve rdma route"); goto err_resolve_get_addr; } =20 ret =3D rdma_get_cm_event(rdma->channel, &cm_event); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: could not perform event_route_re= solved"); - } + error_setg(errp, "RDMA ERROR: could not perform event_route_resolv= ed"); goto err_resolve_get_addr; } if (cm_event->event !=3D RDMA_CM_EVENT_ROUTE_RESOLVED) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: " - "result not equal to event_route_resolved: %s", - rdma_event_str(cm_event->event)); - } + error_setg(errp, "RDMA ERROR: " + "result not equal to event_route_resolved: %s", + rdma_event_str(cm_event->event)); rdma_ack_cm_event(cm_event); goto err_resolve_get_addr; } @@ -2479,20 +2453,16 @@ static int qemu_rdma_source_init(RDMAContext *rdma,= bool pin_all, Error **errp) =20 ret =3D qemu_rdma_alloc_pd_cq(rdma); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: " - "rdma migration: error allocating pd and cq! Your m= lock()" - " limits may be too low. Please check $ ulimit -a #= and " - "search for 'ulimit -l' in the output"); - } + error_setg(errp, "RDMA ERROR: " + "rdma migration: error allocating pd and cq! Your mlock= ()" + " limits may be too low. Please check $ ulimit -a # and= " + "search for 'ulimit -l' in the output"); goto err_rdma_source_init; } =20 ret =3D qemu_rdma_alloc_qp(rdma); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: rdma migration: error allocating= qp!"); - } + error_setg(errp, "RDMA ERROR: rdma migration: error allocating qp!= "); goto err_rdma_source_init; } =20 @@ -2509,11 +2479,9 @@ static int qemu_rdma_source_init(RDMAContext *rdma, = bool pin_all, Error **errp) for (idx =3D 0; idx < RDMA_WRID_MAX; idx++) { ret =3D qemu_rdma_reg_control(rdma, idx); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, - "RDMA ERROR: rdma migration: error registering = %d control!", - idx); - } + error_setg(errp, + "RDMA ERROR: rdma migration: error registering %d c= ontrol!", + idx); goto err_rdma_source_init; } } @@ -2541,29 +2509,21 @@ static int qemu_get_cm_event_timeout(RDMAContext *r= dma, } while (ret < 0 && errno =3D=3D EINTR); =20 if (ret =3D=3D 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: poll cm event timeout"); - } + error_setg(errp, "RDMA ERROR: poll cm event timeout"); return -1; } else if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: failed to poll cm event, errno= =3D%i", - errno); - } + error_setg(errp, "RDMA ERROR: failed to poll cm event, errno=3D%i", + errno); return -1; } else if (poll_fd.revents & POLLIN) { if (rdma_get_cm_event(rdma->channel, cm_event) < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: failed to get cm event"); - } + error_setg(errp, "RDMA ERROR: failed to get cm event"); return -1; } return 0; } else { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: no POLLIN event, revent=3D%x", - poll_fd.revents); - } + error_setg(errp, "RDMA ERROR: no POLLIN event, revent=3D%x", + poll_fd.revents); return -1; } } @@ -2596,18 +2556,14 @@ static int qemu_rdma_connect(RDMAContext *rdma, boo= l return_path, =20 ret =3D qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: posting second control recv"); - } + error_setg(errp, "RDMA ERROR: posting second control recv"); goto err_rdma_source_connect; } =20 ret =3D rdma_connect(rdma->cm_id, &conn_param); if (ret < 0) { perror("rdma_connect"); - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: connecting to destination!"); - } + error_setg(errp, "RDMA ERROR: connecting to destination!"); goto err_rdma_source_connect; } =20 @@ -2616,9 +2572,7 @@ static int qemu_rdma_connect(RDMAContext *rdma, bool = return_path, } else { ret =3D rdma_get_cm_event(rdma->channel, &cm_event); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: failed to get cm event"); - } + error_setg(errp, "RDMA ERROR: failed to get cm event"); } } if (ret < 0) { @@ -2628,9 +2582,7 @@ static int qemu_rdma_connect(RDMAContext *rdma, bool = return_path, =20 if (cm_event->event !=3D RDMA_CM_EVENT_ESTABLISHED) { error_report("rdma_get_cm_event !=3D EVENT_ESTABLISHED after rdma_= connect"); - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: connecting to destination!"); - } + error_setg(errp, "RDMA ERROR: connecting to destination!"); rdma_ack_cm_event(cm_event); goto err_rdma_source_connect; } @@ -2678,18 +2630,14 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, E= rror **errp) } =20 if (!rdma->host || !rdma->host[0]) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: RDMA host is not set!"); - } + error_setg(errp, "RDMA ERROR: RDMA host is not set!"); rdma->errored =3D true; return -1; } /* create CM channel */ rdma->channel =3D rdma_create_event_channel(); if (!rdma->channel) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: could not create rdma event chan= nel"); - } + error_setg(errp, "RDMA ERROR: could not create rdma event channel"= ); rdma->errored =3D true; return -1; } @@ -2697,9 +2645,7 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Err= or **errp) /* create CM id */ ret =3D rdma_create_id(rdma->channel, &listen_id, NULL, RDMA_PS_TCP); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: could not create cm_id!"); - } + error_setg(errp, "RDMA ERROR: could not create cm_id!"); goto err_dest_init_create_listen_id; } =20 @@ -2708,19 +2654,15 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, E= rror **errp) =20 ret =3D rdma_getaddrinfo(rdma->host, port_str, NULL, &res); if (ret) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: could not rdma_getaddrinfo addre= ss %s", - rdma->host); - } + error_setg(errp, "RDMA ERROR: could not rdma_getaddrinfo address %= s", + rdma->host); goto err_dest_init_bind_addr; } =20 ret =3D rdma_set_option(listen_id, RDMA_OPTION_ID, RDMA_OPTION_ID_REUS= EADDR, &reuse, sizeof reuse); if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: Error: could not set REUSEADDR o= ption"); - } + error_setg(errp, "RDMA ERROR: Error: could not set REUSEADDR optio= n"); goto err_dest_init_bind_addr; } =20 @@ -2804,10 +2746,8 @@ static RDMAContext *qemu_rdma_data_init(const char *= host_port, Error **errp) rdma->host =3D g_strdup(addr->host); rdma->host_port =3D g_strdup(host_port); } else { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: bad RDMA migration address '%s'", - host_port); - } + error_setg(errp, "RDMA ERROR: bad RDMA migration address '%s'", + host_port); g_free(rdma); rdma =3D NULL; } @@ -4193,9 +4133,7 @@ void rdma_start_incoming_migration(const char *host_p= ort, Error **errp) ret =3D rdma_listen(rdma->listen_id, 5); =20 if (ret < 0) { - if (errp && !*errp) { - error_setg(errp, "RDMA ERROR: listening on socket!"); - } + error_setg(errp, "RDMA ERROR: listening on socket!"); goto cleanup_rdma; } =20 --=20 2.41.0