adjust const "**" pointers to avoid warnings

Also, ...
* src/generator.ml: Add DeviceList type, and propagate that change
out to all calling/interface code.

diff --git a/daemon/augeas.c b/daemon/augeas.c
index 7de3624..3628219 100644 (file)
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -376,7 +376,7 @@ do_aug_ls (const char *path)
   if (matches == NULL)
     return NULL;               /* do_aug_match has already sent the error */
 
   if (matches == NULL)
     return NULL;               /* do_aug_match has already sent the error */
 

-  sort_strings (matches, count_strings (matches));
+  sort_strings (matches, count_strings ((void *) matches));

   return matches;              /* Caller frees. */
 #else
   reply_with_error ("%s is not available", __func__);
   return matches;              /* Caller frees. */
 #else
   reply_with_error ("%s is not available", __func__);

diff --git a/daemon/blockdev.c b/daemon/blockdev.c
index 0745007..e0ac350 100644 (file)
--- a/daemon/blockdev.c
+++ b/daemon/blockdev.c
@@ -53,7 +53,7 @@ call_blockdev (const char *device, char *switc, int extraarg, int prints)
   } else
     argv[2] = device;
 
   } else
     argv[2] = device;
 

-  r = commandv (&out, &err, argv);
+  r = commandv (&out, &err, (char **) argv);

 
   if (r == -1) {
     reply_with_error ("%s: %s", argv[0], err);
 
   if (r == -1) {
     reply_with_error ("%s: %s", argv[0], err);

diff --git a/daemon/command.c b/daemon/command.c
index 9e23e57..9fbbd95 100644 (file)
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -27,7 +27,7 @@
 #include "actions.h"
 
 char *
 #include "actions.h"
 
 char *

-do_command (char **argv)
+do_command (char *const *argv)

 {
   char *out, *err;
   int r;
 {
   char *out, *err;
   int r;


@@ -113,7 +113,7 @@ do_command (char **argv)
 }
 
 char **
 }
 
 char **

-do_command_lines (char **argv)
+do_command_lines (char *const *argv)

 {
   char *out;
   char **lines;
 {
   char *out;
   char **lines;


@@ -134,15 +134,15 @@ do_command_lines (char **argv)
 char *
 do_sh (const char *command)
 {
 char *
 do_sh (const char *command)
 {

-  char *argv[] = { "/bin/sh", "-c", command, NULL };
+  const char *argv[] = { "/bin/sh", "-c", command, NULL };

 
 

-  return do_command (argv);
+  return do_command ((char **) argv);

 }
 
 char **
 do_sh_lines (const char *command)
 {
 }
 
 char **
 do_sh_lines (const char *command)
 {

-  char *argv[] = { "/bin/sh", "-c", command, NULL };
+  const char *argv[] = { "/bin/sh", "-c", command, NULL };

 
 

-  return do_command_lines (argv);
+  return do_command_lines ((char **) argv);

 }
 }

diff --git a/daemon/daemon.h b/daemon/daemon.h
index cbcab63..2a2b840 100644 (file)
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -40,7 +40,7 @@ extern int xwrite (int sock, const void *buf, size_t len);
 extern int xread (int sock, void *buf, size_t len);
 
 extern int add_string (char ***argv, int *size, int *alloc, const char *str);
 extern int xread (int sock, void *buf, size_t len);
 
 extern int add_string (char ***argv, int *size, int *alloc, const char *str);

-extern int count_strings (char * const* const argv);
+extern int count_strings (char *const *argv);

 extern void sort_strings (char **argv, int len);
 extern void free_strings (char **argv);
 extern void free_stringslen (char **argv, int len);
 extern void sort_strings (char **argv, int len);
 extern void free_strings (char **argv);
 extern void free_stringslen (char **argv, int len);


@@ -48,9 +48,9 @@ extern void free_stringslen (char **argv, int len);
 extern int command (char **stdoutput, char **stderror, const char *name, ...);
 extern int commandr (char **stdoutput, char **stderror, const char *name, ...);
 extern int commandv (char **stdoutput, char **stderror,
 extern int command (char **stdoutput, char **stderror, const char *name, ...);
 extern int commandr (char **stdoutput, char **stderror, const char *name, ...);
 extern int commandv (char **stdoutput, char **stderror,

-                     char * const* const argv);
+                     char *const *argv);

 extern int commandrv (char **stdoutput, char **stderror,
 extern int commandrv (char **stdoutput, char **stderror,

-                      char * const* const argv);
+                      char const* const *argv);

 
 extern char **split_lines (char *str);
 
 
 extern char **split_lines (char *str);
 

diff --git a/daemon/debug.c b/daemon/debug.c
index 58a5061..b428588 100644 (file)
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -67,7 +67,7 @@ static struct cmd cmds[] = {
 #endif
 
 char *
 #endif
 
 char *

-do_debug (const char *subcmd MAYBE_UNUSED, char **argv MAYBE_UNUSED)
+do_debug (const char *subcmd MAYBE_UNUSED, char *const *argv MAYBE_UNUSED)

 {
 #if ENABLE_DEBUG_COMMAND
   int argc, i;
 {
 #if ENABLE_DEBUG_COMMAND
   int argc, i;

diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index b013661..fad49fb 100644 (file)
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -351,7 +351,7 @@ add_string (char ***argv, int *size, int *alloc, const char *str)
 }
 
 int
 }
 
 int

-count_strings (char * const* const argv)
+count_strings (char *const *argv)

 {
   int argc;
 
 {
   int argc;
 


@@ -403,7 +403,7 @@ int
 command (char **stdoutput, char **stderror, const char *name, ...)
 {
   va_list args;
 command (char **stdoutput, char **stderror, const char *name, ...)
 {
   va_list args;

-  char **argv, **p;
+  const char **argv;

   char *s;
   int i, r;
 
   char *s;
   int i, r;
 


@@ -420,7 +420,7 @@ command (char **stdoutput, char **stderror, const char *name, ...)
   va_start (args, name);
 
   while ((s = va_arg (args, char *)) != NULL) {
   va_start (args, name);
 
   while ((s = va_arg (args, char *)) != NULL) {

-    p = realloc (argv, sizeof (char *) * (++i));
+    const char **p = realloc (argv, sizeof (char *) * (++i));

     if (p == NULL) {
       perror ("realloc");
       free (argv);
     if (p == NULL) {
       perror ("realloc");
       free (argv);


@@ -434,7 +434,7 @@ command (char **stdoutput, char **stderror, const char *name, ...)
 
   va_end (args);
 
 
   va_end (args);
 

-  r = commandv (stdoutput, stderror, argv);
+  r = commandv (stdoutput, stderror, (char **) argv);

 
   /* NB: Mustn't free the strings which are on the stack. */
   free (argv);
 
   /* NB: Mustn't free the strings which are on the stack. */
   free (argv);


@@ -450,7 +450,7 @@ int
 commandr (char **stdoutput, char **stderror, const char *name, ...)
 {
   va_list args;
 commandr (char **stdoutput, char **stderror, const char *name, ...)
 {
   va_list args;

-  char **argv, **p;
+  const char **argv;

   char *s;
   int i, r;
 
   char *s;
   int i, r;
 


@@ -467,7 +467,7 @@ commandr (char **stdoutput, char **stderror, const char *name, ...)
   va_start (args, name);
 
   while ((s = va_arg (args, char *)) != NULL) {
   va_start (args, name);
 
   while ((s = va_arg (args, char *)) != NULL) {

-    p = realloc (argv, sizeof (char *) * (++i));
+    const char **p = realloc (argv, sizeof (char *) * (++i));

     if (p == NULL) {
       perror ("realloc");
       free (argv);
     if (p == NULL) {
       perror ("realloc");
       free (argv);


@@ -491,11 +491,11 @@ commandr (char **stdoutput, char **stderror, const char *name, ...)
 
 /* Same as 'command', but passing an argv. */
 int
 
 /* Same as 'command', but passing an argv. */
 int

-commandv (char **stdoutput, char **stderror, char * const* const argv)
+commandv (char **stdoutput, char **stderror, char *const *argv)

 {
   int r;
 
 {
   int r;
 

-  r = commandrv (stdoutput, stderror, argv);
+  r = commandrv (stdoutput, stderror, (void *) argv);

   if (r == 0)
     return 0;
   else
   if (r == 0)
     return 0;
   else


@@ -503,7 +503,7 @@ commandv (char **stdoutput, char **stderror, char * const* const argv)
 }
 
 int
 }
 
 int

-commandrv (char **stdoutput, char **stderror, char * const* const argv)
+commandrv (char **stdoutput, char **stderror, char const* const *argv)

 {
   int so_size = 0, se_size = 0;
   int so_fd[2], se_fd[2];
 {
   int so_size = 0, se_size = 0;
   int so_fd[2], se_fd[2];


@@ -547,7 +547,7 @@ commandrv (char **stdoutput, char **stderror, char * const* const argv)
     close (so_fd[1]);
     close (se_fd[1]);
 
     close (so_fd[1]);
     close (se_fd[1]);
 

-    execvp (argv[0], argv);
+    execvp (argv[0], (void *) argv);

     perror (argv[0]);
     _exit (1);
   }
     perror (argv[0]);
     _exit (1);
   }

diff --git a/daemon/lvm.c b/daemon/lvm.c
index ddc125c..742b40b 100644 (file)
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -192,16 +192,12 @@ do_pvcreate (const char *device)
 }
 
 int
 }
 
 int

-do_vgcreate (const char *volgroup, char **physvols)
+do_vgcreate (const char *volgroup, char *const *physvols)

 {
   char *err;
   int r, argc, i;
   const char **argv;
 
 {
   char *err;
   int r, argc, i;
   const char **argv;
 

-  /* Check they are devices and also do device name translation. */
-  for (i = 0; physvols[i] != NULL; ++i)
-    RESOLVE_DEVICE (physvols[i], return -1);
-

   argc = count_strings (physvols) + 3;
   argv = malloc (sizeof (char *) * (argc + 1));
   if (argv == NULL) {
   argc = count_strings (physvols) + 3;
   argv = malloc (sizeof (char *) * (argc + 1));
   if (argv == NULL) {


@@ -214,7 +210,7 @@ do_vgcreate (const char *volgroup, char **physvols)
   for (i = 3; i <= argc; ++i)
     argv[i] = physvols[i-3];
 
   for (i = 3; i <= argc; ++i)
     argv[i] = physvols[i-3];
 

-  r = commandv (NULL, &err, argv);
+  r = commandv (NULL, &err, (char **) argv);

   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);


@@ -424,7 +420,7 @@ do_pvresize (const char *device)
 }
 
 int
 }
 
 int

-do_vg_activate (int activate, char **volgroups)
+do_vg_activate (int activate, char *const *volgroups)

 {
   char *err;
   int r, i, argc;
 {
   char *err;
   int r, i, argc;


@@ -444,7 +440,7 @@ do_vg_activate (int activate, char **volgroups)
   for (i = 4; i <= argc; ++i)
     argv[i] = volgroups[i-4];
 
   for (i = 4; i <= argc; ++i)
     argv[i] = volgroups[i-4];
 

-  r = commandv (NULL, &err, argv);
+  r = commandv (NULL, &err, (char **) argv);

   if (r == -1) {
     reply_with_error ("vgchange: %s", err);
     free (err);
   if (r == -1) {
     reply_with_error ("vgchange: %s", err);
     free (err);

diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index 8a5a46b..6d49387 100644 (file)
--- a/daemon/sfdisk.c
+++ b/daemon/sfdisk.c
@@ -32,7 +32,7 @@
 static int
 sfdisk (const char *device, int n, int cyls, int heads, int sectors,
         const char *extra_flag,
 static int
 sfdisk (const char *device, int n, int cyls, int heads, int sectors,
         const char *extra_flag,

-        char * const* const lines)
+        char *const *lines)

 {
   FILE *fp;
   char buf[256];
 {
   FILE *fp;
   char buf[256];


@@ -96,7 +96,7 @@ sfdisk (const char *device, int n, int cyls, int heads, int sectors,
 
 int
 do_sfdisk (const char *device, int cyls, int heads, int sectors,
 
 int
 do_sfdisk (const char *device, int cyls, int heads, int sectors,

-           char **lines)
+           char *const *lines)

 {
   return sfdisk (device, 0, cyls, heads, sectors, NULL, lines);
 }
 {
   return sfdisk (device, 0, cyls, heads, sectors, NULL, lines);
 }


@@ -105,13 +105,13 @@ int
 do_sfdisk_N (const char *device, int n, int cyls, int heads, int sectors,
              const char *line)
 {
 do_sfdisk_N (const char *device, int n, int cyls, int heads, int sectors,
              const char *line)
 {

-  const char *lines[2] = { line, NULL };
+  char const *const lines[2] = { line, NULL };

 
 

-  return sfdisk (device, n, cyls, heads, sectors, NULL, lines);
+  return sfdisk (device, n, cyls, heads, sectors, NULL, (void *) lines);

 }
 
 int
 }
 
 int

-do_sfdiskM (const char *device, char **lines)
+do_sfdiskM (const char *device, char *const *lines)

 {
   return sfdisk (device, 0, 0, 0, 0, "-uM", lines);
 }
 {
   return sfdisk (device, 0, 0, 0, 0, "-uM", lines);
 }

diff --git a/fish/fish.c b/fish/fish.c
index f31f4ad..830617b 100644 (file)
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -974,7 +974,7 @@ free_strings (char **argv)
 }
 
 int
 }
 
 int

-count_strings (char * const * const argv)
+count_strings (char *const *argv)

 {
   int c;
 
 {
   int c;
 


@@ -984,7 +984,7 @@ count_strings (char * const * const argv)
 }
 
 void
 }
 
 void

-print_strings (char * const * const argv)
+print_strings (char *const *argv)

 {
   int argc;
 
 {
   int argc;
 


@@ -993,7 +993,7 @@ print_strings (char * const * const argv)
 }
 
 void
 }
 
 void

-print_table (char * const * const argv)
+print_table (char *const *argv)

 {
   int i;
 
 {
   int i;
 

diff --git a/fish/fish.h b/fish/fish.h
index 772d200..a6cc8c9 100644 (file)
--- a/fish/fish.h
+++ b/fish/fish.h
@@ -39,9 +39,9 @@ extern void pod2text (const char *name, const char *shortdesc, const char *body)
 extern void list_builtin_commands (void);
 extern void display_builtin_command (const char *cmd);
 extern void free_strings (char **argv);
 extern void list_builtin_commands (void);
 extern void display_builtin_command (const char *cmd);
 extern void free_strings (char **argv);

-extern int count_strings (char * const * const argv);
-extern void print_strings (char * const * const argv);
-extern void print_table (char * const * const argv);
+extern int count_strings (char *const *argv);
+extern void print_strings (char *const *argv);
+extern void print_table (char *const *argv);

 extern int launch (guestfs_h *);
 extern int is_true (const char *str);
 extern char **parse_string_list (const char *str);
 extern int launch (guestfs_h *);
 extern int is_true (const char *str);
 extern char **parse_string_list (const char *str);

diff --git a/src/generator.ml b/src/generator.ml
index ef7d3d5..fa0d33c 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -139,6 +139,7 @@ and argt =
   | Dev_or_Path of string (* /dev device name or Pathname, cannot be NULL *)
   | OptString of string        (* const char *name, may be NULL *)
   | StringList of string(* list of strings (each string cannot be NULL) *)
   | Dev_or_Path of string (* /dev device name or Pathname, cannot be NULL *)
   | OptString of string        (* const char *name, may be NULL *)
   | StringList of string(* list of strings (each string cannot be NULL) *)

+  | DeviceList of string(* list of Device names (each cannot be NULL) *)

   | Bool of string     (* boolean *)
   | Int of string      (* int (smallish ints, signed, <= 31 bits) *)
     (* These are treated as filenames (simple string parameters) in
   | Bool of string     (* boolean *)
   | Int of string      (* int (smallish ints, signed, <= 31 bits) *)
     (* These are treated as filenames (simple string parameters) in


@@ -1320,7 +1321,7 @@ This creates an LVM physical volume on the named C<device>,
 where C<device> should usually be a partition name such
 as C</dev/sda1>.");
 
 where C<device> should usually be a partition name such
 as C</dev/sda1>.");
 

-  ("vgcreate", (RErr, [String "volgroup"; StringList "physvols"]), 40, [],
+  ("vgcreate", (RErr, [String "volgroup"; DeviceList "physvols"]), 40, [],

    [InitEmpty, Always, TestOutputList (
       [["sfdiskM"; "/dev/sda"; ",100 ,200 ,"];
        ["pvcreate"; "/dev/sda1"];
    [InitEmpty, Always, TestOutputList (
       [["sfdiskM"; "/dev/sda"; ",100 ,200 ,"];
        ["pvcreate"; "/dev/sda1"];


@@ -3941,7 +3942,8 @@ let mapi f xs =
   loop 0 xs
 
 let name_of_argt = function
   loop 0 xs
 
 let name_of_argt = function

-  | Pathname n | Device n | Dev_or_Path n | String n | OptString n | StringList n | Bool n | Int n
+  | Pathname n | Device n | Dev_or_Path n | String n | OptString n
+  | StringList n | DeviceList n | Bool n | Int n

   | FileIn n | FileOut n -> n
 
 let java_name_of_struct typ =
   | FileIn n | FileOut n -> n
 
 let java_name_of_struct typ =


@@ -4330,7 +4332,7 @@ and generate_xdr () =
              function
              | Pathname n | Device n | Dev_or_Path n | String n -> pr "  string %s<>;\n" n
              | OptString n -> pr "  str *%s;\n" n
              function
              | Pathname n | Device n | Dev_or_Path n | String n -> pr "  string %s<>;\n" n
              | OptString n -> pr "  str *%s;\n" n

-             | StringList n -> pr "  str %s<>;\n" n
+             | StringList n | DeviceList n -> pr "  str %s<>;\n" n

              | Bool n -> pr "  bool %s;\n" n
              | Int n -> pr "  int %s;\n" n
              | FileIn _ | FileOut _ -> ()
              | Bool n -> pr "  bool %s;\n" n
              | Int n -> pr "  int %s;\n" n
              | FileIn _ | FileOut _ -> ()


@@ -4693,7 +4695,7 @@ check_state (guestfs_h *g, const char *caller)
                  pr "  args.%s = (char *) %s;\n" n n
              | OptString n ->
                  pr "  args.%s = %s ? (char **) &%s : NULL;\n" n n n
                  pr "  args.%s = (char *) %s;\n" n n
              | OptString n ->
                  pr "  args.%s = %s ? (char **) &%s : NULL;\n" n n n

-             | StringList n ->
+             | StringList n | DeviceList n ->

                  pr "  args.%s.%s_val = (char **) %s;\n" n n n;
                  pr "  for (args.%s.%s_len = 0; %s[args.%s.%s_len]; args.%s.%s_len++) ;\n" n n n n n n n;
              | Bool n ->
                  pr "  args.%s.%s_val = (char **) %s;\n" n n n;
                  pr "  for (args.%s.%s_len = 0; %s[args.%s.%s_len]; args.%s.%s_len++) ;\n" n n n n n n n;
              | Bool n ->


@@ -4898,7 +4900,7 @@ and generate_daemon_actions () =
              | Pathname n
              | String n -> ()
              | OptString n -> pr "  char *%s;\n" n
              | Pathname n
              | String n -> ()
              | OptString n -> pr "  char *%s;\n" n

-             | StringList n -> pr "  char **%s;\n" n
+             | StringList n | DeviceList n -> pr "  char **%s;\n" n

              | Bool n -> pr "  int %s;\n" n
              | Int n -> pr "  int %s;\n" n
              | FileIn _ | FileOut _ -> ()
              | Bool n -> pr "  int %s;\n" n
              | Int n -> pr "  int %s;\n" n
              | FileIn _ | FileOut _ -> ()


@@ -4918,6 +4920,16 @@ and generate_daemon_actions () =
            let pr_args n =
              pr "  char *%s = args.%s;\n" n n
            in
            let pr_args n =
              pr "  char *%s = args.%s;\n" n n
            in

+           let pr_list_handling_code n =
+             pr "  %s = realloc (args.%s.%s_val,\n" n n n;
+             pr "                sizeof (char *) * (args.%s.%s_len+1));\n" n n;
+             pr "  if (%s == NULL) {\n" n;
+             pr "    reply_with_perror (\"realloc\");\n";
+             pr "    goto done;\n";
+             pr "  }\n";
+             pr "  %s[args.%s.%s_len] = NULL;\n" n n n;
+             pr "  args.%s.%s_val = %s;\n" n n n;
+           in

            List.iter (
              function
              | Pathname n ->
            List.iter (
              function
              | Pathname n ->


@@ -4932,14 +4944,14 @@ and generate_daemon_actions () =
              | String n -> pr_args n
              | OptString n -> pr "  %s = args.%s ? *args.%s : NULL;\n" n n n
              | StringList n ->
              | String n -> pr_args n
              | OptString n -> pr "  %s = args.%s ? *args.%s : NULL;\n" n n n
              | StringList n ->

-                 pr "  %s = realloc (args.%s.%s_val,\n" n n n;
-                 pr "                sizeof (char *) * (args.%s.%s_len+1));\n" n n;
-                 pr "  if (%s == NULL) {\n" n;
-                 pr "    reply_with_perror (\"realloc\");\n";
-                 pr "    goto done;\n";
+                 pr_list_handling_code n;
+             | DeviceList n ->
+                 pr_list_handling_code n;
+                 pr "  /* Ensure that each is a device,\n";
+                 pr "   * and perform device name translation. */\n";
+                 pr "  { int pvi; for (pvi = 0; physvols[pvi] != NULL; ++pvi)\n";
+                 pr "    RESOLVE_DEVICE (physvols[pvi], goto done);\n";

                  pr "  }\n";
                  pr "  }\n";

-                 pr "  %s[args.%s.%s_len] = NULL;\n" n n n;
-                 pr "  args.%s.%s_val = %s;\n" n n n;

              | Bool n -> pr "  %s = args.%s;\n" n n
              | Int n -> pr "  %s = args.%s;\n" n n
              | FileIn _ | FileOut _ -> ()
              | Bool n -> pr "  %s = args.%s;\n" n n
              | Int n -> pr "  %s = args.%s;\n" n n
              | FileIn _ | FileOut _ -> ()


@@ -4947,6 +4959,7 @@ and generate_daemon_actions () =
            pr "\n"
       );
 
            pr "\n"
       );
 

+

       (* this is used at least for do_equal *)
       if List.exists (function Pathname _ -> true | _ -> false) (snd style) then (
         (* Emit NEED_ROOT just once, even when there are two or
       (* this is used at least for do_equal *)
       if List.exists (function Pathname _ -> true | _ -> false) (snd style) then (
         (* Emit NEED_ROOT just once, even when there are two or


@@ -5260,7 +5273,8 @@ static void print_error (guestfs_h *g, void *data, const char *msg)
     fprintf (stderr, \"%%s\\n\", msg);
 }
 
     fprintf (stderr, \"%%s\\n\", msg);
 }
 

-static void print_strings (char * const * const argv)
+/* FIXME: nearly identical code appears in fish.c */
+static void print_strings (char const *const *argv)

 {
   int argc;
 
 {
   int argc;
 


@@ -5269,7 +5283,7 @@ static void print_strings (char * const * const argv)
 }
 
 /*
 }
 
 /*

-static void print_table (char * const * const argv)
+static void print_table (char const *const *argv)

 {
   int i;
 
 {
   int i;
 


@@ -5849,7 +5863,7 @@ and generate_test_command_call ?(expect_error = false) ?test test_name cmd =
         | Int _, _
         | Bool _, _
         | FileIn _, _ | FileOut _, _ -> ()
         | Int _, _
         | Bool _, _
         | FileIn _, _ | FileOut _, _ -> ()

-        | StringList n, arg ->
+        | StringList n, arg | DeviceList n, arg ->

             let strs = string_split " " arg in
             iteri (
               fun i str ->
             let strs = string_split " " arg in
             iteri (
               fun i str ->


@@ -5897,7 +5911,7 @@ and generate_test_command_call ?(expect_error = false) ?test test_name cmd =
             pr ", %s" n
         | FileIn _, arg | FileOut _, arg ->
             pr ", \"%s\"" (c_quote arg)
             pr ", %s" n
         | FileIn _, arg | FileOut _, arg ->
             pr ", \"%s\"" (c_quote arg)

-        | StringList n, _ ->
+        | StringList n, _ | DeviceList n, _ ->

             pr ", %s" n
         | Int _, arg ->
             let i =
             pr ", %s" n
         | Int _, arg ->
             let i =


@@ -6146,7 +6160,7 @@ and generate_fish_cmds () =
         | OptString n
         | FileIn n
         | FileOut n -> pr "  const char *%s;\n" n
         | OptString n
         | FileIn n
         | FileOut n -> pr "  const char *%s;\n" n

-        | StringList n -> pr "  char **%s;\n" n
+        | StringList n | DeviceList n -> pr "  char *const *%s;\n" n

         | Bool n -> pr "  int %s;\n" n
         | Int n -> pr "  int %s;\n" n
       ) (snd style);
         | Bool n -> pr "  int %s;\n" n
         | Int n -> pr "  int %s;\n" n
       ) (snd style);


@@ -6173,7 +6187,7 @@ and generate_fish_cmds () =
           | FileOut name ->
               pr "  %s = strcmp (argv[%d], \"-\") != 0 ? argv[%d] : \"/dev/stdout\";\n"
                 name i i
           | FileOut name ->
               pr "  %s = strcmp (argv[%d], \"-\") != 0 ? argv[%d] : \"/dev/stdout\";\n"
                 name i i

-          | StringList name ->
+          | StringList name | DeviceList name ->

               pr "  %s = parse_string_list (argv[%d]);\n" name i
           | Bool name ->
               pr "  %s = is_true (argv[%d]) ? 1 : 0;\n" name i
               pr "  %s = parse_string_list (argv[%d]);\n" name i
           | Bool name ->
               pr "  %s = is_true (argv[%d]) ? 1 : 0;\n" name i


@@ -6398,7 +6412,7 @@ and generate_fish_actions_pod () =
         function
         | Pathname n | Device n | Dev_or_Path n | String n -> pr " %s" n
         | OptString n -> pr " %s" n
         function
         | Pathname n | Device n | Dev_or_Path n | String n -> pr " %s" n
         | OptString n -> pr " %s" n

-        | StringList n -> pr " '%s ...'" n
+        | StringList n | DeviceList n -> pr " '%s ...'" n

         | Bool _ -> pr " true|false"
         | Int n -> pr " %s" n
         | FileIn n | FileOut n -> pr " (%s|-)" n
         | Bool _ -> pr " true|false"
         | Int n -> pr " %s" n
         | FileIn n | FileOut n -> pr " (%s|-)" n


@@ -6468,10 +6482,9 @@ and generate_prototype ?(extern = true) ?(static = false) ?(semicolon = true)
       | OptString n ->
           next ();
           pr "const char *%s" n
       | OptString n ->
           next ();
           pr "const char *%s" n

-      | StringList n ->
+      | StringList n | DeviceList n ->

           next ();
           next ();

-          if not in_daemon then pr "char * const* const %s" n
-          else pr "char **%s" n
+          pr "char *const *%s" n

       | Bool n -> next (); pr "int %s" n
       | Int n -> next (); pr "int %s" n
       | FileIn n
       | Bool n -> next (); pr "int %s" n
       | Int n -> next (); pr "int %s" n
       | FileIn n


@@ -6735,7 +6748,7 @@ copy_table (char * const * argv)
             pr "  const char *%s =\n" n;
             pr "    %sv != Val_int (0) ? String_val (Field (%sv, 0)) : NULL;\n"
               n n
             pr "  const char *%s =\n" n;
             pr "    %sv != Val_int (0) ? String_val (Field (%sv, 0)) : NULL;\n"
               n n

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  char **%s = ocaml_guestfs_strings_val (g, %sv);\n" n n
         | Bool n ->
             pr "  int %s = Bool_val (%sv);\n" n n
             pr "  char **%s = ocaml_guestfs_strings_val (g, %sv);\n" n n
         | Bool n ->
             pr "  int %s = Bool_val (%sv);\n" n n


@@ -6777,7 +6790,7 @@ copy_table (char * const * argv)
 
       List.iter (
         function
 
       List.iter (
         function

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  ocaml_guestfs_free_strings (%s);\n" n;
         | Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _ | Bool _ | Int _
         | FileIn _ | FileOut _ -> ()
             pr "  ocaml_guestfs_free_strings (%s);\n" n;
         | Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _ | Bool _ | Int _
         | FileIn _ | FileOut _ -> ()


@@ -6865,7 +6878,7 @@ and generate_ocaml_prototype ?(is_external = false) name style =
     function
     | Pathname _ | Device _ | Dev_or_Path _ | String _ | FileIn _ | FileOut _ -> pr "string -> "
     | OptString _ -> pr "string option -> "
     function
     | Pathname _ | Device _ | Dev_or_Path _ | String _ | FileIn _ | FileOut _ -> pr "string -> "
     | OptString _ -> pr "string option -> "

-    | StringList _ -> pr "string array -> "
+    | StringList _ | DeviceList _ -> pr "string array -> "

     | Bool _ -> pr "bool -> "
     | Int _ -> pr "int -> "
   ) (snd style);
     | Bool _ -> pr "bool -> "
     | Int _ -> pr "int -> "
   ) (snd style);


@@ -7016,7 +7029,7 @@ DESTROY (g)
                * to add 1 to the ST(x) operator.
                *)
               pr "      char *%s = SvOK(ST(%d)) ? SvPV_nolen(ST(%d)) : NULL;\n" n (i+1) (i+1)
                * to add 1 to the ST(x) operator.
                *)
               pr "      char *%s = SvOK(ST(%d)) ? SvPV_nolen(ST(%d)) : NULL;\n" n (i+1) (i+1)

-          | StringList n -> pr "      char **%s;\n" n
+          | StringList n | DeviceList n -> pr "      char **%s;\n" n

           | Bool n -> pr "      int %s;\n" n
           | Int n -> pr "      int %s;\n" n
       ) (snd style);
           | Bool n -> pr "      int %s;\n" n
           | Int n -> pr "      int %s;\n" n
       ) (snd style);


@@ -7026,7 +7039,7 @@ DESTROY (g)
           function
           | Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _ | Bool _ | Int _
           | FileIn _ | FileOut _ -> ()
           function
           | Pathname _ | Device _ | Dev_or_Path _ | String _ | OptString _ | Bool _ | Int _
           | FileIn _ | FileOut _ -> ()

-          | StringList n -> pr "      free (%s);\n" n
+          | StringList n | DeviceList n -> pr "      free (%s);\n" n

         ) (snd style)
       in
 
         ) (snd style)
       in
 


@@ -7399,7 +7412,7 @@ and generate_perl_prototype name style =
       | Pathname n | Device n | Dev_or_Path n | String n
       | OptString n | Bool n | Int n | FileIn n | FileOut n ->
           pr "$%s" n
       | Pathname n | Device n | Dev_or_Path n | String n
       | OptString n | Bool n | Int n | FileIn n | FileOut n ->
           pr "$%s" n

-      | StringList n ->
+      | StringList n | DeviceList n ->

           pr "\\@%s" n
   ) (snd style);
   pr ");"
           pr "\\@%s" n
   ) (snd style);
   pr ");"


@@ -7439,11 +7452,11 @@ put_handle (guestfs_h *g)
 }
 
 /* This list should be freed (but not the strings) after use. */
 }
 
 /* This list should be freed (but not the strings) after use. */

-static const char **
+static char **

 get_string_list (PyObject *obj)
 {
   int i, len;
 get_string_list (PyObject *obj)
 {
   int i, len;

-  const char **r;
+  char **r;

 
   assert (obj);
 
 
   assert (obj);
 


@@ -7659,9 +7672,9 @@ py_guestfs_close (PyObject *self, PyObject *args)
         | Pathname n | Device n | Dev_or_Path n | String n | FileIn n | FileOut n ->
             pr "  const char *%s;\n" n
         | OptString n -> pr "  const char *%s;\n" n
         | Pathname n | Device n | Dev_or_Path n | String n | FileIn n | FileOut n ->
             pr "  const char *%s;\n" n
         | OptString n -> pr "  const char *%s;\n" n

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  PyObject *py_%s;\n" n;
             pr "  PyObject *py_%s;\n" n;

-            pr "  const char **%s;\n" n
+            pr "  char **%s;\n" n

         | Bool n -> pr "  int %s;\n" n
         | Int n -> pr "  int %s;\n" n
       ) (snd style);
         | Bool n -> pr "  int %s;\n" n
         | Int n -> pr "  int %s;\n" n
       ) (snd style);


@@ -7674,7 +7687,7 @@ py_guestfs_close (PyObject *self, PyObject *args)
         function
         | Pathname _ | Device _ | Dev_or_Path _ | String _ | FileIn _ | FileOut _ -> pr "s"
         | OptString _ -> pr "z"
         function
         | Pathname _ | Device _ | Dev_or_Path _ | String _ | FileIn _ | FileOut _ -> pr "s"
         | OptString _ -> pr "z"

-        | StringList _ -> pr "O"
+        | StringList _ | DeviceList _ -> pr "O"

         | Bool _ -> pr "i" (* XXX Python has booleans? *)
         | Int _ -> pr "i"
       ) (snd style);
         | Bool _ -> pr "i" (* XXX Python has booleans? *)
         | Int _ -> pr "i"
       ) (snd style);


@@ -7684,7 +7697,7 @@ py_guestfs_close (PyObject *self, PyObject *args)
         function
         | Pathname n | Device n | Dev_or_Path n | String n | FileIn n | FileOut n -> pr ", &%s" n
         | OptString n -> pr ", &%s" n
         function
         | Pathname n | Device n | Dev_or_Path n | String n | FileIn n | FileOut n -> pr ", &%s" n
         | OptString n -> pr ", &%s" n

-        | StringList n -> pr ", &py_%s" n
+        | StringList n | DeviceList n -> pr ", &py_%s" n

         | Bool n -> pr ", &%s" n
         | Int n -> pr ", &%s" n
       ) (snd style);
         | Bool n -> pr ", &%s" n
         | Int n -> pr ", &%s" n
       ) (snd style);


@@ -7697,7 +7710,7 @@ py_guestfs_close (PyObject *self, PyObject *args)
         function
         | Pathname _ | Device _ | Dev_or_Path _ | String _
         | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ -> ()
         function
         | Pathname _ | Device _ | Dev_or_Path _ | String _
         | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ -> ()

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  %s = get_string_list (py_%s);\n" n n;
             pr "  if (!%s) return NULL;\n" n
       ) (snd style);
             pr "  %s = get_string_list (py_%s);\n" n n;
             pr "  if (!%s) return NULL;\n" n
       ) (snd style);


@@ -7712,7 +7725,7 @@ py_guestfs_close (PyObject *self, PyObject *args)
         function
         | Pathname _ | Device _ | Dev_or_Path _ | String _
         | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ -> ()
         function
         | Pathname _ | Device _ | Dev_or_Path _ | String _
         | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ -> ()

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  free (%s);\n" n
       ) (snd style);
 
             pr "  free (%s);\n" n
       ) (snd style);
 


@@ -8027,7 +8040,7 @@ static VALUE ruby_guestfs_close (VALUE gv)
             pr "              \"%s\", \"%s\");\n" n name
         | OptString n ->
             pr "  const char *%s = !NIL_P (%sv) ? StringValueCStr (%sv) : NULL;\n" n n n
             pr "              \"%s\", \"%s\");\n" n name
         | OptString n ->
             pr "  const char *%s = !NIL_P (%sv) ? StringValueCStr (%sv) : NULL;\n" n n n

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  char **%s;\n" n;
             pr "  Check_Type (%sv, T_ARRAY);\n" n;
             pr "  {\n";
             pr "  char **%s;\n" n;
             pr "  Check_Type (%sv, T_ARRAY);\n" n;
             pr "  {\n";


@@ -8073,7 +8086,7 @@ static VALUE ruby_guestfs_close (VALUE gv)
         function
         | Pathname _ | Device _ | Dev_or_Path _ | String _
         | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ -> ()
         function
         | Pathname _ | Device _ | Dev_or_Path _ | String _
         | FileIn _ | FileOut _ | OptString _ | Bool _ | Int _ -> ()

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  free (%s);\n" n
       ) (snd style);
 
             pr "  free (%s);\n" n
       ) (snd style);
 


@@ -8389,7 +8402,7 @@ and generate_java_prototype ?(public=false) ?(privat=false) ?(native=false)
       | FileIn n
       | FileOut n ->
           pr "String %s" n
       | FileIn n
       | FileOut n ->
           pr "String %s" n

-      | StringList n ->
+      | StringList n | DeviceList n ->

           pr "String[] %s" n
       | Bool n ->
           pr "boolean %s" n
           pr "String[] %s" n
       | Bool n ->
           pr "boolean %s" n


@@ -8508,7 +8521,7 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
         | FileIn n
         | FileOut n ->
             pr ", jstring j%s" n
         | FileIn n
         | FileOut n ->
             pr ", jstring j%s" n

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr ", jobjectArray j%s" n
         | Bool n ->
             pr ", jboolean j%s" n
             pr ", jobjectArray j%s" n
         | Bool n ->
             pr ", jboolean j%s" n


@@ -8561,7 +8574,7 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
         | FileIn n
         | FileOut n ->
             pr "  const char *%s;\n" n
         | FileIn n
         | FileOut n ->
             pr "  const char *%s;\n" n

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  int %s_len;\n" n;
             pr "  const char **%s;\n" n
         | Bool n
             pr "  int %s_len;\n" n;
             pr "  const char **%s;\n" n
         | Bool n


@@ -8595,7 +8608,7 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
              * a NULL parameter.
              *)
             pr "  %s = j%s ? (*env)->GetStringUTFChars (env, j%s, NULL) : NULL;\n" n n n
              * a NULL parameter.
              *)
             pr "  %s = j%s ? (*env)->GetStringUTFChars (env, j%s, NULL) : NULL;\n" n n n

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  %s_len = (*env)->GetArrayLength (env, j%s);\n" n n;
             pr "  %s = guestfs_safe_malloc (g, sizeof (char *) * (%s_len+1));\n" n n;
             pr "  for (i = 0; i < %s_len; ++i) {\n" n;
             pr "  %s_len = (*env)->GetArrayLength (env, j%s);\n" n n;
             pr "  %s = guestfs_safe_malloc (g, sizeof (char *) * (%s_len+1));\n" n n;
             pr "  for (i = 0; i < %s_len; ++i) {\n" n;


@@ -8626,7 +8639,7 @@ Java_com_redhat_et_libguestfs_GuestFS__1close
         | OptString n ->
             pr "  if (j%s)\n" n;
             pr "    (*env)->ReleaseStringUTFChars (env, j%s, %s);\n" n n
         | OptString n ->
             pr "  if (j%s)\n" n;
             pr "    (*env)->ReleaseStringUTFChars (env, j%s, %s);\n" n n

-        | StringList n ->
+        | StringList n | DeviceList n ->

             pr "  for (i = 0; i < %s_len; ++i) {\n" n;
             pr "    jobject o = (*env)->GetObjectArrayElement (env, j%s, i);\n"
               n;
             pr "  for (i = 0; i < %s_len; ++i) {\n" n;
             pr "    jobject o = (*env)->GetObjectArrayElement (env, j%s, i);\n"
               n;


@@ -8895,7 +8908,7 @@ last_error h = do
           | FileOut n
           | Pathname n | Device n | Dev_or_Path n | String n -> pr "withCString %s $ \\%s -> " n n
           | OptString n -> pr "maybeWith withCString %s $ \\%s -> " n n
           | FileOut n
           | Pathname n | Device n | Dev_or_Path n | String n -> pr "withCString %s $ \\%s -> " n n
           | OptString n -> pr "maybeWith withCString %s $ \\%s -> " n n

-          | StringList n -> pr "withMany withCString %s $ \\%s -> withArray0 nullPtr %s $ \\%s -> " n n n n
+          | StringList n | DeviceList n -> pr "withMany withCString %s $ \\%s -> withArray0 nullPtr %s $ \\%s -> " n n n n

           | Bool _ | Int _ -> ()
         ) (snd style);
         (* Convert integer arguments. *)
           | Bool _ | Int _ -> ()
         ) (snd style);
         (* Convert integer arguments. *)


@@ -8905,7 +8918,7 @@ last_error h = do
             | Bool n -> sprintf "(fromBool %s)" n
             | Int n -> sprintf "(fromIntegral %s)" n
             | FileIn n | FileOut n
             | Bool n -> sprintf "(fromBool %s)" n
             | Int n -> sprintf "(fromIntegral %s)" n
             | FileIn n | FileOut n

-            | Pathname n | Device n | Dev_or_Path n | String n | OptString n | StringList n -> n
+            | Pathname n | Device n | Dev_or_Path n | String n | OptString n | StringList n | DeviceList n -> n

           ) (snd style) in
         pr "withForeignPtr h (\\p -> c_%s %s)\n" name
           (String.concat " " ("p" :: args));
           ) (snd style) in
         pr "withForeignPtr h (\\p -> c_%s %s)\n" name
           (String.concat " " ("p" :: args));


@@ -8957,7 +8970,7 @@ and generate_haskell_prototype ~handle ?(hs = false) style =
       (match arg with
        | Pathname _ | Device _ | Dev_or_Path _ | String _ -> pr "%s" string
        | OptString _ -> if hs then pr "Maybe String" else pr "CString"
       (match arg with
        | Pathname _ | Device _ | Dev_or_Path _ | String _ -> pr "%s" string
        | OptString _ -> if hs then pr "Maybe String" else pr "CString"

-       | StringList _ -> if hs then pr "[String]" else pr "Ptr CString"
+       | StringList _ | DeviceList _ -> if hs then pr "[String]" else pr "Ptr CString"

        | Bool _ -> pr "%s" bool
        | Int _ -> pr "%s" int
        | FileIn _ -> pr "%s" string
        | Bool _ -> pr "%s" bool
        | Int _ -> pr "%s" int
        | FileIn _ -> pr "%s" string


@@ -9036,7 +9049,7 @@ print_strings (char * const* const argv)
       | FileIn n
       | FileOut n -> pr "  printf (\"%%s\\n\", %s);\n" n
       | OptString n -> pr "  printf (\"%%s\\n\", %s ? %s : \"null\");\n" n n
       | FileIn n
       | FileOut n -> pr "  printf (\"%%s\\n\", %s);\n" n
       | OptString n -> pr "  printf (\"%%s\\n\", %s ? %s : \"null\");\n" n n

-      | StringList n -> pr "  print_strings (%s);\n" n
+      | StringList n | DeviceList n -> pr "  print_strings (%s);\n" n

       | Bool n -> pr "  printf (\"%%s\\n\", %s ? \"true\" : \"false\");\n" n
       | Int n -> pr "  printf (\"%%d\\n\", %s);\n" n
     ) (snd style);
       | Bool n -> pr "  printf (\"%%s\\n\", %s ? \"true\" : \"false\");\n" n
       | Int n -> pr "  printf (\"%%d\\n\", %s);\n" n
     ) (snd style);