From: Hannes Reinecke <hare@suse.de>
Date: Wed, 17 Nov 2021 14:30:01 +0000 (+0100)
Subject: fabrics: use nvmf_default_config()
X-Git-Tag: v2.0-rc0~49^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5b0c84ed85605d39be66a058a486f8dd96e9b133;p=users%2Fsagi%2Fnvme-cli.git

fabrics: use nvmf_default_config()

Use nvmf_default_config() to initialize the fabrics configuration
with default values.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---

diff --git a/fabrics.c b/fabrics.c
index 03c19d2a..ee9978a0 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -307,11 +307,7 @@ static int discover_from_conf_file(nvme_host_t h, const char *desc,
 	FILE *f;
 	enum nvme_print_flags flags;
 	char *format = "normal";
-
-	struct nvme_fabrics_config cfg = {
-		.tos = -1,
-		.ctrl_loss_tmo = NVMF_DEF_CTRL_LOSS_TMO,
-	};
+	struct nvme_fabrics_config cfg;
 
 	OPT_ARGS(opts) = {
 		NVMF_OPTS(cfg),
@@ -323,6 +319,8 @@ static int discover_from_conf_file(nvme_host_t h, const char *desc,
 		OPT_END()
 	};
 
+	nvmf_default_config(&cfg);
+
 	ret = flags = validate_output_format(format);
 	if (ret < 0)
 		return ret;
@@ -399,11 +397,7 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
 	unsigned int verbose = 0;
 	int ret;
 	char *format = "normal";
-
-	struct nvme_fabrics_config cfg = {
-		.tos = -1,
-	};
-
+	struct nvme_fabrics_config cfg;
 	char *device = NULL;
 
 	OPT_ARGS(opts) = {
@@ -418,6 +412,8 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
 		OPT_END()
 	};
 
+	nvmf_default_config(&cfg);
+
 	ret = argconfig_parse(argc, argv, desc, opts);
 	if (ret)
 		return ret;
@@ -556,11 +552,7 @@ int nvmf_connect(const char *desc, int argc, char **argv)
 	nvme_host_t h;
 	nvme_ctrl_t c;
 	int ret;
-
-	struct nvme_fabrics_config cfg = {
-		.tos = -1,
-		.ctrl_loss_tmo = NVMF_DEF_CTRL_LOSS_TMO,
-	};
+	struct nvme_fabrics_config cfg;
 
 	OPT_ARGS(opts) = {
 		OPT_STRING("nqn", 'n', "NAME", &subsysnqn, nvmf_nqn),
@@ -570,6 +562,8 @@ int nvmf_connect(const char *desc, int argc, char **argv)
 		OPT_END()
 	};
 
+	nvmf_default_config(&cfg);
+
 	ret = argconfig_parse(argc, argv, desc, opts);
 	if (ret)
 		return ret;