motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 10:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/rdma: Remove unneeded code that handles more that one port

Browse source 
Device supports only one port, let's remove a dead code that handles
more than one port.

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
This commit is contained in:
Yuval Shaia 2018-12-21 16:40:32 +02:00 • committed by Marcel Apfelbaum
parent 091782171f
commit 14c74f7207
3 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
hw/rdma/rdma_rm.c
View file

@ -545,7 +545,7 @@ int rdma_rm_add_gid(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev,
return -EINVAL; return -EINVAL;
} }
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));
return 0; return 0;
} }
@ -556,15 +556,15 @@ int rdma_rm_del_gid(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev,
int rc; int rc;
rc = rdma_backend_del_gid(backend_dev, ifname, rc = 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) { if (rc) {
pr_dbg("Fail to delete gid\n"); pr_dbg("Fail to delete gid\n");
return -EINVAL; return -EINVAL;
} }
memset(dev_res->ports[0].gid_tbl[gid_idx].gid.raw, 0, memset(dev_res->port.gid_tbl[gid_idx].gid.raw, 0,
sizeof(dev_res->ports[0].gid_tbl[gid_idx].gid)); sizeof(dev_res->port.gid_tbl[gid_idx].gid));
dev_res->ports[0].gid_tbl[gid_idx].backend_gid_index = -1; dev_res->port.gid_tbl[gid_idx].backend_gid_index = -1;
return 0; return 0;
} }
@ -577,16 +577,16 @@ int rdma_rm_get_backend_gid_index(RdmaDeviceResources *dev_res,
return -EINVAL; return -EINVAL;
} }
if (unlikely(dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index == -1)) { if (unlikely(dev_res->port.gid_tbl[sgid_idx].backend_gid_index == -1)) {
dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index = dev_res->port.gid_tbl[sgid_idx].backend_gid_index =
rdma_backend_get_gid_index(backend_dev, rdma_backend_get_gid_index(backend_dev,
&dev_res->ports[0].gid_tbl[sgid_idx].gid); &dev_res->port.gid_tbl[sgid_idx].gid);
} }
pr_dbg("backend_gid_index=%d\n", pr_dbg("backend_gid_index=%d\n",
dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index); dev_res->port.gid_tbl[sgid_idx].backend_gid_index);
return dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index; return dev_res->port.gid_tbl[sgid_idx].backend_gid_index;
} }
static void destroy_qp_hash_key(gpointer data) static void destroy_qp_hash_key(gpointer data)
@ -596,15 +596,13 @@ static void destroy_qp_hash_key(gpointer data)
static void init_ports(RdmaDeviceResources *dev_res) static void init_ports(RdmaDeviceResources *dev_res)
{ {
int i, j; int i;
memset(dev_res->ports, 0, sizeof(dev_res->ports)); memset(&dev_res->port, 0, sizeof(dev_res->port));
for (i = 0; i < MAX_PORTS; i++) { dev_res->port.state = IBV_PORT_DOWN;
dev_res->ports[i].state = IBV_PORT_DOWN; for (i = 0; i < MAX_PORT_GIDS; i++) {
for (j = 0; j < MAX_PORT_GIDS; j++) { dev_res->port.gid_tbl[i].backend_gid_index = -1;
dev_res->ports[i].gid_tbl[j].backend_gid_index = -1;
}
} }
} }
@ -613,7 +611,7 @@ static void fini_ports(RdmaDeviceResources *dev_res,
{ {
int i; int i;
dev_res->ports[0].state = IBV_PORT_DOWN; dev_res->port.state = IBV_PORT_DOWN;
for (i = 0; i < MAX_PORT_GIDS; i++) { for (i = 0; i < MAX_PORT_GIDS; i++) {
rdma_rm_del_gid(dev_res, backend_dev, ifname, i); rdma_rm_del_gid(dev_res, backend_dev, ifname, i);
} }

2
hw/rdma/rdma_rm.h
View file

@ -79,7 +79,7 @@ int rdma_rm_get_backend_gid_index(RdmaDeviceResources *dev_res,
static inline union ibv_gid *rdma_rm_get_gid(RdmaDeviceResources *dev_res, static inline union ibv_gid *rdma_rm_get_gid(RdmaDeviceResources *dev_res,
int sgid_idx) int sgid_idx)
{ {
return &dev_res->ports[0].gid_tbl[sgid_idx].gid; return &dev_res->port.gid_tbl[sgid_idx].gid;
} }
#endif #endif

4
hw/rdma/rdma_rm_defs.h
View file

@ -18,7 +18,7 @@
#include "rdma_backend_defs.h" #include "rdma_backend_defs.h"
#define MAX_PORTS 1 #define MAX_PORTS 1 /* Do not change - we support only one port */
#define MAX_PORT_GIDS 255 #define MAX_PORT_GIDS 255
#define MAX_GIDS MAX_PORT_GIDS #define MAX_GIDS MAX_PORT_GIDS
#define MAX_PORT_PKEYS 1 #define MAX_PORT_PKEYS 1
@ -97,7 +97,7 @@ typedef struct RdmaRmPort {
} RdmaRmPort; } RdmaRmPort;
typedef struct RdmaDeviceResources { typedef struct RdmaDeviceResources {
RdmaRmPort ports[MAX_PORTS]; RdmaRmPort port;
RdmaRmResTbl pd_tbl; RdmaRmResTbl pd_tbl;
RdmaRmResTbl mr_tbl; RdmaRmResTbl mr_tbl;
RdmaRmResTbl uc_tbl; RdmaRmResTbl uc_tbl;