Implement simple lvs/vgs/pvs commands.

daemon/actions.h

@@ -29,6 +29,9 @@ extern char *do_ll (const char *directory);
 extern char **do_ls (const char *directory);
 extern char **do_list_devices ();
 extern char **do_list_partitions ();
+extern char **do_pvs ();
+extern char **do_vgs ();
+extern char **do_lvs ();
 extern guestfs_lvm_int_pv_list *do_pvs_full ();
 extern guestfs_lvm_int_vg_list *do_vgs_full ();
 extern guestfs_lvm_int_lv_list *do_lvs_full ();

daemon/lvm.c

@@ -31,6 +31,121 @@
  * of writing it hasn't progressed very far.
  */
 
+static char **
+convert_lvm_output (char *out, char *prefix)
+{
+  char *p, *pend;
+  char **r = NULL;
+  int size = 0, alloc = 0;
+  char buf[256];
+  char *str;
+
+  p = out;
+  while (p) {
+    pend = strchr (p, '\n');	/* Get the next line of output. */
+    if (pend) {
+      *pend = '\0';
+      pend++;
+    }
+
+    while (*p && isspace (*p))	/* Skip any leading whitespace. */
+      p++;
+
+    if (!*p) {			/* Empty line?  Skip it. */
+      p = pend;
+      continue;
+    }
+
+    /* Prefix? */
+    if (prefix) {
+      snprintf (buf, sizeof buf, "%s%s", prefix, p);
+      str = buf;
+    } else
+      str = p;
+
+    if (add_string (&r, &size, &alloc, str) == -1) {
+      free (out);
+      return NULL;
+    }
+
+    p = pend;
+  }
+
+  free (out);
+
+  if (add_string (&r, &size, &alloc, NULL) == -1)
+    return NULL;
+
+  sort_strings (r, size-1);
+  return r;
+}
+
+char **
+do_pvs (void)
+{
+  char *out, *err;
+  int r;
+
+  r = command (&out, &err,
+	       "/sbin/lvm", "pvs", "-o", "pv_name", "--noheadings", NULL);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (out);
+    free (err);
+    return NULL;
+  }
+
+  free (err);
+
+  return convert_lvm_output (out, NULL);
+}
+
+char **
+do_vgs (void)
+{
+  char *out, *err;
+  int r;
+
+  r = command (&out, &err,
+	       "/sbin/lvm", "vgs", "-o", "vg_name", "--noheadings", NULL);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (out);
+    free (err);
+    return NULL;
+  }
+
+  free (err);
+
+  return convert_lvm_output (out, NULL);
+}
+
+char **
+do_lvs (void)
+{
+  char *out, *err;
+  int r;
+
+  r = command (&out, &err,
+	       "/sbin/lvm", "lvs",
+	       "-o", "vg_name,lv_name", "--noheadings",
+	       "--separator", "/", NULL);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (out);
+    free (err);
+    return NULL;
+  }
+
+  free (err);
+
+  return convert_lvm_output (out, "/dev/");
+}
+
+/* These were so complex to implement that I ended up auto-generating
+ * the code.  That code is in stubs.c, and it is generated as usual
+ * by generator.ml.
+ */
 guestfs_lvm_int_pv_list *
 do_pvs_full (void)
 {

daemon/stubs.c

@@ -199,6 +199,54 @@ static void list_partitions_stub (XDR *xdr_in)
   free_strings (r);
 }
 
+static void pvs_stub (XDR *xdr_in)
+{
+  char **r;
+
+  r = do_pvs ();
+  if (r == NULL)
+    /* do_pvs has already called reply_with_error, so just return */
+    return;
+
+  struct guestfs_pvs_ret ret;
+  ret.physvols.physvols_len = count_strings (r);
+  ret.physvols.physvols_val = r;
+  reply ((xdrproc_t) &xdr_guestfs_pvs_ret, (char *) &ret);
+  free_strings (r);
+}
+
+static void vgs_stub (XDR *xdr_in)
+{
+  char **r;
+
+  r = do_vgs ();
+  if (r == NULL)
+    /* do_vgs has already called reply_with_error, so just return */
+    return;
+
+  struct guestfs_vgs_ret ret;
+  ret.volgroups.volgroups_len = count_strings (r);
+  ret.volgroups.volgroups_val = r;
+  reply ((xdrproc_t) &xdr_guestfs_vgs_ret, (char *) &ret);
+  free_strings (r);
+}
+
+static void lvs_stub (XDR *xdr_in)
+{
+  char **r;
+
+  r = do_lvs ();
+  if (r == NULL)
+    /* do_lvs has already called reply_with_error, so just return */
+    return;
+
+  struct guestfs_lvs_ret ret;
+  ret.logvols.logvols_len = count_strings (r);
+  ret.logvols.logvols_val = r;
+  reply ((xdrproc_t) &xdr_guestfs_lvs_ret, (char *) &ret);
+  free_strings (r);
+}
+
 static void pvs_full_stub (XDR *xdr_in)
 {
   guestfs_lvm_int_pv_list *r;
@@ -271,6 +319,15 @@ void dispatch_incoming_message (XDR *xdr_in)
     case GUESTFS_PROC_LIST_PARTITIONS:
       list_partitions_stub (xdr_in);
       break;
+    case GUESTFS_PROC_PVS:
+      pvs_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_VGS:
+      vgs_stub (xdr_in);
+      break;
+    case GUESTFS_PROC_LVS:
+      lvs_stub (xdr_in);
+      break;
     case GUESTFS_PROC_PVS_FULL:
       pvs_full_stub (xdr_in);
       break;