libnvme: generate read-only accessor for 'phy_slot'

No reason why it should not be auto-generated.

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

Author: hreinecke

libnvme/src/accessors.ld

@@ -86,6 +86,7 @@ LIBNVME_ACCESSORS_3 {
 		nvme_ctrl_set_discovered;
 		nvme_ctrl_get_persistent;
 		nvme_ctrl_set_persistent;
+		nvme_ctrl_get_phy_slot;
 		nvme_subsystem_get_name;
 		nvme_subsystem_set_name;
 		nvme_subsystem_get_sysfs_dir;

libnvme/src/nvme/accessors.c

@@ -387,6 +387,11 @@ const char *nvme_ctrl_get_dctype(const struct nvme_ctrl *p)
 	return p->dctype;
 }
 
+const char *nvme_ctrl_get_phy_slot(const struct nvme_ctrl *p)
+{
+	return p->phy_slot;
+}
+
 void nvme_ctrl_set_host_traddr(struct nvme_ctrl *p, const char *host_traddr)
 {
 	free(p->host_traddr);

libnvme/src/nvme/accessors.h

@@ -532,6 +532,14 @@ void nvme_ctrl_set_dctype(struct nvme_ctrl *p, const char *dctype);
  */
 const char *nvme_ctrl_get_dctype(const struct nvme_ctrl *p);
 
+/**
+ * nvme_ctrl_get_phy_slot() - Get phy_slot.
+ * @p: The &struct nvme_ctrl instance to query.
+ *
+ * Return: The value of the phy_slot field, or NULL if not set.
+ */
+const char *nvme_ctrl_get_phy_slot(const struct nvme_ctrl *p);
+
 /**
  * nvme_ctrl_set_host_traddr() - Set host_traddr.
  * @p: The &struct nvme_ctrl instance to update.

libnvme/src/nvme/private.h

@@ -206,7 +206,7 @@ struct nvme_ctrl { /*!generate-accessors*/
 	char *cntrltype;
 	char *cntlid;
 	char *dctype;
-	char *phy_slot; //!accessors:none
+	char *phy_slot; //!accessors:readonly
 	char *host_traddr;
 	char *host_iface;
 	bool discovery_ctrl;

libnvme/src/nvme/tree.c

@@ -921,11 +921,6 @@ char *nvme_ctrl_get_src_addr(nvme_ctrl_t c, char *src_addr, size_t src_addr_len)
 	return src_addr;
 }
 
-const char *nvme_ctrl_get_phy_slot(nvme_ctrl_t c)
-{
-	return c->phy_slot ? c->phy_slot : "";
-}
-
 const char *nvme_ctrl_get_state(nvme_ctrl_t c)
 {
 	char *state = c->state;
@@ -1603,8 +1598,7 @@ static int nvme_ctrl_lookup_subsystem_name(struct nvme_global_ctx *ctx,
 }
 
 static int nvme_ctrl_lookup_phy_slot(struct nvme_global_ctx *ctx,
-				     const char *address,
-				     char **slotp)
+				     nvme_ctrl_t c)
 {
 	const char *slots_sysfs_dir = nvme_slots_sysfs_dir();
 	_cleanup_free_ char *target_addr = NULL;
@@ -1613,7 +1607,7 @@ static int nvme_ctrl_lookup_phy_slot(struct nvme_global_ctx *ctx,
 	char *slot;
 	int ret;
 
-	if (!address)
+	if (!c->address)
 		return -EINVAL;
 
 	slots_dir = opendir(slots_sysfs_dir);
@@ -1623,7 +1617,7 @@ static int nvme_ctrl_lookup_phy_slot(struct nvme_global_ctx *ctx,
 		return -errno;
 	}
 
-	target_addr = strndup(address, 10);
+	target_addr = strndup(c->address, 10);
 	while ((entry = readdir(slots_dir))) {
 		if (entry->d_type == DT_DIR &&
 		    strncmp(entry->d_name, ".", 1) != 0 &&
@@ -1647,7 +1641,7 @@ static int nvme_ctrl_lookup_phy_slot(struct nvme_global_ctx *ctx,
 			if (!slot)
 				return -ENOMEM;
 
-			*slotp = slot;
+			c->phy_slot = slot;
 			return 0;
 		}
 	}
@@ -1760,7 +1754,7 @@ static int nvme_reconfigure_ctrl(struct nvme_global_ctx *ctx, nvme_ctrl_t c, con
 	c->cntrltype = nvme_get_ctrl_attr(c, "cntrltype");
 	c->cntlid = nvme_get_ctrl_attr(c, "cntlid");
 	c->dctype = nvme_get_ctrl_attr(c, "dctype");
-	nvme_ctrl_lookup_phy_slot(ctx, c->address, &c->phy_slot);
+	nvme_ctrl_lookup_phy_slot(ctx, c);
 	nvme_read_sysfs_dhchap(ctx, c);
 	nvme_read_sysfs_tls(ctx, c);
 

libnvme/src/nvme/tree.h

@@ -726,15 +726,6 @@ void nvme_ctrl_release_transport_handle(nvme_ctrl_t c);
  */
 char *nvme_ctrl_get_src_addr(nvme_ctrl_t c, char *src_addr, size_t src_addr_len);
 
-/**
- * nvme_ctrl_get_phy_slot() - PCI physical slot number of a controller
- * @c:	Controller instance
- *
- * Return: PCI physical slot number of @c or empty string if slot
- * number is not present.
- */
-const char *nvme_ctrl_get_phy_slot(nvme_ctrl_t c);
-
 /**
  * nvme_ctrl_get_state() - Running state of a controller
  * @c:	Controller instance