mi: replace nvme_mi_*global_context with nvme_*_global_context

Merge these two function together and avoid code duplication.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/examples/mi-mctp-ae.c

@@ -109,7 +109,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	ctx = nvme_mi_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+	ctx = nvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
 	if (!ctx)
 		err(EXIT_FAILURE, "can't create NVMe root");
 
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
 	//Cleanup
 	nvme_mi_aem_disable(ep);
 	nvme_mi_close(ep);
-	nvme_mi_free_global_ctx(ctx);
+	nvme_free_global_ctx(ctx);
 
 	return rc ? EXIT_FAILURE : EXIT_SUCCESS;
 }

libnvme/examples/mi-mctp-csi-test.c

@@ -237,12 +237,12 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	ctx = nvme_mi_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+	ctx = nvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
 	if (!ctx)
 		err(EXIT_FAILURE, "can't create NVMe root");
 
 	rc = do_action_endpoint(action, ctx, net, eid, argc, argv);
-	nvme_mi_free_global_ctx(ctx);
+	nvme_free_global_ctx(ctx);
 
 	return rc ? EXIT_FAILURE : EXIT_SUCCESS;
 }

libnvme/examples/mi-mctp.c

@@ -846,9 +846,9 @@ int main(int argc, char **argv)
 			printf("---\n");
 			free(desc);
 		}
-		nvme_mi_free_global_ctx(ctx);
+		nvme_free_global_ctx(ctx);
 	} else {
-		ctx = nvme_mi_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
+		ctx = nvme_create_global_ctx(stderr, DEFAULT_LOGLEVEL);
 		if (!ctx)
 			err(EXIT_FAILURE, "can't create NVMe root");
 
@@ -857,7 +857,7 @@ int main(int argc, char **argv)
 			errx(EXIT_FAILURE, "can't open MCTP endpoint %d:%d", net, eid);
 		rc = do_action_endpoint(action, ep, argc, argv);
 		nvme_mi_close(ep);
-		nvme_mi_free_global_ctx(ctx);
+		nvme_free_global_ctx(ctx);
 	}
 
 	return rc ? EXIT_FAILURE : EXIT_SUCCESS;

libnvme/src/libnvme.ld

