From nobody Mon Sep 16 18:50:32 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=1695048572; cv=none; d=zohomail.com; s=zohoarc; b=JmJ9UTrvo3oLisjViOk4Y7j108rb4UgaqSuq1uvkV/2t2e8olIPlxpDycD8bxo82Q2EEczyLhKJdDe8jtHymFMzg6Ze0qrncF/K+ppXUMSL4ToKm0JNg0cp8CvLyCCXhan0UhniNZP6UUcu3JpbG2qJi7CsAtBSHiFC/0VpiZ5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048572; 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=5+za+ZGq27q3ww++zQ0Kbau7vv/Tr1MLqchzMa7lJqM=; b=nBbl5A8AtFonnskdfyQbOj4BhtvhWjzSR3cd3/qretLtyJtRvEuSFj0oyY5Y3rOTweOVeEwurLJQYqMbriY4iqwMisj/5tm71+h0j+v3+WjjshXBCs/M5pLi9Wfe75jetsAo6pUwfPLtNKv2ZNbZoASlvW2HyOUPlsZTs7EOsvg= 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 16950485721001007.9320341335693; Mon, 18 Sep 2023 07:49:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiFTM-0004Sb-Vc; Mon, 18 Sep 2023 10:43:37 -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 1qiFSQ-00032y-K3 for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:38 -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 1qiFS3-0002be-KD for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:38 -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-178-lcXtbXtHM-uEK4B68r0hNQ-1; Mon, 18 Sep 2023 10:42:10 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 41D7B29AA3BD 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 200E0492B16 for ; Mon, 18 Sep 2023 14:42:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2B53921E6885; 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=5+za+ZGq27q3ww++zQ0Kbau7vv/Tr1MLqchzMa7lJqM=; b=O/GjJeJu3mFJldEr0b5zNlGKNQntR8x2Z+0OlCfN2ec1CWITFONj6eq2kkloNdGQoT8She 2az/aFAfOhEbu2cMcrOACvb05urQwIdbUiHwU7EwPFtFS9zITnGZKrTxEqEFILzXF5X6EC q8k2+GThknTk9aXoznlqNCgA2Vi5wD8= X-MC-Unique: lcXtbXtHM-uEK4B68r0hNQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com Subject: [PATCH 23/52] migration/rdma: Clean up qemu_rdma_wait_comp_channel()'s error value Date: Mon, 18 Sep 2023 16:41:37 +0200 Message-ID: <20230918144206.560120-24-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.9 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: 1695048572822100001 Content-Type: text/plain; charset="utf-8" qemu_rdma_wait_comp_channel() returns 0 on success, and either -1 or rdma->error_state on failure. Callers actually expect a negative error value. I believe rdma->error_state can't be positive, but let's make things more obvious by simply returning -1 on any failure. Signed-off-by: Markus Armbruster --- migration/rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/rdma.c b/migration/rdma.c index 3421ae0796..efbb3c7754 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1588,7 +1588,7 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *r= dma, if (rdma->received_error) { return -EPIPE; } - return rdma->error_state; + return -!!rdma->error_state; } =20 static struct ibv_comp_channel *to_channel(RDMAContext *rdma, uint64_t wri= d) --=20 2.41.0