Change to use virtio_blk (virtio block device) by default.

[libguestfs.git] / daemon / devsparts.c

diff --git a/daemon/devsparts.c b/daemon/devsparts.c
index b0d7956..4c7a643 100644 (file)
--- a/daemon/devsparts.c
+++ b/daemon/devsparts.c
@@ -45,7 +45,9 @@ do_list_devices (void)
   }
 
   while ((d = readdir (dir)) != NULL) {
-    if (strncmp (d->d_name, "sd", 2) == 0) {
+    if (strncmp (d->d_name, "sd", 2) == 0 ||
+       strncmp (d->d_name, "hd", 2) == 0 ||
+       strncmp (d->d_name, "vd", 2) == 0) {
       snprintf (buf, sizeof buf, "/dev/%s", d->d_name);
       if (add_string (&r, &size, &alloc, buf) == -1) {
        closedir (dir);
@@ -85,7 +87,9 @@ do_list_partitions (void)
   }
 
   while ((d = readdir (dir)) != NULL) {
-    if (strncmp (d->d_name, "sd", 2) == 0) {
+    if (strncmp (d->d_name, "sd", 2) == 0 ||
+       strncmp (d->d_name, "hd", 2) == 0 ||
+       strncmp (d->d_name, "vd", 2) == 0) {
       strncpy (devname, d->d_name, sizeof devname);
       devname[sizeof devname - 1] = '\0';
 
@@ -131,3 +135,22 @@ do_list_partitions (void)
   sort_strings (r, size-1);
   return r;
 }
+
+int
+do_mkfs (char *fstype, char *device)
+{
+  char *err;
+  int r;
+
+  IS_DEVICE (device, -1);
+
+  r = command (NULL, &err, "/sbin/mkfs", "-t", fstype, device, NULL);
+  if (r == -1) {
+    reply_with_error ("mkfs: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}