From 5d5a9077a3e1de7a6130ed255b71806380241ed9 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Wed, 19 Aug 2020 22:01:06 -0400 Subject: [PATCH] nvme: don't assert on custom transport Change-Id: I2d425c127dc070f7bb508f5a61e6304f6042fdf7 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3857 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki Reviewed-by: Aleksey Marchuk --- include/spdk/nvme.h | 1 + lib/nvme/nvme.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/spdk/nvme.h b/include/spdk/nvme.h index 5d9f36555..f23b43a2b 100644 --- a/include/spdk/nvme.h +++ b/include/spdk/nvme.h @@ -52,6 +52,7 @@ extern "C" { #define SPDK_NVME_TRANSPORT_NAME_PCIE "PCIE" #define SPDK_NVME_TRANSPORT_NAME_RDMA "RDMA" #define SPDK_NVME_TRANSPORT_NAME_TCP "TCP" +#define SPDK_NVME_TRANSPORT_NAME_CUSTOM "CUSTOM" #define SPDK_NVMF_PRIORITY_MAX_LEN 4 diff --git a/lib/nvme/nvme.c b/lib/nvme/nvme.c index 67db1f4fd..fb4de8d2b 100644 --- a/lib/nvme/nvme.c +++ b/lib/nvme/nvme.c @@ -895,8 +895,10 @@ spdk_nvme_trid_populate_transport(struct spdk_nvme_transport_id *trid, trstring = SPDK_NVME_TRANSPORT_NAME_TCP; break; case SPDK_NVME_TRANSPORT_CUSTOM: + trstring = SPDK_NVME_TRANSPORT_NAME_CUSTOM; + break; default: - SPDK_ERRLOG("don't use this for custom transports\n"); + SPDK_ERRLOG("no available transports\n"); assert(0); return; }