libnvme: read-only subsystem attributes

Nearly all subsystem attributes are fixed for the lifetime of the subsystem,
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

@@ -71,19 +71,12 @@ LIBNVME_ACCESSORS_3 {
 		nvme_ctrl_get_persistent;
 		nvme_ctrl_set_persistent;
 		nvme_subsystem_get_name;
-		nvme_subsystem_set_name;
 		nvme_subsystem_get_sysfs_dir;
-		nvme_subsystem_set_sysfs_dir;
 		nvme_subsystem_get_subsysnqn;
-		nvme_subsystem_set_subsysnqn;
 		nvme_subsystem_get_model;
-		nvme_subsystem_set_model;
 		nvme_subsystem_get_serial;
-		nvme_subsystem_set_serial;
 		nvme_subsystem_get_firmware;
-		nvme_subsystem_set_firmware;
 		nvme_subsystem_get_subsystype;
-		nvme_subsystem_set_subsystype;
 		nvme_subsystem_get_application;
 		nvme_subsystem_set_application;
 		nvme_subsystem_get_iopolicy;

libnvme/src/nvme/accessors.c

@@ -359,84 +359,36 @@ bool nvme_ctrl_get_persistent(const struct nvme_ctrl *p)
  * Accessors for: struct nvme_subsystem
  ****************************************************************************/
 
-void nvme_subsystem_set_name(struct nvme_subsystem *p, const char *name)
-{
-	free(p->name);
-	p->name = name ? strdup(name) : NULL;
-}
-
 const char *nvme_subsystem_get_name(const struct nvme_subsystem *p)
 {
 	return p->name;
 }
 
-void nvme_subsystem_set_sysfs_dir(
-		struct nvme_subsystem *p,
-		const char *sysfs_dir)
-{
-	free(p->sysfs_dir);
-	p->sysfs_dir = sysfs_dir ? strdup(sysfs_dir) : NULL;
-}
-
 const char *nvme_subsystem_get_sysfs_dir(const struct nvme_subsystem *p)
 {
 	return p->sysfs_dir;
 }
 
-void nvme_subsystem_set_subsysnqn(
-		struct nvme_subsystem *p,
-		const char *subsysnqn)
-{
-	free(p->subsysnqn);
-	p->subsysnqn = subsysnqn ? strdup(subsysnqn) : NULL;
-}
-
 const char *nvme_subsystem_get_subsysnqn(const struct nvme_subsystem *p)
 {
 	return p->subsysnqn;
 }
 
-void nvme_subsystem_set_model(struct nvme_subsystem *p, const char *model)
-{
-	free(p->model);
-	p->model = model ? strdup(model) : NULL;
-}
-
 const char *nvme_subsystem_get_model(const struct nvme_subsystem *p)
 {
 	return p->model;
 }
 
-void nvme_subsystem_set_serial(struct nvme_subsystem *p, const char *serial)
-{
-	free(p->serial);
-	p->serial = serial ? strdup(serial) : NULL;
-}
-
 const char *nvme_subsystem_get_serial(const struct nvme_subsystem *p)
 {
 	return p->serial;
 }
 
-void nvme_subsystem_set_firmware(struct nvme_subsystem *p, const char *firmware)
-{
-	free(p->firmware);
-	p->firmware = firmware ? strdup(firmware) : NULL;
-}
-
 const char *nvme_subsystem_get_firmware(const struct nvme_subsystem *p)
 {
 	return p->firmware;
 }
 
-void nvme_subsystem_set_subsystype(
-		struct nvme_subsystem *p,
-		const char *subsystype)
-{
-	free(p->subsystype);
-	p->subsystype = subsystype ? strdup(subsystype) : NULL;
-}
-
 const char *nvme_subsystem_get_subsystype(const struct nvme_subsystem *p)
 {
 	return p->subsystype;

libnvme/src/nvme/accessors.h

@@ -516,13 +516,6 @@ bool nvme_ctrl_get_persistent(const struct nvme_ctrl *p);
  * Accessors for: struct nvme_subsystem
  ****************************************************************************/
 
-/**
- * nvme_subsystem_set_name() - Set name.
- * @p: The &struct nvme_subsystem instance to update.
- * @name: New string; a copy is stored. Pass NULL to clear.
- */
-void nvme_subsystem_set_name(struct nvme_subsystem *p, const char *name);
-
 /**
  * nvme_subsystem_get_name() - Get name.
  * @p: The &struct nvme_subsystem instance to query.
@@ -531,15 +524,6 @@ void nvme_subsystem_set_name(struct nvme_subsystem *p, const char *name);
  */
 const char *nvme_subsystem_get_name(const struct nvme_subsystem *p);
 
-/**
- * nvme_subsystem_set_sysfs_dir() - Set sysfs_dir.
- * @p: The &struct nvme_subsystem instance to update.
- * @sysfs_dir: New string; a copy is stored. Pass NULL to clear.
- */
-void nvme_subsystem_set_sysfs_dir(
-		struct nvme_subsystem *p,
-		const char *sysfs_dir);
-
 /**
  * nvme_subsystem_get_sysfs_dir() - Get sysfs_dir.
  * @p: The &struct nvme_subsystem instance to query.
@@ -548,15 +532,6 @@ void nvme_subsystem_set_sysfs_dir(
  */
 const char *nvme_subsystem_get_sysfs_dir(const struct nvme_subsystem *p);
 
-/**
- * nvme_subsystem_set_subsysnqn() - Set subsysnqn.
- * @p: The &struct nvme_subsystem instance to update.
- * @subsysnqn: New string; a copy is stored. Pass NULL to clear.
- */
-void nvme_subsystem_set_subsysnqn(
-		struct nvme_subsystem *p,
-		const char *subsysnqn);
-
 /**
  * nvme_subsystem_get_subsysnqn() - Get subsysnqn.
  * @p: The &struct nvme_subsystem instance to query.
@@ -565,13 +540,6 @@ void nvme_subsystem_set_subsysnqn(
  */
 const char *nvme_subsystem_get_subsysnqn(const struct nvme_subsystem *p);
 
-/**
- * nvme_subsystem_set_model() - Set model.
- * @p: The &struct nvme_subsystem instance to update.
- * @model: New string; a copy is stored. Pass NULL to clear.
- */
-void nvme_subsystem_set_model(struct nvme_subsystem *p, const char *model);
-
 /**
  * nvme_subsystem_get_model() - Get model.
  * @p: The &struct nvme_subsystem instance to query.
@@ -580,13 +548,6 @@ void nvme_subsystem_set_model(struct nvme_subsystem *p, const char *model);
  */
 const char *nvme_subsystem_get_model(const struct nvme_subsystem *p);
 
-/**
- * nvme_subsystem_set_serial() - Set serial.
- * @p: The &struct nvme_subsystem instance to update.
- * @serial: New string; a copy is stored. Pass NULL to clear.
- */
-void nvme_subsystem_set_serial(struct nvme_subsystem *p, const char *serial);
-
 /**
  * nvme_subsystem_get_serial() - Get serial.
  * @p: The &struct nvme_subsystem instance to query.
@@ -595,15 +556,6 @@ void nvme_subsystem_set_serial(struct nvme_subsystem *p, const char *serial);
  */
 const char *nvme_subsystem_get_serial(const struct nvme_subsystem *p);
 
-/**
- * nvme_subsystem_set_firmware() - Set firmware.
- * @p: The &struct nvme_subsystem instance to update.
- * @firmware: New string; a copy is stored. Pass NULL to clear.
- */
-void nvme_subsystem_set_firmware(
-		struct nvme_subsystem *p,
-		const char *firmware);
-
 /**
  * nvme_subsystem_get_firmware() - Get firmware.
  * @p: The &struct nvme_subsystem instance to query.
@@ -612,15 +564,6 @@ void nvme_subsystem_set_firmware(
  */
 const char *nvme_subsystem_get_firmware(const struct nvme_subsystem *p);
 
-/**
- * nvme_subsystem_set_subsystype() - Set subsystype.
- * @p: The &struct nvme_subsystem instance to update.
- * @subsystype: New string; a copy is stored. Pass NULL to clear.
- */
-void nvme_subsystem_set_subsystype(
-		struct nvme_subsystem *p,
-		const char *subsystype);
-
 /**
  * nvme_subsystem_get_subsystype() - Get subsystype.
  * @p: The &struct nvme_subsystem instance to query.

libnvme/src/nvme/private.h

@@ -222,13 +222,13 @@ struct nvme_subsystem {
 	struct list_head namespaces;
 	struct nvme_host *h;
 
-	char *name;
-	char *sysfs_dir;
-	char *subsysnqn;
-	char *model;
-	char *serial;
-	char *firmware;
-	char *subsystype;
+	const char *name;
+	const char *sysfs_dir;
+	const char *subsysnqn;
+	const char *model;
+	const char *serial;
+	const char *firmware;
+	const char *subsystype;
 	char *application;
 	char *iopolicy;
 };

libnvme/src/nvme/tree.c

@@ -501,13 +501,13 @@ static void __nvme_free_subsystem(struct nvme_subsystem *s)
 	nvme_subsystem_for_each_ns_safe(s, n, _n)
 		__nvme_free_ns(n);
 
-	free(s->name);
-	free(s->sysfs_dir);
-	free(s->subsysnqn);
-	free(s->model);
-	free(s->serial);
-	free(s->firmware);
-	free(s->subsystype);
+	free((char *)s->name);
+	free((char *)s->sysfs_dir);
+	free((char *)s->subsysnqn);
+	free((char *)s->model);
+	free((char *)s->serial);
+	free((char *)s->firmware);
+	free((char *)s->subsystype);
 	free(s->application);
 	free(s->iopolicy);
 	free(s);