From nobody Sun Feb 8 04:17:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150028988603317.027303659115546; Mon, 17 Jul 2017 04:11:26 -0700 (PDT) Received: from localhost ([::1]:49444 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX3vv-0003wk-PF for importer@patchew.org; Mon, 17 Jul 2017 07:11:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX3uL-0002sX-Lj for qemu-devel@nongnu.org; Mon, 17 Jul 2017 07:09:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX3uK-0002ph-ST for qemu-devel@nongnu.org; Mon, 17 Jul 2017 07:09:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41660) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dX3uK-0002pH-MG for qemu-devel@nongnu.org; Mon, 17 Jul 2017 07:09:44 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BE3E2F1D62 for ; Mon, 17 Jul 2017 11:09:43 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-162.ams2.redhat.com [10.36.117.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA28C5C684; Mon, 17 Jul 2017 11:09:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BE3E2F1D62 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dgilbert@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BE3E2F1D62 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 12:09:33 +0100 Message-Id: <20170717110936.23314-4-dgilbert@redhat.com> In-Reply-To: <20170717110936.23314-1-dgilbert@redhat.com> References: <20170717110936.23314-1-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 17 Jul 2017 11:09:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 3/6] migration/rdma: fix qemu_rdma_block_for_wrid error paths X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" The two places that 'goto err_block_for_wrid' weren't setting ret and so would end up returning 0 even though we've failed. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/rdma.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 6111e10c70..59810aec2e 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1521,14 +1521,16 @@ static int qemu_rdma_block_for_wrid(RDMAContext *rd= ma, int wrid_requested, yield_until_fd_readable(rdma->comp_channel->fd); } =20 - if (ibv_get_cq_event(rdma->comp_channel, &cq, &cq_ctx)) { + ret =3D ibv_get_cq_event(rdma->comp_channel, &cq, &cq_ctx); + if (ret) { perror("ibv_get_cq_event"); goto err_block_for_wrid; } =20 num_cq_events++; =20 - if (ibv_req_notify_cq(cq, 0)) { + ret =3D -ibv_req_notify_cq(cq, 0); + if (ret) { goto err_block_for_wrid; } =20 @@ -1564,6 +1566,8 @@ err_block_for_wrid: if (num_cq_events) { ibv_ack_cq_events(cq, num_cq_events); } + + rdma->error_state =3D ret; return ret; } =20 --=20 2.13.0