* 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 624dcf3..bee62d4 100644 (file)
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -176,8 +176,6 @@ do_pvcreate (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err,
                "/sbin/lvm", "pvcreate", device, NULL);
   if (r == -1) {
@@ -202,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));
@@ -262,7 +260,7 @@ 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);
 
@@ -352,8 +350,6 @@ do_lvremove (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err,
                "/sbin/lvm", "lvremove", "-f", device, NULL);
   if (r == -1) {
@@ -396,8 +392,6 @@ do_pvremove (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err,
                "/sbin/lvm", "pvremove", "-ff", device, NULL);
   if (r == -1) {
@@ -419,8 +413,6 @@ do_pvresize (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err,
                "/sbin/lvm", "pvresize", device, NULL);
   if (r == -1) {