From 62fd105a3eedabb677a0d70d9979741122499a35 Mon Sep 17 00:00:00 2001
From: Wojciech Malikowski <wojciech.malikowski@intel.com>
Date: Fri, 8 Mar 2019 09:28:17 -0500
Subject: [PATCH] lib/bdev/nvme: Skip open channel controllers when generating
 config

Change-Id: I0ed3ff9bdc53c9bd338fb1b40a0ab5e69390a92c
Signed-off-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/447448
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 lib/bdev/nvme/bdev_nvme.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/bdev/nvme/bdev_nvme.c b/lib/bdev/nvme/bdev_nvme.c
index 9e913f8e8..8fb2b2d06 100644
--- a/lib/bdev/nvme/bdev_nvme.c
+++ b/lib/bdev/nvme/bdev_nvme.c
@@ -42,6 +42,7 @@
 #include "spdk/bdev.h"
 #include "spdk/json.h"
 #include "spdk/nvme.h"
+#include "spdk/nvme_ocssd.h"
 #include "spdk/thread.h"
 #include "spdk/string.h"
 #include "spdk/likely.h"
@@ -2001,6 +2002,11 @@ bdev_nvme_config_json(struct spdk_json_write_ctx *w)
 
 	pthread_mutex_lock(&g_bdev_nvme_mutex);
 	TAILQ_FOREACH(nvme_bdev_ctrlr, &g_nvme_bdev_ctrlrs, tailq) {
+
+		if (spdk_nvme_ctrlr_is_ocssd_supported(nvme_bdev_ctrlr->ctrlr)) {
+			continue;
+		}
+
 		trid = &nvme_bdev_ctrlr->trid;
 
 		spdk_json_write_object_begin(w);