libnvme: read-only host attributes

Some host attributes are fixed for the lifetime of the host,
so once established they cannot be changed. Consequently it's pointless
to have a 'setter' function as this would not do what's expected.

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

Author: hreinecke

libnvme/src/accessors.ld

@@ -82,9 +82,7 @@ LIBNVME_ACCESSORS_3 {
 		nvme_subsystem_get_iopolicy;
 		nvme_subsystem_set_iopolicy;
 		nvme_host_get_hostnqn;
-		nvme_host_set_hostnqn;
 		nvme_host_get_hostid;
-		nvme_host_set_hostid;
 		nvme_host_get_dhchap_host_key;
 		nvme_host_set_dhchap_host_key;
 		nvme_host_get_hostsymname;

libnvme/src/nvme/accessors.c

@@ -422,23 +422,11 @@ const char *nvme_subsystem_get_iopolicy(const struct nvme_subsystem *p)
  * Accessors for: struct nvme_host
  ****************************************************************************/
 
-void nvme_host_set_hostnqn(struct nvme_host *p, const char *hostnqn)
-{
-	free(p->hostnqn);
-	p->hostnqn = hostnqn ? strdup(hostnqn) : NULL;
-}
-
 const char *nvme_host_get_hostnqn(const struct nvme_host *p)
 {
 	return p->hostnqn;
 }
 
-void nvme_host_set_hostid(struct nvme_host *p, const char *hostid)
-{
-	free(p->hostid);
-	p->hostid = hostid ? strdup(hostid) : NULL;
-}
-
 const char *nvme_host_get_hostid(const struct nvme_host *p)
 {
 	return p->hostid;

libnvme/src/nvme/accessors.h

@@ -610,13 +610,6 @@ const char *nvme_subsystem_get_iopolicy(const struct nvme_subsystem *p);
  * Accessors for: struct nvme_host
  ****************************************************************************/
 
-/**
- * nvme_host_set_hostnqn() - Set hostnqn.
- * @p: The &struct nvme_host instance to update.
- * @hostnqn: New string; a copy is stored. Pass NULL to clear.
- */
-void nvme_host_set_hostnqn(struct nvme_host *p, const char *hostnqn);
-
 /**
  * nvme_host_get_hostnqn() - Get hostnqn.
  * @p: The &struct nvme_host instance to query.
@@ -625,13 +618,6 @@ void nvme_host_set_hostnqn(struct nvme_host *p, const char *hostnqn);
  */
 const char *nvme_host_get_hostnqn(const struct nvme_host *p);
 
-/**
- * nvme_host_set_hostid() - Set hostid.
- * @p: The &struct nvme_host instance to update.
- * @hostid: New string; a copy is stored. Pass NULL to clear.
- */
-void nvme_host_set_hostid(struct nvme_host *p, const char *hostid);
-
 /**
  * nvme_host_get_hostid() - Get hostid.
  * @p: The &struct nvme_host instance to query.

libnvme/src/nvme/private.h

@@ -238,8 +238,8 @@ struct nvme_host {
 	struct list_head subsystems;
 	struct nvme_global_ctx *ctx;
 
-	char *hostnqn;
-	char *hostid;
+	const char *hostnqn;
+	const char *hostid;
 	char *dhchap_host_key;
 	char *hostsymname;
 	bool pdc_enabled;

libnvme/src/nvme/tree.c

@@ -599,8 +599,8 @@ void __nvme_free_host(struct nvme_host *h)
 	list_del_init(&h->entry);
 	nvme_for_each_subsystem_safe(h, s, _s)
 		__nvme_free_subsystem(s);
-	free(h->hostnqn);
-	free(h->hostid);
+	free((char *)h->hostnqn);
+	free((char *)h->hostid);
 	free(h->dhchap_host_key);
 	nvme_host_set_hostsymname(h, NULL);
 	free(h);