master - report: Make PV UUID into a "label" type field.

[Petr Rockai]

Gitweb:       
http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a8aa8d4b5c5722...
Commit:        a8aa8d4b5c5722cab871c3243a203d26d6f5ac83
Parent:        67a7b7a87da65b2350f975272e581be5f41976e0
Author:        Petr Rockai <prockai(a)redhat.com&gt;
AuthorDate:    Mon Jul 29 19:15:31 2013 +0200
Committer:     Petr Rockai <prockai(a)redhat.com&gt;
CommitterDate: Sun Nov 17 21:43:06 2013 +0100

report: Make PV UUID into a "label" type field.

---
 lib/report/columns.h   |    2 +-
 lib/report/report.c    |   14 ++++++++++++++
 test/shell/listings.sh |    4 +++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/report/columns.h b/lib/report/columns.h
index 8a87d11..0617605 100644
--- a/lib/report/columns.h
+++ b/lib/report/columns.h
@@ -66,8 +66,8 @@ FIELD(LVS, lv, STR, "Time", lvid, 26, lvtime, lv_time,
"Creation time of the LV,
 FIELD(LVS, lv, STR, "Host", lvid, 10, lvhost, lv_host, "Creation host of
the LV, if known.", 0)
 FIELD(LVS, lv, STR, "Modules", lvid, 7, modules, lv_modules, "Kernel
device-mapper modules required for this LV.", 0)
 
-FIELD(LABEL, pv, STR, "PV UUID", id, 38, uuid, pv_uuid, "Unique
identifier.", 0)
 FIELD(LABEL, label, STR, "Fmt", type, 3, pvfmt, pv_fmt, "Type of
metadata.", 0)
+FIELD(LABEL, label, STR, "PV UUID", type, 38, pvuuid, pv_uuid, "Unique
identifier.", 0)
 FIELD(LABEL, label, NUM, "DevSize", dev, 7, devsize, dev_size, "Size of
underlying device in current units.", 0)
 FIELD(LABEL, label, STR, "PV", dev, 10, dev_name, pv_name, "Name.",
0)
 FIELD(LABEL, label, NUM, "PMdaFree", type, 9, pvmdafree, pv_mda_free,
"Free metadata area space on this device in current units.", 0)
diff --git a/lib/report/report.c b/lib/report/report.c
index 3f716b5..dee4ea2 100644
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -720,6 +720,20 @@ static int _uuid_disp(struct dm_report *rh __attribute__((unused)),
struct dm_po
 	return _field_set_value(field, repstr, NULL);
 }
 
+static int _pvuuid_disp(struct dm_report *rh __attribute__((unused)), struct dm_pool
*mem,
+		        struct dm_report_field *field,
+		        const void *data, void *private __attribute__((unused)))
+{
+	const struct label *label = (const struct label *) data;
+	char *repstr = NULL;
+
+	if (!(repstr = id_format_and_copy(mem, label->dev->pvid)))
+		return_0;
+
+	dm_report_field_set_value(field, repstr, NULL);
+	return 1;
+}
+
 static int _pvmdas_disp(struct dm_report *rh, struct dm_pool *mem,
 			struct dm_report_field *field,
 			const void *data, void *private)
diff --git a/test/shell/listings.sh b/test/shell/listings.sh
index 30df79f..0d4c83f 100644
--- a/test/shell/listings.sh
+++ b/test/shell/listings.sh
@@ -17,7 +17,7 @@
 
 aux prepare_devs 5
 
-pvcreate "$dev1"
+pvcreate --uuid BADBEE-BAAD-BAAD-BAAD-BAAD-BAAD-BADBEE --norestorefile "$dev1"
 pvcreate --metadatacopies 0 "$dev2"
 pvcreate --metadatacopies 0 "$dev3"
 pvcreate "$dev4"
@@ -31,6 +31,8 @@ test $(pvs --noheadings -o seg_all,pv_all,lv_all,vg_all $(cat DEVICES) |
wc -l)
 
 vgcreate $vg $(cat DEVICES)
 
+check pv_field $dev1 pv_uuid BADBEE-BAAD-BAAD-BAAD-BAAD-BAAD-BADBEE
+
 #COMM pvs and vgs report mda_count, mda_free (bz202886, bz247444)
 pvs -o +pv_mda_count,pv_mda_free $(cat DEVICES)
 for I in "$dev2" "$dev3" "$dev5"; do