libnvme: auto-generate 'subsysnqn' accessors

No reason why it needs to be treated specially.

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

Author: hreinecke

libnvme/src/accessors.ld

@@ -45,6 +45,7 @@ LIBNVME_ACCESSORS_3 {
 		nvme_ctrl_get_serial;
 		nvme_ctrl_get_sqsize;
 		nvme_ctrl_get_transport;
+		nvme_ctrl_get_subsysnqn;
 		nvme_ctrl_get_traddr;
 		nvme_ctrl_get_trsvcid;
 		nvme_ctrl_get_dhchap_host_key;

libnvme/src/nvme/accessors.c

@@ -216,6 +216,11 @@ const char *nvme_ctrl_get_transport(const struct nvme_ctrl *p)
 	return p->transport;
 }
 
+const char *nvme_ctrl_get_subsysnqn(const struct nvme_ctrl *p)
+{
+	return p->subsysnqn;
+}
+
 const char *nvme_ctrl_get_traddr(const struct nvme_ctrl *p)
 {
 	return p->traddr;

libnvme/src/nvme/accessors.h

@@ -313,6 +313,14 @@ const char *nvme_ctrl_get_sqsize(const struct nvme_ctrl *p);
  */
 const char *nvme_ctrl_get_transport(const struct nvme_ctrl *p);
 
+/**
+ * nvme_ctrl_get_subsysnqn() - Get subsysnqn.
+ * @p: The &struct nvme_ctrl instance to query.
+ *
+ * Return: The value of the subsysnqn field, or NULL if not set.
+ */
+const char *nvme_ctrl_get_subsysnqn(const struct nvme_ctrl *p);
+
 /**
  * nvme_ctrl_get_traddr() - Get traddr.
  * @p: The &struct nvme_ctrl instance to query.

libnvme/src/nvme/private.h

@@ -195,7 +195,7 @@ struct nvme_ctrl { /*!generate-accessors*/
 	char *serial; //!accessors:readonly
 	char *sqsize; //!accessors:readonly
 	char *transport; //!accessors:readonly
-	char *subsysnqn; //!accessors:none
+	char *subsysnqn; //!accessors:readonly
 	char *traddr; //!accessors:readonly
 	char *trsvcid; //!accessors:readonly
 	char *dhchap_host_key;

libnvme/src/nvme/tree.c

@@ -890,11 +890,6 @@ nvme_subsystem_t nvme_ctrl_get_subsystem(nvme_ctrl_t c)
 }
 
 
-const char *nvme_ctrl_get_subsysnqn(nvme_ctrl_t c)
-{
-	return c->s ? c->s->subsysnqn : c->subsysnqn;
-}
-
 char *nvme_ctrl_get_src_addr(nvme_ctrl_t c, char *src_addr, size_t src_addr_len)
 {
 	size_t l;

libnvme/src/nvme/tree.h

@@ -734,14 +734,6 @@ char *nvme_ctrl_get_src_addr(nvme_ctrl_t c, char *src_addr, size_t src_addr_len)
  */
 const char *nvme_ctrl_get_state(nvme_ctrl_t c);
 
-/**
- * nvme_ctrl_get_subsysnqn() - Subsystem NQN of a controller
- * @c:	Controller instance
- *
- * Return: Subsystem NQN of @c
- */
-const char *nvme_ctrl_get_subsysnqn(nvme_ctrl_t c);
-
 /**
  * nvme_ctrl_get_subsystem() - Parent subsystem of a controller
  * @c:	Controller instance