ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blockdev, nvme: do not probe local nvme device if not configured.

Browse Source 
Change-Id: Icdb017d7e6b0a38f8ff3aa78ea60117936dfe178
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/366702
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ziye Yang 2017-06-23 07:54:04 +08:00 committed by Jim Harris
parent b5e9e92934
commit a9428cb39e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/bdev/nvme/blockdev_nvme.c
View File

@ -859,6 +859,7 @@ bdev_nvme_library_init(void)
size_t i; size_t i;
struct nvme_probe_ctx *probe_ctx = NULL; struct nvme_probe_ctx *probe_ctx = NULL;
int retry_count; int retry_count;
uint32_t local_nvme_num = 0;
sp = spdk_conf_find_section(NULL, "Nvme"); sp = spdk_conf_find_section(NULL, "Nvme");
if (sp == NULL) { if (sp == NULL) {
@ -969,13 +970,17 @@ bdev_nvme_library_init(void)
rc = -1; rc = -1;
goto end; goto end;
} }
} else {
local_nvme_num++;
} }
} }
/* used to probe local NVMe device */ if (local_nvme_num > 0) {
if (spdk_nvme_probe(NULL, probe_ctx, probe_cb, attach_cb, NULL)) { /* used to probe local NVMe device */
rc = -1; if (spdk_nvme_probe(NULL, probe_ctx, probe_cb, attach_cb, NULL)) {
goto end; rc = -1;
goto end;
}
} }
if (g_nvme_hotplug_enabled) { if (g_nvme_hotplug_enabled) {