From nobody Mon May 12 13:17:40 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695048799; cv=none; d=zohomail.com; s=zohoarc; b=iMArbejBi+Qx2j9VpJJ6QrG5JmwwGsmoT3X5V0LtuBuugMEvjsNSPd2W4E483LCvWj7xOEs2ZKDpmFDEZK3odCnd/0er7W4247IBSY0Ao32h8OtPrScz1+487/kjZmdxi1JBZycEg/aUJ3bP8aupuvbyI7VnjxkV8y5nfTtQTZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048799; 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=A/pQwlA5/88DqjoZAaKjQ6Z2V9aa+vA72DV9LshQIek=; b=VbBo1/hITUYkSAZ/JjRBpUzXHznjUsBjs2yqJb40snJs9GiNg3Z9QKk3f7RaWJ83GMbFz4O2uEqjbT+0BfMCDPYRrUlqOCTRFQZTCGdfUNnZHcqG7sXT23MdvakI0wn+EhJWiRVsMEr9sfcjLLa0lf3BX2vVpQnVBwWfveQvjzM= 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+importer2=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 1695048799000161.16423423752508; Mon, 18 Sep 2023 07:53:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiFSV-00035f-Bg; Mon, 18 Sep 2023 10:42:43 -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 1qiFSO-00030j-Cz for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiFS2-0002aw-Qz for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:36 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-541-sRu-9fazOmqA_RMRnN4ULw-1; Mon, 18 Sep 2023 10:42:10 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 6326E3C0E440 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 2521A492C37 for ; Mon, 18 Sep 2023 14:42:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2E35C21E6886; 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=1695048132; 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=A/pQwlA5/88DqjoZAaKjQ6Z2V9aa+vA72DV9LshQIek=; b=YYQugAerQwfYzuOtBf0WnLzNY/JS70glkQeu2aAOWocSZ9R3alKV8ttVnyNAL+y5FLUKF3 gq6qMWu5Q5SGg/KMpnkUz4JgAgA4hByAKGfz0nSC/pvFrfoBYG+Zc2zXK/c5tyrTxyROXL klBEcg98S+gnKeWL0YBHzjFnNIbACI0= X-MC-Unique: sRu-9fazOmqA_RMRnN4ULw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com Subject: [PATCH 24/52] migration/rdma: Return -1 instead of negative errno code Date: Mon, 18 Sep 2023 16:41:38 +0200 Message-ID: <20230918144206.560120-25-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.10 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.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_H4=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695048800328100005 Content-Type: text/plain; charset="utf-8" Several functions return negative errno codes on failure. Callers check for specific codes exactly never. For some of the functions, callers couldn't check even if they wanted to, because the functions also return negative values that aren't errno codes, leaving readers confused on what the function actually returns. Clean up and simplify: return -1 instead of negative errno code. Signed-off-by: Markus Armbruster Reviewed-by: Li Zhijian --- migration/rdma.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index efbb3c7754..d0af258468 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -857,14 +857,14 @@ static int qemu_rdma_broken_ipv6_kernel(struct ibv_co= ntext *verbs, Error **errp) } else { error_setg_errno(errp, errno, "could not open RDMA device context"); - return -EINVAL; + return -1; } } =20 if (ibv_query_port(verbs, 1, &port_attr)) { ibv_close_device(verbs); ERROR(errp, "Could not query initial IB port"); - return -EINVAL; + return -1; } =20 if (port_attr.link_layer =3D=3D IBV_LINK_LAYER_INFINIBAND) { @@ -889,7 +889,7 @@ static int qemu_rdma_broken_ipv6_kernel(struct ibv_cont= ext *verbs, Error **errp) ERROR(errp, "You only have RoCE / iWARP devices in your sy= stems" " and your management software has specified '= [::]'" ", but IPv6 over RoCE / iWARP is not supported= in Linux."); - return -ENONET; + return -1; } } =20 @@ -905,13 +905,13 @@ static int qemu_rdma_broken_ipv6_kernel(struct ibv_co= ntext *verbs, Error **errp) /* IB ports start with 1, not 0 */ if (ibv_query_port(verbs, 1, &port_attr)) { ERROR(errp, "Could not query initial IB port"); - return -EINVAL; + return -1; } =20 if (port_attr.link_layer =3D=3D IBV_LINK_LAYER_ETHERNET) { ERROR(errp, "Linux kernel's RoCE / iWARP does not support IPv6 " "(but patches on linux-rdma in progress)"); - return -ENONET; + return -1; } =20 #endif @@ -1409,7 +1409,7 @@ static int qemu_rdma_unregister_waiting(RDMAContext *= rdma) =20 if (ret !=3D 0) { perror("unregistration chunk failed"); - return -ret; + return -1; } rdma->total_registrations--; =20 @@ -1554,7 +1554,7 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *r= dma, if (ret) { error_report("failed to get cm event while wait " "completion channel"); - return -EPIPE; + return -1; } =20 error_report("receive cm event while wait comp channel= ," @@ -1562,7 +1562,7 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *r= dma, if (cm_event->event =3D=3D RDMA_CM_EVENT_DISCONNECTED = || cm_event->event =3D=3D RDMA_CM_EVENT_DEVICE_REMOVA= L) { rdma_ack_cm_event(cm_event); - return -EPIPE; + return -1; } rdma_ack_cm_event(cm_event); } @@ -1575,18 +1575,18 @@ static int qemu_rdma_wait_comp_channel(RDMAContext = *rdma, * I don't trust errno from qemu_poll_ns */ error_report("%s: poll failed", __func__); - return -EPIPE; + return -1; } =20 if (migrate_get_current()->state =3D=3D MIGRATION_STATUS_CANCE= LLING) { /* Bail out and let the cancellation happen */ - return -EPIPE; + return -1; } } } =20 if (rdma->received_error) { - return -EPIPE; + return -1; } return -!!rdma->error_state; } @@ -1751,7 +1751,7 @@ static int qemu_rdma_post_send_control(RDMAContext *r= dma, uint8_t *buf, =20 if (ret > 0) { error_report("Failed to use post IB SEND for control"); - return -ret; + return -1; } =20 ret =3D qemu_rdma_block_for_wrid(rdma, RDMA_WRID_SEND_CONTROL, NULL); @@ -1820,15 +1820,15 @@ static int qemu_rdma_exchange_get_response(RDMACont= ext *rdma, if (head->type =3D=3D RDMA_CONTROL_ERROR) { rdma->received_error =3D true; } - return -EIO; + return -1; } if (head->len > RDMA_CONTROL_MAX_BUFFER - sizeof(*head)) { error_report("too long length: %d", head->len); - return -EINVAL; + return -1; } if (sizeof(*head) + head->len !=3D byte_len) { error_report("Malformed length: %d byte_len %d", head->len, byte_l= en); - return -EINVAL; + return -1; } =20 return 0; @@ -2092,7 +2092,7 @@ retry: (uint8_t *) &comp, NULL, NULL, NULL); =20 if (ret < 0) { - return -EIO; + return -1; } =20 stat64_add(&mig_stats.zero_pages, @@ -2127,7 +2127,7 @@ retry: &sge.lkey, NULL, chunk, chunk_start, chunk_end)) { error_report("cannot get lkey"); - return -EINVAL; + return -1; } =20 reg_result =3D (RDMARegisterResult *) @@ -2146,7 +2146,7 @@ retry: &sge.lkey, NULL, chunk, chunk_start, chunk_end)) { error_report("cannot get lkey!"); - return -EINVAL; + return -1; } } =20 @@ -2158,7 +2158,7 @@ retry: &sge.lkey, NULL, chun= k, chunk_start, chunk_en= d)) { error_report("cannot get lkey!"); - return -EINVAL; + return -1; } } =20 @@ -2200,7 +2200,7 @@ retry: =20 } else if (ret > 0) { perror("rdma migration: post rdma write failed"); - return -ret; + return -1; } =20 set_bit(chunk, block->transit_bitmap); @@ -2920,14 +2920,14 @@ static int qemu_rdma_drain_cq(QEMUFile *f, RDMACont= ext *rdma) int ret; =20 if (qemu_rdma_write_flush(f, rdma) < 0) { - return -EIO; + return -1; } =20 while (rdma->nb_sent) { ret =3D qemu_rdma_block_for_wrid(rdma, RDMA_WRID_RDMA_WRITE, NULL); if (ret < 0) { error_report("rdma migration: complete polling error!"); - return -EIO; + return -1; } } =20 --=20 2.41.0