From 0589050d3e43e88573c20bd942138d96c2bc06bf Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Tue, 9 Nov 2021 17:32:19 +0800 Subject: [PATCH] nvmf/vfio-user: use static CNTLID Change-Id: I5c52f296bfea21968604d31f8e8ee3490317b440 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10150 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Dong Yi Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/nvmf/vfio_user.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/nvmf/vfio_user.c b/lib/nvmf/vfio_user.c index 3c7cc204f..f91d8956f 100644 --- a/lib/nvmf/vfio_user.c +++ b/lib/nvmf/vfio_user.c @@ -2035,7 +2035,8 @@ nvmf_vfio_user_create_ctrlr(struct nvmf_vfio_user_transport *transport, err = -ENOMEM; goto out; } - ctrlr->cntlid = 0xffff; + /* We can only support one connection for now */ + ctrlr->cntlid = 0x1; ctrlr->transport = transport; ctrlr->endpoint = endpoint; ctrlr->doorbells = endpoint->doorbells; @@ -2512,7 +2513,7 @@ nvmf_vfio_user_poll_group_add(struct spdk_nvmf_transport_poll_group *group, } data = (struct spdk_nvmf_fabric_connect_data *)req->data; - data->cntlid = admin ? 0xFFFF : ctrlr->cntlid; + data->cntlid = ctrlr->cntlid; snprintf(data->subnqn, sizeof(data->subnqn), "%s", spdk_nvmf_subsystem_get_nqn(ctrlr->endpoint->subsystem));