* src/generator.ml: Change all `String "device"' to `Device "device"'.

[libguestfs.git] / daemon / lvm.c

diff --git a/daemon/lvm.c b/daemon/lvm.c
index 143c5a8..bee62d4 100644 (file)
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -93,7 +93,7 @@ do_pvs (void)
   int r;
 
   r = command (&out, &err,
-              "/sbin/lvm", "pvs", "-o", "pv_name", "--noheadings", NULL);
+               "/sbin/lvm", "pvs", "-o", "pv_name", "--noheadings", NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (out);
@@ -113,7 +113,7 @@ do_vgs (void)
   int r;
 
   r = command (&out, &err,
-              "/sbin/lvm", "vgs", "-o", "vg_name", "--noheadings", NULL);
+               "/sbin/lvm", "vgs", "-o", "vg_name", "--noheadings", NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (out);
@@ -133,9 +133,9 @@ do_lvs (void)
   int r;
 
   r = command (&out, &err,
-              "/sbin/lvm", "lvs",
-              "-o", "vg_name,lv_name", "--noheadings",
-              "--separator", "/", NULL);
+               "/sbin/lvm", "lvs",
+               "-o", "vg_name,lv_name", "--noheadings",
+               "--separator", "/", NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (out);
@@ -152,19 +152,19 @@ do_lvs (void)
  * the code.  That code is in stubs.c, and it is generated as usual
  * by generator.ml.
  */
-guestfs_lvm_int_pv_list *
+guestfs_int_lvm_pv_list *
 do_pvs_full (void)
 {
   return parse_command_line_pvs ();
 }
 
-guestfs_lvm_int_vg_list *
+guestfs_int_lvm_vg_list *
 do_vgs_full (void)
 {
   return parse_command_line_vgs ();
 }
 
-guestfs_lvm_int_lv_list *
+guestfs_int_lvm_lv_list *
 do_lvs_full (void)
 {
   return parse_command_line_lvs ();
@@ -176,10 +176,8 @@ do_pvcreate (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err,
-              "/sbin/lvm", "pvcreate", device, NULL);
+               "/sbin/lvm", "pvcreate", device, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -187,6 +185,9 @@ do_pvcreate (char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -199,7 +200,7 @@ do_vgcreate (char *volgroup, char **physvols)
 
   /* Check they are devices and also do device name translation. */
   for (i = 0; physvols[i] != NULL; ++i)
-    IS_DEVICE (physvols[i], -1);
+    RESOLVE_DEVICE (physvols[i], return -1);
 
   argc = count_strings (physvols) + 3;
   argv = malloc (sizeof (char *) * (argc + 1));
@@ -221,6 +222,9 @@ do_vgcreate (char *volgroup, char **physvols)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -234,8 +238,8 @@ do_lvcreate (char *logvol, char *volgroup, int mbytes)
   snprintf (size, sizeof size, "%d", mbytes);
 
   r = command (NULL, &err,
-              "/sbin/lvm", "lvcreate",
-              "-L", size, "-n", logvol, volgroup, NULL);
+               "/sbin/lvm", "lvcreate",
+               "-L", size, "-n", logvol, volgroup, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -243,6 +247,9 @@ do_lvcreate (char *logvol, char *volgroup, int mbytes)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -253,13 +260,13 @@ do_lvresize (char *logvol, int mbytes)
   int r;
   char size[64];
 
-  IS_DEVICE (logvol, -1);
+  RESOLVE_DEVICE (logvol, return -1);
 
   snprintf (size, sizeof size, "%d", mbytes);
 
   r = command (NULL, &err,
-              "/sbin/lvm", "lvresize",
-              "-L", size, logvol, NULL);
+               "/sbin/lvm", "lvresize",
+               "-L", size, logvol, NULL);
   if (r == -1) {
     reply_with_error ("lvresize: %s", err);
     free (err);
@@ -331,6 +338,8 @@ do_lvm_remove_all (void)
   }
   free_strings (xs);
 
+  udev_settle ();
+
   /* There, that was easy, sorry about your data. */
   return 0;
 }
@@ -341,10 +350,8 @@ do_lvremove (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err,
-              "/sbin/lvm", "lvremove", "-f", device, NULL);
+               "/sbin/lvm", "lvremove", "-f", device, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -352,6 +359,9 @@ do_lvremove (char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -362,7 +372,7 @@ do_vgremove (char *device)
   int r;
 
   r = command (NULL, &err,
-              "/sbin/lvm", "vgremove", "-f", device, NULL);
+               "/sbin/lvm", "vgremove", "-f", device, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -370,6 +380,9 @@ do_vgremove (char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -379,10 +392,8 @@ do_pvremove (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err,
-              "/sbin/lvm", "pvremove", "-ff", device, NULL);
+               "/sbin/lvm", "pvremove", "-ff", device, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -390,6 +401,9 @@ do_pvremove (char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -399,10 +413,8 @@ do_pvresize (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err,
-              "/sbin/lvm", "pvresize", device, NULL);
+               "/sbin/lvm", "pvresize", device, NULL);
   if (r == -1) {
     reply_with_error ("pvresize: %s: %s", device, err);
     free (err);
@@ -442,6 +454,9 @@ do_vg_activate (int activate, char **volgroups)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }