From nobody Tue Feb 10 11:55:42 2026 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=1697016537; cv=none; d=zohomail.com; s=zohoarc; b=aUScoE5+i26MDuMfnBossyy9ohLuhPItjFiBFy+UEoZ3HSY13JaVkwUcNMiPDANm/2B/fAZBM5pHtqtWuqwK3iA1UWwLG4HledPRr1BANhvI4WcLasNWWc5IZpwM8F8J4xabX8xOU9hbOv4j/8L6/RxmdbRvU+A0RpIHEJt6VEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697016537; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6MFEnGCFzXsKXFim89lb3xJaqgvpA2Gccn5I75fVenw=; b=MhEW1FpLFdjeN35Ln6loNOEpthv2w4GeoBt0XfOhmjshJ/UDiRHyZVekGvJqapHrCpAwnK4SiomZc75ckAbPVgx4WJNBCCQNoPkr4Ddd7sYw2uBX4PGacmqatnzYU6PFfRKGCeYebcICKZLNn2AeI9UFj8G0/fAfgVmNwK/96oo= 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 1697016537313741.9669092436297; Wed, 11 Oct 2023 02:28:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqVRC-0000EA-5f; Wed, 11 Oct 2023 05:23:30 -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 1qqVR7-000893-KZ for qemu-devel@nongnu.org; Wed, 11 Oct 2023 05:23:25 -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 1qqVR5-00052Q-Jp for qemu-devel@nongnu.org; Wed, 11 Oct 2023 05:23:25 -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-264-iHvdKv-hPpCpXzhTP8UgVg-1; Wed, 11 Oct 2023 05:23:11 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 3B6CA1C02163; Wed, 11 Oct 2023 09:23:11 +0000 (UTC) Received: from secure.mitica (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E0781C060B0; Wed, 11 Oct 2023 09:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697016203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6MFEnGCFzXsKXFim89lb3xJaqgvpA2Gccn5I75fVenw=; b=a7eim1O1ucKrgJMmdGgkoZwmuvLCW7MK9WNt+VSY5pT89Ur9jqUZdQtvlo8Nn5NCZtROQk CdPS8GZ2AIdovBIJTev+v1Czd56bxTbwp/ZiPHQhnWNBBx7oX6TfxNSa6KGqFNkB/CyEn3 F5GXIUWxTqSQc/kUOlW93TsotyCW79Y= X-MC-Unique: iHvdKv-hPpCpXzhTP8UgVg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Laurent Vivier , Peter Xu , Paolo Bonzini , Markus Armbruster , Juan Quintela , Thomas Huth , Li Zhijian , Leonardo Bras , Eric Blake , Fabiano Rosas Subject: [PULL 32/65] migration/rdma: Return -1 instead of negative errno code Date: Wed, 11 Oct 2023 11:21:30 +0200 Message-ID: <20231011092203.1266-33-quintela@redhat.com> In-Reply-To: <20231011092203.1266-1-quintela@redhat.com> References: <20231011092203.1266-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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=quintela@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: 1697016539465100006 Content-Type: text/plain; charset="utf-8" From: Markus Armbruster 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 Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela Message-ID: <20230928132019.2544702-26-armbru@redhat.com> --- migration/rdma.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index dd0b073792..bc39b7ab2e 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -863,14 +863,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) { @@ -895,7 +895,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 @@ -911,13 +911,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 @@ -1425,7 +1425,7 @@ static int qemu_rdma_unregister_waiting(RDMAContext *= rdma) * this series. */ perror("unregistration chunk failed"); - return -ret; + return -1; } rdma->total_registrations--; =20 @@ -1570,7 +1570,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= ," @@ -1578,7 +1578,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); } @@ -1591,18 +1591,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; } @@ -1772,7 +1772,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); @@ -1841,15 +1841,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; @@ -2115,7 +2115,7 @@ retry: (uint8_t *) &comp, NULL, NULL, NULL); =20 if (ret < 0) { - return -EIO; + return -1; } =20 /* @@ -2159,7 +2159,7 @@ retry: &sge.lkey, NULL, chunk, chunk_start, chunk_end)) { error_report("cannot get lkey"); - return -EINVAL; + return -1; } =20 reg_result =3D (RDMARegisterResult *) @@ -2178,7 +2178,7 @@ retry: &sge.lkey, NULL, chunk, chunk_start, chunk_end)) { error_report("cannot get lkey!"); - return -EINVAL; + return -1; } } =20 @@ -2190,7 +2190,7 @@ retry: &sge.lkey, NULL, chun= k, chunk_start, chunk_en= d)) { error_report("cannot get lkey!"); - return -EINVAL; + return -1; } } =20 @@ -2237,7 +2237,7 @@ retry: * in this series. */ perror("rdma migration: post rdma write failed"); - return -ret; + return -1; } =20 set_bit(chunk, block->transit_bitmap); @@ -2969,14 +2969,14 @@ static int qemu_rdma_drain_cq(RDMAContext *rdma) int ret; =20 if (qemu_rdma_write_flush(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