libnvme: drop nvme_subsystem accessors from tree.c

The accessor functions already have implementations for the various
nvme subsystem accessors, so drop them from tree.c

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

fabrics.c

@@ -716,7 +716,7 @@ static void nvmf_disconnect_nqn(struct nvme_global_ctx *ctx, char *nqn)
 			continue;
 		nvme_for_each_host(ctx, h) {
 			nvme_for_each_subsystem(h, s) {
-				if (strcmp(nvme_subsystem_get_nqn(s), p))
+				if (strcmp(nvme_subsystem_get_subsysnqn(s), p))
 					continue;
 				nvme_subsystem_for_each_ctrl(s, c) {
 					if (!nvme_disconnect_ctrl(c))
@@ -1062,7 +1062,7 @@ int fabrics_dim(const char *desc, int argc, char **argv)
 				continue;
 			nvme_for_each_host(ctx, h) {
 				nvme_for_each_subsystem(h, s) {
-					if (strcmp(nvme_subsystem_get_nqn(s), p))
+					if (strcmp(nvme_subsystem_get_subsysnqn(s), p))
 						continue;
 					nvme_subsystem_for_each_ctrl(s, c)
 						ret = dim_operation(c, tas, p);

libnvme/examples/display-columnar.c

@@ -42,7 +42,7 @@ int main()
 		nvme_for_each_subsystem(h, s) {
 			bool first = true;
 			printf("%-16s %-96s ", nvme_subsystem_get_name(s),
-			       nvme_subsystem_get_nqn(s));
+			       nvme_subsystem_get_subsysnqn(s));
 
 			nvme_subsystem_for_each_ctrl(s, c) {
 				printf("%s%s", first ? "": ", ",

libnvme/examples/display-tree.c

@@ -39,7 +39,7 @@ int main()
 		nvme_for_each_subsystem_safe(h, s, _s) {
 			printf("%c-- %s - NQN=%s\n", _s ? '|' : '`',
 			       nvme_subsystem_get_name(s),
-			       nvme_subsystem_get_nqn(s));
+			       nvme_subsystem_get_subsysnqn(s));
 
 			nvme_subsystem_for_each_ns_safe(s, n, _n) {
 				printf("%c   |-- %s lba size:%d lba max:%" PRIu64 "\n",

libnvme/libnvme/nvme.i

@@ -897,7 +897,7 @@ struct nvme_ns {
 	}
 
 	bool nvme_ctrl_persistent_get(struct nvme_ctrl *c) {
-		return nvme_ctrl_is_persistent(c);
+		return nvme_ctrl_get_persistent(c);
 	}
 	void nvme_ctrl_persistent_set(struct nvme_ctrl *c, bool persistent) {
 		nvme_ctrl_set_persistent(c, persistent);
@@ -956,14 +956,14 @@ struct nvme_ns {
 	}
 
 	bool nvme_ctrl_discovery_ctrl_get(struct nvme_ctrl *c) {
-		return nvme_ctrl_is_discovery_ctrl(c);
+		return nvme_ctrl_get_discovery_ctrl(c);
 	}
 	void nvme_ctrl_discovery_ctrl_set(struct nvme_ctrl *c, bool discovery) {
 		nvme_ctrl_set_discovery_ctrl(c, discovery);
 	}
 
 	bool nvme_ctrl_unique_discovery_ctrl_get(nvme_ctrl_t c) {
-		return nvme_ctrl_is_unique_discovery_ctrl(c);
+		return nvme_ctrl_get_unique_discovery_ctrl(c);
 	}
 	void nvme_ctrl_unique_discovery_ctrl_set(nvme_ctrl_t c, bool unique) {
 		nvme_ctrl_set_unique_discovery_ctrl(c, unique);

libnvme/src/libnvme.ld

@@ -17,9 +17,6 @@ LIBNVME_3 {
 		nvme_ctrl_get_subsystem;
 		nvme_ctrl_get_transport_handle;
 		nvme_ctrl_identify;
-		nvme_ctrl_is_discovery_ctrl;
-		nvme_ctrl_is_persistent;
-		nvme_ctrl_is_unique_discovery_ctrl;
 		nvme_ctrl_next_ns;
 		nvme_ctrl_next_path;
 		nvme_ctrl_release_transport_handle;
@@ -187,10 +184,7 @@ LIBNVME_3 {
 		nvme_subsystem_first_ctrl;
 		nvme_subsystem_first_ns;
 		nvme_get_subsystem;
-		nvme_subsystem_get_fw_rev;
 		nvme_subsystem_get_host;
-		nvme_subsystem_get_nqn;
-		nvme_subsystem_get_type;
 		nvme_subsystem_lookup_namespace;
 		nvme_subsystem_next_ctrl;
 		nvme_subsystem_next_ns;

libnvme/src/nvme/fabrics.c

@@ -703,7 +703,7 @@ static int build_options(nvme_host_t h, nvme_ctrl_t c, char **argstr)
 		discovery_nqn = true;
 	}
 
-	if (nvme_ctrl_is_discovery_ctrl(c))
+	if (nvme_ctrl_get_discovery_ctrl(c))
 		discover = true;
 
 	hostnqn = nvme_host_get_hostnqn(h);
@@ -1040,7 +1040,7 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
 	root_app = nvme_get_application(h->ctx);
 	if (root_app) {
 		app = nvme_subsystem_get_application(s);
-		if (!app && nvme_ctrl_is_discovery_ctrl(c))
+		if (!app && nvme_ctrl_get_discovery_ctrl(c))
 			app = lookup_context(h->ctx, c);
 
 		/*
@@ -1051,7 +1051,7 @@ int nvmf_add_ctrl(nvme_host_t h, nvme_ctrl_t c,
 		 */
 		if (app && strcmp(app, root_app)) {
 			nvme_msg(h->ctx, LOG_INFO, "skip %s, not managed by %s\n",
-				 nvme_subsystem_get_nqn(s), root_app);
+				 nvme_subsystem_get_subsysnqn(s), root_app);
 			return -ENVME_CONNECT_IGNORED;
 		}
 	}
@@ -1182,7 +1182,7 @@ static int nvmf_connect_disc_entry(nvme_host_t h,
 		break;
 	}
 
-	if (nvme_ctrl_is_discovered(c)) {
+	if (nvme_ctrl_get_discovered(c)) {
 		nvme_free_ctrl(c);
 		return -EAGAIN;
 	}
@@ -2050,7 +2050,7 @@ const char *nvmf_get_default_trsvcid(const char *transport,
 static bool is_persistent_discovery_ctrl(nvme_host_t h, nvme_ctrl_t c)
 {
 	if (nvme_host_is_pdc_enabled(h, DEFAULT_PDC_ENABLED))
-		return nvme_ctrl_is_unique_discovery_ctrl(c);
+		return nvme_ctrl_get_unique_discovery_ctrl(c);
 
 	return false;
 }
@@ -2090,7 +2090,7 @@ static int __create_discovery_ctrl(struct nvme_global_ctx *ctx,
 		     strcmp(trcfg->subsysnqn, NVME_DISC_SUBSYS_NAME));
 	tmo = set_discovery_kato(fctx, cfg);
 
-	if (nvme_ctrl_is_unique_discovery_ctrl(c) && fctx->hostkey) {
+	if (nvme_ctrl_get_unique_discovery_ctrl(c) && fctx->hostkey) {
 		nvme_ctrl_set_dhchap_host_key(c, fctx->hostkey);
 		if (fctx->ctrlkey)
 			nvme_ctrl_set_dhchap_ctrl_key(c, fctx->ctrlkey);
@@ -2121,7 +2121,7 @@ static int nvmf_create_discovery_ctrl(struct nvme_global_ctx *ctx,
 	if (ret)
 		return ret;
 
-	if (nvme_ctrl_is_unique_discovery_ctrl(c)) {
+	if (nvme_ctrl_get_unique_discovery_ctrl(c)) {
 		*ctrl = c;
 		return 0;
 	}
@@ -2220,7 +2220,7 @@ int _discovery_config_json(struct nvme_global_ctx *ctx,
 	else
 		subsysnqn = NVME_DISC_SUBSYS_NAME;
 
-	if (nvme_ctrl_is_persistent(c))
+	if (nvme_ctrl_get_persistent(c))
 		fctx->persistent = true;
 
 	memcpy(&cfg, fctx->cfg, sizeof(cfg));
@@ -2971,7 +2971,7 @@ int nvmf_discovery(struct nvme_global_ctx *ctx, struct nvmf_context *fctx,
 				    fctx->device);
 			}
 
-			if (!nvme_ctrl_is_discovery_ctrl(c)) {
+			if (!nvme_ctrl_get_discovery_ctrl(c)) {
 				nvme_msg(
 					ctx, LOG_ERR,
 					"ctrl device %s found, ignoring non discovery controller\n",

libnvme/src/nvme/json.c

@@ -60,10 +60,10 @@ static void json_update_attributes(nvme_ctrl_t c,
 		JSON_UPDATE_BOOL_OPTION(cfg, key_str,
 					concat, val_obj);
 		if (!strcmp("persistent", key_str) &&
-		    !nvme_ctrl_is_persistent(c))
+		    !nvme_ctrl_get_persistent(c))
 			nvme_ctrl_set_persistent(c, true);
 		if (!strcmp("discovery", key_str) &&
-		    !nvme_ctrl_is_discovery_ctrl(c))
+		    !nvme_ctrl_get_discovery_ctrl(c))
 			nvme_ctrl_set_discovery_ctrl(c, true);
 		if (!strcmp("keyring", key_str))
 			nvme_ctrl_set_keyring(c,
@@ -342,10 +342,10 @@ static void json_update_port(struct json_object *ctrl_array, nvme_ctrl_t c)
 	JSON_BOOL_OPTION(cfg, port_obj, hdr_digest);
 	JSON_BOOL_OPTION(cfg, port_obj, data_digest);
 	JSON_BOOL_OPTION(cfg, port_obj, concat);
-	if (nvme_ctrl_is_persistent(c))
+	if (nvme_ctrl_get_persistent(c))
 		json_object_object_add(port_obj, "persistent",
 				       json_object_new_boolean(true));
-	if (nvme_ctrl_is_discovery_ctrl(c))
+	if (nvme_ctrl_get_discovery_ctrl(c))
 		json_object_object_add(port_obj, "discovery",
 				       json_object_new_boolean(true));
 
@@ -356,7 +356,7 @@ static void json_update_subsys(struct json_object *subsys_array,
 			       nvme_subsystem_t s)
 {
 	nvme_ctrl_t c;
-	const char *subsysnqn = nvme_subsystem_get_nqn(s), *app;
+	const char *subsysnqn = nvme_subsystem_get_subsysnqn(s), *app;
 	struct json_object *subsys_obj = json_object_new_object();
 	struct json_object *port_array;
 
@@ -512,10 +512,10 @@ static void json_dump_ctrl(struct json_object *ctrl_array, nvme_ctrl_t c)
 					       json_object_new_string(value));
 	}
 	JSON_BOOL_OPTION(cfg, ctrl_obj, concat);
-	if (nvme_ctrl_is_persistent(c))
+	if (nvme_ctrl_get_persistent(c))
 		json_object_object_add(ctrl_obj, "persistent",
 				       json_object_new_boolean(true));
-	if (nvme_ctrl_is_discovery_ctrl(c))
+	if (nvme_ctrl_get_discovery_ctrl(c))
 		json_object_object_add(ctrl_obj, "discovery",
 				       json_object_new_boolean(true));
 	json_object_array_add(ctrl_array, ctrl_obj);
@@ -602,7 +602,7 @@ static void json_dump_subsys(struct json_object *subsys_array,
 	json_object_object_add(subsys_obj, "name",
 			       json_object_new_string(nvme_subsystem_get_name(s)));
 	json_object_object_add(subsys_obj, "nqn",
-			       json_object_new_string(nvme_subsystem_get_nqn(s)));
+			       json_object_new_string(nvme_subsystem_get_subsysnqn(s)));
 
 	ns_array = json_object_new_array();
 	if (!json_dump_subsys_multipath(s, ns_array))

libnvme/src/nvme/tree.c

@@ -429,21 +429,6 @@ void nvme_root_release_fds(struct nvme_global_ctx *ctx)
 		nvme_host_release_fds(h);
 }
 
-const char *nvme_subsystem_get_nqn(nvme_subsystem_t s)
-{
-	return s->subsysnqn;
-}
-
-const char *nvme_subsystem_get_type(nvme_subsystem_t s)
-{
-	return s->subsystype;
-}
-
-const char *nvme_subsystem_get_fw_rev(nvme_subsystem_t s)
-{
-	return s->firmware;
-}
-
 nvme_ctrl_t nvme_subsystem_first_ctrl(nvme_subsystem_t s)
 {
 	return list_top(&s->ctrls, struct nvme_ctrl, entry);
@@ -955,26 +940,6 @@ struct nvme_fabrics_config *nvme_ctrl_get_config(nvme_ctrl_t c)
 	return &c->cfg;
 }
 
-bool nvme_ctrl_is_discovered(nvme_ctrl_t c)
-{
-	return c->discovered;
-}
-
-bool nvme_ctrl_is_persistent(nvme_ctrl_t c)
-{
-	return c->persistent;
-}
-
-bool nvme_ctrl_is_discovery_ctrl(nvme_ctrl_t c)
-{
-	return c->discovery_ctrl;
-}
-
-bool nvme_ctrl_is_unique_discovery_ctrl(nvme_ctrl_t c)
-{
-	return c->unique_discovery_ctrl;
-}
-
 int nvme_ctrl_identify(nvme_ctrl_t c, struct nvme_id_ctrl *id)
 {
 	struct nvme_transport_handle *hdl = nvme_ctrl_get_transport_handle(c);
@@ -1363,7 +1328,7 @@ static bool _tcp_match_ctrl(struct nvme_ctrl *c, struct candidate_args *candidat
 	if (!candidate->addreq(c->traddr, candidate->traddr))
 		return false;
 
-	if (candidate->well_known_nqn && !nvme_ctrl_is_discovery_ctrl(c))
+	if (candidate->well_known_nqn && !nvme_ctrl_get_discovery_ctrl(c))
 		return false;
 
 	if (candidate->subsysnqn && !streq0(c->subsysnqn, candidate->subsysnqn))
@@ -1409,7 +1374,7 @@ static bool _match_ctrl(struct nvme_ctrl *c, struct candidate_args *candidate)
 	    !streq0(c->trsvcid, candidate->trsvcid))
 		return false;
 
-	if (candidate->well_known_nqn && !nvme_ctrl_is_discovery_ctrl(c))
+	if (candidate->well_known_nqn && !nvme_ctrl_get_discovery_ctrl(c))
 		return false;
 
 	if (candidate->subsysnqn && !streq0(c->subsysnqn, candidate->subsysnqn))

libnvme/src/nvme/tree.h

@@ -775,41 +775,6 @@ const char *nvme_ns_head_get_sysfs_dir(nvme_ns_head_t head);
  */
 struct nvme_fabrics_config *nvme_ctrl_get_config(nvme_ctrl_t c);
 
-/**
- * nvme_ctrl_is_discovered() - Returns the value of the 'discovered' flag
- * @c:	Controller instance
- *
- * Return: Value of the 'discovered' flag of @c
- */
-bool nvme_ctrl_is_discovered(nvme_ctrl_t c);
-
-/**
- * nvme_ctrl_is_persistent() - Returns the value of the 'persistent' flag
- * @c:	Controller instance
- *
- * Return: Value of the 'persistent' flag of @c
- */
-bool nvme_ctrl_is_persistent(nvme_ctrl_t c);
-
-/**
- * nvme_ctrl_is_discovery_ctrl() - Check the 'discovery_ctrl' flag
- * @c:	Controller to be checked
- *
- * Returns the value of the 'discovery_ctrl' flag which specifies whether
- * @c connects to a discovery subsystem.
- *
- * Return: Value of the 'discover_ctrl' flag
- */
-bool nvme_ctrl_is_discovery_ctrl(nvme_ctrl_t c);
-
-/**
- * nvme_ctrl_is_unique_discovery_ctrl() - Check the 'unique_discovery_ctrl' flag
- * @c:		Controller to be checked
- *
- * Return: Value of the 'unique_discovery_ctrl' flag
- */
-bool nvme_ctrl_is_unique_discovery_ctrl(nvme_ctrl_t c);
-
 /**
  * nvme_ctrl_identify() - Issues an 'identify controller' command
  * @c:	Controller instance
@@ -872,32 +837,6 @@ void nvme_free_ctrl(struct nvme_ctrl *c);
  */
 void nvme_unlink_ctrl(struct nvme_ctrl *c);
 
-/**
- * nvme_subsystem_get_nqn() - Retrieve NQN from subsystem
- * @s:	nvme_subsystem_t object
- *
- * Return: NQN of subsystem
- */
-const char *nvme_subsystem_get_nqn(nvme_subsystem_t s);
-
-/**
- * nvme_subsystem_get_type() - Returns the type of a subsystem
- * @s:	nvme_subsystem_t object
- *
- * Returns the subsystem type of @s.
- *
- * Return: 'nvm' or 'discovery'
- */
-const char *nvme_subsystem_get_type(nvme_subsystem_t s);
-
-/**
- * nvme_subsystem_get_fw_rev() - Return the firmware rev of subsystem
- * @s:	nvme_subsystem_t object
- *
- * Return: Firmware revision of the current subsystem
- */
-const char *nvme_subsystem_get_fw_rev(nvme_subsystem_t s);
-
 /**
  * nvme_scan_topology() - Scan NVMe topology and apply filter
  * @ctx:    struct nvme_global_ctx object

libnvme/test/cpp.cc

@@ -34,7 +34,7 @@ int main()
 	nvme_for_each_host(ctx, h) {
 		nvme_for_each_subsystem(h, s) {
 			std::cout <<  nvme_subsystem_get_name(s)
-				  << " - NQN=" << nvme_subsystem_get_nqn(s)
+				  << " - NQN=" << nvme_subsystem_get_subsysnqn(s)
 				  << "\n";
 			nvme_subsystem_for_each_ctrl(s, c) {
 				std::cout << " `- " << nvme_ctrl_get_name(c)