From 9857ff6015e4a66753b9ce3c663a9e84ab0ad8c0 Mon Sep 17 00:00:00 2001 From: Anil Veerabhadrappa Date: Mon, 20 Jan 2020 21:50:38 -0800 Subject: [PATCH] nvmf/fc: Fix compilation errors in FC ut Fix includes passing correct argument to spdk_nvmf_get_transport_ops() and also add the spdk_nvme_trid_populate_transport() function stub. Signed-off-by: Anil Veerabhadrappa Change-Id: Ic470dbf7c4c674531358df2dec14a09c12a41f4e Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/482199 Community-CI: SPDK CI Jenkins Community-CI: Broadcom SPDK FC-NVMe CI Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Seth Howell Reviewed-by: Jim Harris Reviewed-by: Alexey Marchuk --- test/unit/lib/nvmf/fc.c/fc_ut.c | 5 ++++- test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/unit/lib/nvmf/fc.c/fc_ut.c b/test/unit/lib/nvmf/fc.c/fc_ut.c index a0a523993..e531117e2 100644 --- a/test/unit/lib/nvmf/fc.c/fc_ut.c +++ b/test/unit/lib/nvmf/fc.c/fc_ut.c @@ -45,6 +45,7 @@ #include "transport.h" #include "nvmf_internal.h" + #include "nvmf_fc.h" #include "json/json_util.c" @@ -123,6 +124,8 @@ DEFINE_STUB(spdk_bdev_get_block_size, uint32_t, (const struct spdk_bdev *bdev), DEFINE_STUB(spdk_bdev_get_num_blocks, uint64_t, (const struct spdk_bdev *bdev), 1024); DEFINE_STUB(spdk_nvmf_ctrlr_async_event_ns_notice, int, (struct spdk_nvmf_ctrlr *ctrlr), 0); +DEFINE_STUB_V(spdk_nvme_trid_populate_transport, (struct spdk_nvme_transport_id *trid, + enum spdk_nvme_transport_type trtype)); const char * spdk_nvme_transport_id_trtype_str(enum spdk_nvme_transport_type trtype) @@ -276,7 +279,7 @@ create_transport_test(void) g_nvmf_tgt = spdk_nvmf_tgt_create(&tgt_opts); SPDK_CU_ASSERT_FATAL(g_nvmf_tgt != NULL); - ops = spdk_nvmf_get_transport_ops((enum spdk_nvme_transport_type) SPDK_NVMF_TRTYPE_FC); + ops = spdk_nvmf_get_transport_ops(SPDK_NVME_TRANSPORT_NAME_FC); SPDK_CU_ASSERT_FATAL(ops != NULL); ops->opts_init(&opts); diff --git a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c index 46aecccfc..66eefc1d5 100644 --- a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c +++ b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c @@ -60,6 +60,8 @@ void spdk_set_thread(struct spdk_thread *thread); DEFINE_STUB(spdk_nvmf_request_complete, int, (struct spdk_nvmf_request *req), -ENOSPC); DEFINE_STUB(spdk_nvmf_subsystem_host_allowed, bool, (struct spdk_nvmf_subsystem *subsystem, const char *hostnqn), true); +DEFINE_STUB_V(spdk_nvme_trid_populate_transport, (struct spdk_nvme_transport_id *trid, + enum spdk_nvme_transport_type trtype)); static const char *fc_ut_subsystem_nqn = "nqn.2017-11.io.spdk:sn.390c0dc7c87011e786b300a0989adc53:subsystem.good";