From nobody Fri Nov 7 03:53:15 2025 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; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545473205666738.5051235410176; Sat, 22 Dec 2018 02:06:45 -0800 (PST) Received: from localhost ([::1]:56635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaeBA-0001RC-5m for importer@patchew.org; Sat, 22 Dec 2018 05:06:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gadw5-0006OA-Ml for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gadw4-0006Wt-N4 for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:09 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:44479) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gadw4-0006WJ-HG for qemu-devel@nongnu.org; Sat, 22 Dec 2018 04:51:08 -0500 Received: by mail-wr1-x441.google.com with SMTP id z5so7497292wrt.11 for ; Sat, 22 Dec 2018 01:51:08 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id s3sm9557371wmj.23.2018.12.22.01.51.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Dec 2018 01:51:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mwPhF3YDNXPA/ayvaocLeWGdKPYJHNNA9KhY18EIHq4=; b=IzWULhClWRSQrxZYl6iiuNFWsTY1B6A+DvuVHButvu6+Z4oeHlhFo7kQjMQ/GtxTSr 9jnoI3u9VeYaEvofoFSDbSDVgqw6ZxCYvCr4IJHoPjCmvXXn6O3s+wwUS89mprjs6BKj ocKvpRaGeLZK60YGyCLgxIi3U3F1ozASQ3rLqpCKIvzx7QM9n4o9FyIFmNZoDDK4pSqS zdAig3onsgyL0T1QCtivwi2kNyS/UbaDTJ3o/R/t9chARvk2JpEKFa6EvpdkEvF223pk +Pn8korsLda7yQ9Gn9QAJmGfjamGjJahsiQhwNnXJ8LcGw9qN8Newm0Bd4WRChM7hGWA pzbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mwPhF3YDNXPA/ayvaocLeWGdKPYJHNNA9KhY18EIHq4=; b=aSE9ik7/7AVQMfj4v3cncEPF/VNnniG5cbZ4NX2DzXAh7k5OgHcUB2OGknKJ02vf1P V7NMr0dhtKtbwPMF4mF8L+iQW0qS2ubR/eh++XfvA9Ikccecgctzw0pNTQEibGVTY/62 7RqsVNiIXgPUsRM/4L3Gg/3te9rrZoF21Czb8lMLGNRgU3zZPpQwZSGwpE/Rnzqgx1U0 /22zoBjfriut+sqxyne7aIc5ZnJoZ5Td6VOPgnrdz0LDXuNgf5ynLQXV5GZX84HRjDAU ci8GKkOvswviaTGyUivjLC5Dqf6CA4ofRuhh/pe3EcGIG9/3dhNTbOTXtNPQaia7AHNM lX7Q== X-Gm-Message-State: AJcUukdXY4Ok2Wo7tvd2FQNVYEpY6bM5k76VsEBkUIPA7Pi0gGgKrI9W X6GVQupyEENx+mfMgxIUzm83jbTA X-Google-Smtp-Source: ALg8bN6bETZ8F3yOpbbITUL8LgC7Sxnn5JUjTM6k0RxZeEyxE2wrEHRF/N+V4nrLdbbKjGTPHIi5yA== X-Received: by 2002:a5d:63c3:: with SMTP id c3mr5568543wrw.215.1545472267270; Sat, 22 Dec 2018 01:51:07 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 22 Dec 2018 11:50:24 +0200 Message-Id: <20181222095036.29743-20-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181222095036.29743-1-marcel.apfelbaum@gmail.com> References: <20181222095036.29743-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH PULL 19/31] hw/rdma: Remove unneeded code that handles more that one port 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: yuval.shaia@oracle.com, pjp@fedoraproject.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yuval Shaia Device supports only one port, let's remove a dead code that handles more than one port. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_rm.c | 34 ++++++++++++++++------------------ hw/rdma/rdma_rm.h | 2 +- hw/rdma/rdma_rm_defs.h | 4 ++-- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 250254561c..b7d4ebe972 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -545,7 +545,7 @@ int rdma_rm_add_gid(RdmaDeviceResources *dev_res, RdmaB= ackendDev *backend_dev, return -EINVAL; } =20 - memcpy(&dev_res->ports[0].gid_tbl[gid_idx].gid, gid, sizeof(*gid)); + memcpy(&dev_res->port.gid_tbl[gid_idx].gid, gid, sizeof(*gid)); =20 return 0; } @@ -556,15 +556,15 @@ int rdma_rm_del_gid(RdmaDeviceResources *dev_res, Rdm= aBackendDev *backend_dev, int rc; =20 rc =3D rdma_backend_del_gid(backend_dev, ifname, - &dev_res->ports[0].gid_tbl[gid_idx].gid); + &dev_res->port.gid_tbl[gid_idx].gid); if (rc) { pr_dbg("Fail to delete gid\n"); return -EINVAL; } =20 - memset(dev_res->ports[0].gid_tbl[gid_idx].gid.raw, 0, - sizeof(dev_res->ports[0].gid_tbl[gid_idx].gid)); - dev_res->ports[0].gid_tbl[gid_idx].backend_gid_index =3D -1; + memset(dev_res->port.gid_tbl[gid_idx].gid.raw, 0, + sizeof(dev_res->port.gid_tbl[gid_idx].gid)); + dev_res->port.gid_tbl[gid_idx].backend_gid_index =3D -1; =20 return 0; } @@ -577,16 +577,16 @@ int rdma_rm_get_backend_gid_index(RdmaDeviceResources= *dev_res, return -EINVAL; } =20 - if (unlikely(dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index =3D= =3D -1)) { - dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index =3D + if (unlikely(dev_res->port.gid_tbl[sgid_idx].backend_gid_index =3D=3D = -1)) { + dev_res->port.gid_tbl[sgid_idx].backend_gid_index =3D rdma_backend_get_gid_index(backend_dev, - &dev_res->ports[0].gid_tbl[sgid_idx].gi= d); + &dev_res->port.gid_tbl[sgid_idx].gid); } =20 pr_dbg("backend_gid_index=3D%d\n", - dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index); + dev_res->port.gid_tbl[sgid_idx].backend_gid_index); =20 - return dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index; + return dev_res->port.gid_tbl[sgid_idx].backend_gid_index; } =20 static void destroy_qp_hash_key(gpointer data) @@ -596,15 +596,13 @@ static void destroy_qp_hash_key(gpointer data) =20 static void init_ports(RdmaDeviceResources *dev_res) { - int i, j; + int i; =20 - memset(dev_res->ports, 0, sizeof(dev_res->ports)); + memset(&dev_res->port, 0, sizeof(dev_res->port)); =20 - for (i =3D 0; i < MAX_PORTS; i++) { - dev_res->ports[i].state =3D IBV_PORT_DOWN; - for (j =3D 0; j < MAX_PORT_GIDS; j++) { - dev_res->ports[i].gid_tbl[j].backend_gid_index =3D -1; - } + dev_res->port.state =3D IBV_PORT_DOWN; + for (i =3D 0; i < MAX_PORT_GIDS; i++) { + dev_res->port.gid_tbl[i].backend_gid_index =3D -1; } } =20 @@ -613,7 +611,7 @@ static void fini_ports(RdmaDeviceResources *dev_res, { int i; =20 - dev_res->ports[0].state =3D IBV_PORT_DOWN; + dev_res->port.state =3D IBV_PORT_DOWN; for (i =3D 0; i < MAX_PORT_GIDS; i++) { rdma_rm_del_gid(dev_res, backend_dev, ifname, i); } diff --git a/hw/rdma/rdma_rm.h b/hw/rdma/rdma_rm.h index a7169b4e89..3c602c04c0 100644 --- a/hw/rdma/rdma_rm.h +++ b/hw/rdma/rdma_rm.h @@ -79,7 +79,7 @@ int rdma_rm_get_backend_gid_index(RdmaDeviceResources *de= v_res, static inline union ibv_gid *rdma_rm_get_gid(RdmaDeviceResources *dev_res, int sgid_idx) { - return &dev_res->ports[0].gid_tbl[sgid_idx].gid; + return &dev_res->port.gid_tbl[sgid_idx].gid; } =20 #endif diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h index 7b3435f991..0ba61d1838 100644 --- a/hw/rdma/rdma_rm_defs.h +++ b/hw/rdma/rdma_rm_defs.h @@ -18,7 +18,7 @@ =20 #include "rdma_backend_defs.h" =20 -#define MAX_PORTS 1 +#define MAX_PORTS 1 /* Do not change - we support only one por= t */ #define MAX_PORT_GIDS 255 #define MAX_GIDS MAX_PORT_GIDS #define MAX_PORT_PKEYS 1 @@ -97,7 +97,7 @@ typedef struct RdmaRmPort { } RdmaRmPort; =20 typedef struct RdmaDeviceResources { - RdmaRmPort ports[MAX_PORTS]; + RdmaRmPort port; RdmaRmResTbl pd_tbl; RdmaRmResTbl mr_tbl; RdmaRmResTbl uc_tbl; --=20 2.17.1