From 0e47be4b41dc141c03f9338f7c18dc16930fcdc2 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 3 Nov 2020 18:30:21 +0000 Subject: [PATCH] nvme: add nqn prefix to hostnqn Section 7.9 of the NVMe spec says that all nqns must start with "nqn.". Fixes issue #1669. Signed-off-by: Jim Harris Change-Id: I7fd0e6a0a397e831c4fa2377126b6b1e1b127d88 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5017 Reviewed-by: Changpeng Liu Reviewed-by: Ziye Yang Reviewed-by: Reviewed-by: Tomasz Zawadzki Reviewed-by: Shuhei Matsumoto Tested-by: SPDK CI Jenkins --- lib/nvme/nvme_ctrlr.c | 3 ++- test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index a9dc4bf7f..7ee9e9500 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -161,7 +161,8 @@ spdk_nvme_ctrlr_get_default_ctrlr_opts(struct spdk_nvme_ctrlr_opts *opts, size_t if (FIELD_OK(hostnqn)) { spdk_uuid_fmt_lower(host_id_str, sizeof(host_id_str), &g_spdk_nvme_driver->default_extended_host_id); - snprintf(opts->hostnqn, sizeof(opts->hostnqn), "2014-08.org.nvmexpress:uuid:%s", host_id_str); + snprintf(opts->hostnqn, sizeof(opts->hostnqn), + "nqn.2014-08.org.nvmexpress:uuid:%s", host_id_str); } if (FIELD_OK(extended_host_id)) { diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c index c43a016a5..986a84e1f 100644 --- a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c +++ b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c @@ -1629,7 +1629,7 @@ test_ctrlr_get_default_ctrlr_opts(void) CU_ASSERT(opts.host_id[i] == 0); } CU_ASSERT_STRING_EQUAL(opts.hostnqn, - "2014-08.org.nvmexpress:uuid:e53e9258-c93b-48b5-be1a-f025af6d232a"); + "nqn.2014-08.org.nvmexpress:uuid:e53e9258-c93b-48b5-be1a-f025af6d232a"); CU_ASSERT(memcmp(opts.extended_host_id, &g_spdk_nvme_driver->default_extended_host_id, sizeof(opts.extended_host_id)) == 0); CU_ASSERT(strlen(opts.src_addr) == 0);