Add the disk ident and a human-meaningful description (here, the disk model

string) to the geom_disk config XML so that they are easily accessible from
userland.

MFC after:	1 week

2 files changed, 3 insertions, 0 deletions

diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 1d17e81..818b656 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -371,6 +371,8 @@ g_disk_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g
 		    indent, dp->d_fwheads);
 		sbuf_printf(sb, "%s<fwsectors>%u</fwsectors>\n",
 		    indent, dp->d_fwsectors);
+		sbuf_printf(sb, "%s<ident>%s</ident>\n", indent, dp->d_ident);
+		sbuf_printf(sb, "%s<descr>%s</descr>\n", indent, dp->d_descr);
 	}
 }
 
diff --git a/sys/geom/geom_disk.h b/sys/geom/geom_disk.h
index 01dd732..2d5f15d 100644
--- a/sys/geom/geom_disk.h
+++ b/sys/geom/geom_disk.h
@@ -85,6 +85,7 @@ struct disk {
 	u_int			d_stripeoffset;
 	u_int			d_stripesize;
 	char			d_ident[DISK_IDENT_SIZE];
+	char			d_descr[DISK_IDENT_SIZE];
 	uint16_t		d_hba_vendor;
 	uint16_t		d_hba_device;
 	uint16_t		d_hba_subvendor;