(* Command line argument parsing. *)
let prog = Filename.basename Sys.executable_name
-let indisk, outdisk, convert, format, ignores, machine_readable, quiet,
- verbose, trace =
+let indisk, outdisk, compress, convert, format, ignores, machine_readable,
+ option, quiet, verbose, trace =
let display_version () =
let g = new G.guestfs () in
let version = g#version () in
let add xs s = xs := s :: !xs in
+ let compress = ref false in
let convert = ref "" in
let format = ref "" in
let ignores = ref [] in
let machine_readable = ref false in
+ let option = ref "" in
let quiet = ref false in
let verbose = ref false in
let trace = ref false in
let argspec = Arg.align [
+ "--compress", Arg.Set compress, " Compressed output format";
"--convert", Arg.Set_string convert, "format Format of output disk (default: same as input)";
"--format", Arg.Set_string format, "format Format of input disk";
"--ignore", Arg.String (add ignores), "fs Ignore filesystem";
"--machine-readable", Arg.Set machine_readable, " Make output machine readable";
+ "-o", Arg.Set_string option, "option Add qemu-img options";
"-q", Arg.Set quiet, " Quiet output";
"--quiet", Arg.Set quiet, " -\"-";
"-v", Arg.Set verbose, " Enable debugging messages";
Arg.parse argspec anon_fun usage_msg;
(* Dereference the rest of the args. *)
+ let compress = !compress in
let convert = match !convert with "" -> None | str -> Some str in
let format = match !format with "" -> None | str -> Some str in
let ignores = List.rev !ignores in
let machine_readable = !machine_readable in
+ let option = match !option with "" -> None | str -> Some str in
let quiet = !quiet in
let verbose = !verbose in
let trace = !trace in
if contains_comma then
error "input filename '%s' contains a comma; qemu-img command line syntax prevents us from using such an image" indisk;
- indisk, outdisk, convert, format, ignores, machine_readable, quiet,
- verbose, trace
+ indisk, outdisk, compress, convert, format, ignores, machine_readable,
+ option, quiet, verbose, trace
let () =
if not quiet then
);
if string_prefix line "QEMU QCOW Image (v2)" then
"qcow2"
+ else if string_find line "VirtualBox" >= 0 then
+ "vdi"
else
"raw" (* XXX guess *)
printf "Copy to destination and make sparse ...\n%!";
let cmd =
- sprintf "qemu-img convert -f qcow2 -O %s %s %s"
+ sprintf "qemu-img convert -f qcow2 -O %s%s%s %s %s"
(Filename.quote output_format)
+ (if compress then " -c" else "")
+ (match option with
+ | None -> ""
+ | Some option -> " -o " ^ Filename.quote option)
(Filename.quote overlaydisk) (Filename.quote outdisk) in
- if verbose then
+(* if verbose then*)
printf "%s\n%!" cmd;
if Sys.command cmd <> 0 then
error "external command failed: %s" cmd