[Libguestfs] [PATCH libguestfs 19/23] generator.ml: add type: Dev_or_Path
Richard W.M. Jones
rjones at redhat.com
Wed Aug 12 17:58:47 UTC 2009
On Wed, Aug 12, 2009 at 06:52:55PM +0200, Jim Meyering wrote:
> From: Jim Meyering <meyering at redhat.com>
>
> * src/generator.ml (file, download): Use it.
> ---
> src/generator.ml | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/generator.ml b/src/generator.ml
> index ddeeb25..072b9f4 100755
> --- a/src/generator.ml
> +++ b/src/generator.ml
> @@ -136,6 +136,7 @@ and argt =
> | String of string (* const char *name, cannot be NULL *)
> | Device of string (* /dev device name, cannot be NULL *)
> | Pathname of string (* file name, 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) *)
> | Bool of string (* boolean *)
> @@ -1450,7 +1451,7 @@ Some internal mounts are not unmounted by this call.");
> This command removes all LVM logical volumes, volume groups
> and physical volumes.");
>
> - ("file", (RString "description", [Pathname "path"]), 49, [],
> + ("file", (RString "description", [Dev_or_Path "path"]), 49, [],
> [InitSquashFS, Always, TestOutput (
> [["file"; "/empty"]], "empty");
> InitSquashFS, Always, TestOutput (
> @@ -1774,7 +1775,7 @@ C<filename> can also be a named pipe.
>
> See also C<guestfs_download>.");
>
> - ("download", (RErr, [String "remotefilename"; FileOut "filename"]), 67, [],
> + ("download", (RErr, [Dev_or_Path "remotefilename"; FileOut "filename"]), 67, [],
> [InitBasicFS, Always, TestOutput (
> (* Pick a file from cwd which isn't likely to change. *)
> [["upload"; "../COPYING.LIB"; "/COPYING.LIB"];
> --
> 1.6.4.337.g5420e
>
> _______________________________________________
> Libguestfs mailing list
> Libguestfs at redhat.com
> https://www.redhat.com/mailman/listinfo/libguestfs
Always fun to have exceptions ... ACK.
Rich.
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
More information about the Libguestfs
mailing list