search for: dac6b4120

...+ print_endline str; + print_endline "__MACHINEEND__" + in + ksprintf display fs + (* Common function to create a new Guestfs handle, with common options * (e.g. debug, tracing) already set. *) diff --git a/common/mltools/tools_utils.mli b/common/mltools/tools_utils.mli index dac6b4120..d40e0aa9b 100644 --- a/common/mltools/tools_utils.mli +++ b/common/mltools/tools_utils.mli @@ -36,6 +36,17 @@ val debug : ('a, unit, string, unit) format4 -> 'a the command line. As with libguestfs debugging messages, it is sent to [stderr]. *) +val machine_output : ('a...

This adds --print-target. In addition, v2 provides a machine-readable version (in JSON format). All of the record -> JSON boilerplate in this patch could be eliminated if we moved the baseline to OCaml 4.02. Rich.

...dable then + [ + [ L"machine-readable" ], Getopt.Unit set_machine_readable, s_"Make output machine readable"; + ] else []) in Getopt.create argspec ?anon_fun usage_msg diff --git a/common/mltools/tools_utils.mli b/common/mltools/tools_utils.mli index dac6b4120..44fd20be3 100644 --- a/common/mltools/tools_utils.mli +++ b/common/mltools/tools_utils.mli @@ -64,13 +64,16 @@ val parse_resize : int64 -> string -> int64 val human_size : int64 -> string (** Converts a size in bytes to a human-readable string. *) -val create_standard_options : Getopt...

I rethought this again, as I think that it's a dangerous assumption to bake qemu-img measure output into our API. This patch series runs qemu-img measure behind the scenes, but then parses the output and sums it to a single number which we print. Doing that required a bit of reworking, moving the Jansson [JSON parser] bindings from virt-builder into the common directory and a couple of other