@@ -157,7 +157,6 @@ LIBNVME_2_0 {
 		nvme_mi_scan_ep;
 		nvme_mi_scan_mctp;
 		nvme_mi_set_csi;
-		nvme_mi_set_probe_enabled;
 		nvme_mi_status_to_string;
 		nvme_mi_submit_entry;
 		nvme_mi_submit_exit;
@@ -229,6 +228,7 @@ LIBNVME_2_0 {
 		nvme_set_ioctl_probing;
 		nvme_set_keyring;
 		nvme_set_logging_level;
+		nvme_set_probe_enabled;
 		nvme_set_property;
 		nvme_set_root;
 		nvme_skip_namespaces;

libnvme/src/nvme/lib.c

@@ -15,6 +15,20 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
+static bool nvme_mi_probe_enabled_default(void)
+{
+	char *val;
+
+	val = getenv("LIBNVME_MI_PROBE_ENABLED");
+	if (!val)
+		return true;
+
+	return strcmp(val, "0") &&
+		strcasecmp(val, "false") &&
+		strncasecmp(val, "disable", 7);
+
+}
+
 struct nvme_global_ctx *nvme_create_global_ctx(FILE *fp, int log_level)
 {
 	struct nvme_global_ctx *ctx;
@@ -40,13 +54,15 @@ struct nvme_global_ctx *nvme_create_global_ctx(FILE *fp, int log_level)
 	list_head_init(&ctx->endpoints);
 
 	ctx->ioctl_probing = true;
+	ctx->mi_probe_enabled = nvme_mi_probe_enabled_default();
 
 	return ctx;
 }
 
 void nvme_free_global_ctx(struct nvme_global_ctx *ctx)
 {
 	struct nvme_host *h, *_h;
+	nvme_mi_ep_t ep, tmp;
 
 	if (!ctx)
 		return;
@@ -57,6 +73,8 @@ void nvme_free_global_ctx(struct nvme_global_ctx *ctx)
 	free(ctx->options);
 	nvme_for_each_host_safe(ctx, h, _h)
 		__nvme_free_host(h);
+	nvme_mi_for_each_endpoint_safe(ctx, ep, tmp)
+		nvme_mi_close(ep);
 	free(ctx->config_file);
 	free(ctx->application);
 	free(ctx);

libnvme/src/nvme/lib.h

@@ -202,6 +202,17 @@ void nvme_transport_handle_set_decide_retry(struct nvme_transport_handle *hdl,
 		bool (*decide_retry)(struct nvme_transport_handle *hdl,
 				struct nvme_passthru_cmd *cmd, int err));
 
+/**
+ * nvme_set_probe_enabled() - enable/disable the probe for new MI endpoints
+ * @ctx:	&struct nvme_global_ctx object
+ * @enabled: whether to probe new endpoints
+ *
+ * Controls whether newly-created endpoints are probed for quirks on creation.
+ * Defaults to enabled, which results in some initial messaging with the
+ * endpoint to determine model-specific details.
+ */
+void nvme_set_probe_enabled(struct nvme_global_ctx *ctx, bool enabled);
+
 /**
  * nvme_set_dry_run() - Set global dry run state
  * @ctx:	struct nvme_global_ctx object

libnvme/src/nvme/mi.c

@@ -43,20 +43,6 @@ static int nvme_mi_get_async_message(nvme_mi_ep_t ep,
 static const int default_timeout = 1000; /* milliseconds; endpoints may
 					    override */
 
-static bool nvme_mi_probe_enabled_default(void)
-{
-	char *val;
-
-	val = getenv("LIBNVME_MI_PROBE_ENABLED");
-	if (!val)
-		return true;
-
-	return strcmp(val, "0") &&
-		strcasecmp(val, "false") &&
-		strncasecmp(val, "disable", 7);
-
-}
-
 static int parse_devname(const char *dev, unsigned int *net, uint8_t *eid,
 			unsigned int *ctrl)
 {
@@ -113,53 +99,6 @@ void __nvme_transport_handle_close_mi(struct nvme_transport_handle *hdl)
 	free(hdl);
 }
 
-/* MI-equivalent of nvme_create_root, but avoids clashing symbol names
- * when linking against both libnvme and libnvme-mi.
- */
-struct nvme_global_ctx *nvme_mi_create_global_ctx(FILE *fp, int log_level)
-{
-	struct nvme_global_ctx *ctx;
-	int fd;
-
-	ctx = calloc(1, sizeof(*ctx));
-	if (!ctx)
-		return NULL;
-
-	if (fp) {
-		fd = fileno(fp);
-		if (fd < 0) {
-			free(ctx);
-			return NULL;
-		}
-	} else
-		fd = STDERR_FILENO;
-
-	ctx->log.fd = fd;
-	ctx->log.level = log_level;
-
-	ctx->mi_probe_enabled = nvme_mi_probe_enabled_default();
-
-	list_head_init(&ctx->hosts);
-	list_head_init(&ctx->endpoints);
-
-	return ctx;
-}
-
-void nvme_mi_free_global_ctx(struct nvme_global_ctx *ctx)
-{
-	nvme_mi_ep_t ep, tmp;
-
-	nvme_mi_for_each_endpoint_safe(ctx, ep, tmp)
-		nvme_mi_close(ep);
-
-	free(ctx);
-}
-
-void nvme_mi_set_probe_enabled(struct nvme_global_ctx *ctx, bool enabled)
-{
-	ctx->mi_probe_enabled = enabled;
-}
-
 static void nvme_mi_record_resp_time(struct nvme_mi_ep *ep)
 {
 	int rc;

libnvme/src/nvme/mi.h

@@ -651,38 +651,6 @@ struct nvme_mi_control_resp {
  */
 const char *nvme_mi_status_to_string(int status);
 
-/**
- * nvme_mi_create_global_ctx() - Create top-level MI (ctx) handle.
- * @fp:		File descriptor for logging messages
- * @log_level:	Logging level to use
- *
- * Create the top-level (library) handle for creating subsequent endpoint
- * objects. Similar to nvme_create_global_ctx(), but we provide this to
- * allow linking without the core libnvme.
- *
- * Return: new nvme_global_ctx object, or NULL on failure.
- *
- * See &nvme_create_global_ctx.
- */
-struct nvme_global_ctx *nvme_mi_create_global_ctx(FILE *fp, int log_level);
-
-/**
- * nvme_mi_free_global_ctx() - Free nvme_global_ctx object.
- * @ctx:	&struct nvme_global_ctx object
- */
-void nvme_mi_free_global_ctx(struct nvme_global_ctx *ctx);
-
-/**
- * nvme_mi_set_probe_enabled() - enable/disable the probe for new endpoints
- * @ctx:	&struct nvme_global_ctx object
- * @enabled: whether to probe new endpoints
- *
- * Controls whether newly-created endpoints are probed for quirks on creation.
- * Defaults to enabled, which results in some initial messaging with the
- * endpoint to determine model-specific details.
- */
-void nvme_mi_set_probe_enabled(struct nvme_global_ctx *ctx, bool enabled);
-
 /* Top level management object: NVMe-MI Management Endpoint */
 struct nvme_mi_ep;
 

libnvme/test/mi-mctp.c

@@ -1461,7 +1461,7 @@ int main(void)
 
 	__nvme_mi_mctp_set_ops(&ops);
 
-	ctx = nvme_mi_create_global_ctx(fd, DEFAULT_LOGLEVEL);
+	ctx = nvme_create_global_ctx(fd, DEFAULT_LOGLEVEL);
 	assert(ctx);
 
 	ep = nvme_mi_open_mctp(ctx, 0, 0);
@@ -1473,7 +1473,7 @@ int main(void)
 	}
 
 	nvme_mi_close(ep);
-	nvme_mi_free_global_ctx(ctx);
+	nvme_free_global_ctx(ctx);
 
 	test_close_log(fd);
 

libnvme/test/mi.c

@@ -2131,7 +2131,7 @@ int main(void)
 
 	fd = test_setup_log();
 
-	ctx = nvme_mi_create_global_ctx(fd, DEFAULT_LOGLEVEL);
+	ctx = nvme_create_global_ctx(fd, DEFAULT_LOGLEVEL);
 	assert(ctx);
 
 	ep = nvme_mi_open_test(ctx);
@@ -2142,7 +2142,7 @@ int main(void)
 	}
 
 	nvme_mi_close(ep);
-	nvme_mi_free_global_ctx(ctx);
+	nvme_free_global_ctx(ctx);
 
 	test_close_log(fd);