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 0a4d5e4..4c7a643 100644 (file)
--- a/daemon/devsparts.c
+++ b/daemon/devsparts.c
@@ -46,7 +46,8 @@ do_list_devices (void)
 
   while ((d = readdir (dir)) != NULL) {
     if (strncmp (d->d_name, "sd", 2) == 0 ||
-       strncmp (d->d_name, "hd", 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);
@@ -87,7 +88,8 @@ do_list_partitions (void)
 
   while ((d = readdir (dir)) != NULL) {
     if (strncmp (d->d_name, "sd", 2) == 0 ||
-       strncmp (d->d_name, "hd", 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';
 
@@ -135,7 +137,7 @@ do_list_partitions (void)
 }
 
 int
-do_mkfs (const char *fstype, const char *device)
+do_mkfs (char *fstype, char *device)
 {
   char *err;
   int r;
@@ -152,46 +154,3 @@ do_mkfs (const char *fstype, const char *device)
   free (err);
   return 0;
 }
-
-int
-do_sfdisk (const char *device, int cyls, int heads, int sectors,
-          char * const* const lines)
-{
-  FILE *fp;
-  char buf[256];
-  int i;
-
-  IS_DEVICE (device, -1);
-
-  /* Safe because of IS_DEVICE above. */
-  strcpy (buf, "/sbin/sfdisk");
-  if (cyls)
-    sprintf (buf + strlen (buf), " -C %d", cyls);
-  if (heads)
-    sprintf (buf + strlen (buf), " -H %d", heads);
-  if (sectors)
-    sprintf (buf + strlen (buf), " -S %d", sectors);
-  sprintf (buf + strlen (buf), " %s", device);
-
-  fp = popen (buf, "w");
-  if (fp == NULL) {
-    reply_with_perror (buf);
-    return -1;
-  }
-
-  for (i = 0; lines[i] != NULL; ++i) {
-    if (fprintf (fp, "%s\n", lines[i]) < 0) {
-      reply_with_perror (buf);
-      fclose (fp);
-      return -1;
-    }
-  }
-
-  if (fclose (fp) == EOF) {
-    reply_with_perror (buf);
-    fclose (fp);
-    return -1;
-  }
-
-  return 0;
-}