[OSS-Tools] [PATCH v2 7/8] libdt: use of_find_device_by_uuid for partuuid lookup

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

With the addition of of_find_device_by_uuid as part of the support for
barebox,storage-by-uuid, we don't need to rely on the device symlinks
created by 60-persistent-storage.rules and instead can just use libudev
directly, which we do elsewhere anyway. This has the added benefit
that we unify with the other code paths, where we determine the device
path through the struct udev_device.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 src/libdt.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/libdt.c b/src/libdt.c
index ae98543400b6..a55bc9b8d27d 100644
--- a/src/libdt.c
+++ b/src/libdt.c
@@ -2560,18 +2560,22 @@ static int __of_cdev_find(struct device_node *partition_node, struct cdev *cdev)
 		/* when partuuid is specified short-circuit the search for the cdev */
 		ret = of_property_read_string(partition_node, "partuuid", &uuid);
 		if (!ret) {
-			const char prefix[] = "/dev/disk/by-partuuid/";
-			size_t prefix_len = sizeof(prefix) - 1;
-			char *lc_uuid, *s;
+			u64 partsize;
+			int ret;
 
-			lc_uuid = xzalloc(prefix_len + strlen(uuid) + 1);
-			s = memcpy(lc_uuid, prefix, prefix_len) + prefix_len;
+			dev = of_find_device_by_uuid(NULL, uuid, false);
+			if (!dev) {
+				fprintf(stderr, "%s: cannot find device for uuid %s\n", __func__,
+					uuid);
+				return -ENODEV;
+			}
 
-			while (*uuid)
-				*s++ = tolower(*uuid++);
-
-			cdev->devpath = lc_uuid;
+			ret = udev_device_parse_sysattr_u64(dev, "size", &partsize);
+			if (ret)
+				return -EINVAL;
 
+			cdev->size = partsize * 512;
+			cdev->devpath = strdup(udev_device_get_devnode(dev));
 			return 0;
 		}
 	}
-- 
2.39.2