X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=fish%2Falloc.c;h=7799e4e1c5f0b34ce079934eea7d7c0a13ecdcd3;hp=7533741438927758a1d697149d43d467389b8a09;hb=refs%2Fheads%2Fstable-1.10;hpb=5e1aff7856f721bf5737815a5b65c0de23ab0b0c

diff --git a/fish/alloc.c b/fish/alloc.c
index 7533741..7799e4e 100644
--- a/fish/alloc.c
+++ b/fish/alloc.c
@@ -31,7 +31,7 @@
 #include "fish.h"
 
 int
-do_alloc (const char *cmd, int argc, char *argv[])
+run_alloc (const char *cmd, size_t argc, char *argv[])
 {
   if (argc != 2) {
     fprintf (stderr, _("use 'alloc file size' to create an image\n"));
@@ -45,7 +45,7 @@ do_alloc (const char *cmd, int argc, char *argv[])
 }
 
 int
-do_sparse (const char *cmd, int argc, char *argv[])
+run_sparse (const char *cmd, size_t argc, char *argv[])
 {
   if (argc != 2) {
     fprintf (stderr, _("use 'sparse file size' to create a sparse image\n"));
@@ -58,8 +58,6 @@ do_sparse (const char *cmd, int argc, char *argv[])
   return 0;
 }
 
-static int parse_size (const char *str, off_t *size_rtn);
-
 /* This is the underlying allocation function.  It's called from
  * a few other places in guestfish.
  */
@@ -135,7 +133,9 @@ alloc_disk (const char *filename, const char *size_str, int add, int sparse)
   }
 
   if (add) {
-    if (guestfs_add_drive (g, filename) == -1) {
+    if (guestfs_add_drive_opts (g, filename,
+                                GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+                                -1) == -1) {
       unlink (filename);
       return -1;
     }
@@ -144,7 +144,7 @@ alloc_disk (const char *filename, const char *size_str, int add, int sparse)
   return 0;
 }
 
-static int
+int
 parse_size (const char *str, off_t *size_rtn)
 {
   unsigned long long size;
@@ -154,7 +154,7 @@ parse_size (const char *str, off_t *size_rtn)
   if (xerr != LONGINT_OK) {
     fprintf (stderr,
              _("%s: invalid integer parameter (%s returned %d)\n"),
-             "alloc_disk", "xstrtoull", xerr);
+             "parse_size", "xstrtoull", xerr);
     return -1;
   }