Merge pull request #1536 from hreinecke/TP8013

fabrics: support unique discovery subsystem NQN

Author: igaw

fabrics.c

@@ -82,6 +82,7 @@ struct connect_args {
 	char *trsvcid;
 	char *host_traddr;
 	char *host_iface;
+	char *subsystype;
 	struct connect_args *next;
 	struct connect_args *tail;
 };
@@ -296,6 +297,13 @@ static bool ctrl_matches_connectargs(const char *name, struct connect_args *args
 	addr = nvme_get_ctrl_attr(path, "address");
 	cargs.subsysnqn = nvme_get_ctrl_attr(path, "subsysnqn");
 	cargs.transport = nvme_get_ctrl_attr(path, "transport");
+	cargs.subsystype = nvme_get_ctrl_attr(path, "subsystype");
+	if (!cargs.subsystype) {
+		if (!strcmp(cargs.subsysnqn, NVME_DISC_SUBSYS_NAME))
+			cargs.subsystype = strdup("discovery");
+		else
+			cargs.subsystype = strdup("nvm");
+	}
 
 	if (!addr || !cargs.subsysnqn || !cargs.transport) {
 		fprintf(stderr, "nvme_get_ctrl_attr failed\n");
@@ -307,7 +315,7 @@ static bool ctrl_matches_connectargs(const char *name, struct connect_args *args
 	cargs.host_traddr = parse_conn_arg(addr, ' ', conarg_host_traddr);
 	cargs.host_iface = parse_conn_arg(addr, ' ', conarg_host_iface);
 
-	if (!strcmp(cargs.subsysnqn, NVME_DISC_SUBSYS_NAME)) {
+	if (!strcmp(cargs.subsystype, "discovery")) {
 		char *kato_str = nvme_get_ctrl_attr(path, "kato"), *p;
 		unsigned int kato = 0;
 
@@ -416,6 +424,7 @@ static void destruct_connect_args(struct connect_args *cargs)
 	free(cargs->trsvcid);
 	free(cargs->host_traddr);
 	free(cargs->host_iface);
+	free(cargs->subsystype);
 }
 
 static void free_connect_args(struct connect_args *cargs)