From nobody Fri Apr 19 16:26:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1565554902; cv=none; d=zoho.com; s=zohoarc; b=c2vMYAVCpQTmV+ou6zmdJSPGAvu4DWs0d9IiTYUwMAMc4+kt8GVP+ko7LvhZMAhBO02JboIDZZ+98Isct1ODKGKVnpD6gVPu+0C6TncMm6EOKP7BebwEp2btx+qNPIwarFotcHJqrmOSj04Kuo4YmflshDP+yVdUiIPjDjDgidg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565554902; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=7bCiAA77LE5ojbNufL1jL88op/wLjzM34Xti8Quvl/I=; b=AZeK2XszbvWKtBhk0nbteK4HjWYW9ySB+qPge12/ETce06LPEBJoltVqyLPtQinDUQJqzqmoigM8f3wOtCWCgQ1pcLYMhggC7auLUVHiADCWDruTJcroL8JkiRMBaaV7iNPBSnJ7xz1Gco3a2gfRRSnxtBOJAYsXVZiCoDRrZF0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565554902568165.22813594832246; Sun, 11 Aug 2019 13:21:42 -0700 (PDT) Received: from localhost ([::1]:41610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwuLP-0006Pz-SJ for importer@patchew.org; Sun, 11 Aug 2019 16:21:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46061) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwtjr-000137-8l for qemu-devel@nongnu.org; Sun, 11 Aug 2019 15:42:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hwtjq-0007VN-9K for qemu-devel@nongnu.org; Sun, 11 Aug 2019 15:42:47 -0400 Received: from smtp5-g21.free.fr ([2a01:e0c:1:1599::14]:16206) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hwtjq-0007QM-0G for qemu-devel@nongnu.org; Sun, 11 Aug 2019 15:42:46 -0400 Received: from heffalump.sk2.org (unknown [88.186.243.14]) by smtp5-g21.free.fr (Postfix) with ESMTPS id 401D85FFAC for ; Sun, 11 Aug 2019 21:42:36 +0200 (CEST) Received: from steve by heffalump.sk2.org with local (Exim 4.92) (envelope-from ) id 1hwtjz-0002aY-Tt; Sun, 11 Aug 2019 21:42:56 +0200 From: Stephen Kitt To: qemu-devel@nongnu.org Date: Sun, 11 Aug 2019 21:42:47 +0200 Message-Id: <20190811194247.9861-1-steve@sk2.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a01:e0c:1:1599::14 X-Mailman-Approved-At: Sun, 11 Aug 2019 16:21:04 -0400 Subject: [Qemu-devel] [PATCH] Fix hw/rdma/vmw/pvrdma_cmd.c build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Kitt Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This was broken by the cherry-pick in 41dd30f. Fix by handling errors as in the rest of the function: "goto out" instead of "return rc". Signed-off-by: Stephen Kitt Reviewed-by: Yuval Shaia --- hw/rdma/vmw/pvrdma_cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index bb9a9f1cd1..a3a86d7c8e 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -514,7 +514,7 @@ static int create_qp(PVRDMADev *dev, union pvrdma_cmd_r= eq *req, cmd->recv_cq_handle, rings, &resp->qp= n); if (resp->hdr.err) { destroy_qp_rings(rings); - return rc; + goto out; } =20 resp->max_send_wr =3D cmd->max_send_wr; --=20 2.20.1