X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Flvm.c;h=82cdf3fb482080fcac6d94f05f6d486654b53bdc;hp=7a05a5402dfdce342bfff0f4478baa1b002d94d9;hb=50d2af4f8541a81d047753d7d300804ff649230c;hpb=74fe427460bd2d455d2860c937ae81a8b5a1d1e7

diff --git a/daemon/lvm.c b/daemon/lvm.c
index 7a05a54..82cdf3f 100644
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -270,7 +270,7 @@ do_lvresize (const char *logvol, int mbytes)
                "/sbin/lvm", "lvresize",
                "-L", size, logvol, NULL);
   if (r == -1) {
-    reply_with_error ("lvresize: %s", err);
+    reply_with_error ("%s", err);
     free (err);
     return -1;
   }
@@ -418,7 +418,7 @@ do_pvresize (const char *device)
   r = command (NULL, &err,
                "/sbin/lvm", "pvresize", device, NULL);
   if (r == -1) {
-    reply_with_error ("pvresize: %s: %s", device, err);
+    reply_with_error ("%s: %s", device, err);
     free (err);
     return -1;
   }
@@ -479,7 +479,7 @@ do_lvrename (const char *logvol, const char *newlogvol)
                "/sbin/lvm", "lvrename",
                logvol, newlogvol, NULL);
   if (r == -1) {
-    reply_with_error ("lvrename: %s -> %s: %s", logvol, newlogvol, err);
+    reply_with_error ("%s -> %s: %s", logvol, newlogvol, err);
     free (err);
     return -1;
   }
@@ -501,7 +501,7 @@ do_vgrename (const char *volgroup, const char *newvolgroup)
                "/sbin/lvm", "vgrename",
                volgroup, newvolgroup, NULL);
   if (r == -1) {
-    reply_with_error ("vgrename: %s -> %s: %s", volgroup, newvolgroup, err);
+    reply_with_error ("%s -> %s: %s", volgroup, newvolgroup, err);
     free (err);
     return -1;
   }
@@ -512,3 +512,86 @@ do_vgrename (const char *volgroup, const char *newvolgroup)
 
   return 0;
 }
+
+static char *
+get_lvm_field (const char *cmd, const char *field, const char *device)
+{
+  char *out;
+  char *err;
+  int r = command (&out, &err,
+                   "/sbin/lvm", cmd,
+                   "--unbuffered", "--noheadings", "-o", field,
+                   device, NULL);
+  if (r == -1) {
+    reply_with_error ("%s: %s", device, err);
+    free (out);
+    free (err);
+    return NULL;
+  }
+
+  free (err);
+
+  trim (out);
+  return out;                   /* Caller frees. */
+}
+
+char *
+do_pvuuid (const char *device)
+{
+  return get_lvm_field ("pvs", "pv_uuid", device);
+}
+
+char *
+do_vguuid (const char *vgname)
+{
+  return get_lvm_field ("vgs", "vg_uuid", vgname);
+}
+
+char *
+do_lvuuid (const char *device)
+{
+  return get_lvm_field ("lvs", "lv_uuid", device);
+}
+
+static char **
+get_lvm_fields (const char *cmd, const char *field, const char *device)
+{
+  char *out;
+  char *err;
+  int r = command (&out, &err,
+                   "/sbin/lvm", cmd,
+                   "--unbuffered", "--noheadings", "-o", field,
+                   device, NULL);
+  if (r == -1) {
+    reply_with_error ("%s: %s", device, err);
+    free (out);
+    free (err);
+    return NULL;
+  }
+
+  free (err);
+
+  char **ret = split_lines (out);
+  free (out);
+
+  if (ret == NULL)
+    return NULL;
+
+  size_t i;
+  for (i = 0; ret[i] != NULL; ++i)
+    trim (ret[i]);
+
+  return ret;
+}
+
+char **
+do_vgpvuuids (const char *vgname)
+{
+  return get_lvm_fields ("vgs", "pv_uuid", vgname);
+}
+
+char **
+do_vglvuuids (const char *vgname)
+{
+  return get_lvm_fields ("vgs", "lv_uuid", vgname);
+}