search for: json_parser_val

...t a/builder/utils.mli b/builder/utils.mli index 5dde43a01..c7631636c 100644 --- a/builder/utils.mli +++ b/builder/utils.mli @@ -29,7 +29,7 @@ and revision = val string_of_revision : revision -> string (** Convert a {!revision} into a string. *) -val get_image_infos : string -> JSON_parser.json_parser_val +val get_image_infos : string -> JSON.json_t (** [get_image_infos path] Run qemu-img info on the image pointed at path as JSON tree. *) diff --git a/common/mltools/JSON_parser-c.c b/common/mltools/JSON_parser-c.c index 32432dc5b..dce9f6a15 100644 --- a/common/mltools/JSON_parser-c.c +++...

v2: - Added back the null value. - Reran the tests. Rich.

...; jansson conversion. And then... I forgot :-) > -type yajl_val = > -| Yajl_null > -| Yajl_string of string > -| Yajl_number of int64 > -| Yajl_double of float > -| Yajl_object of (string * yajl_val) array > -| Yajl_array of yajl_val array > -| Yajl_bool of bool > +type json_parser_val = > +| JSON_parser_null > +| JSON_parser_string of string > +| JSON_parser_number of int64 > +| JSON_parser_double of float > +| JSON_parser_object of (string * json_parser_val) array > +| JSON_parser_array of json_parser_val array > +| JSON_parser_bool of bool I'd drop th...

...49fd956..5dde43a01 100644 --- a/builder/utils.mli +++ b/builder/utils.mli @@ -29,9 +29,9 @@ and revision = val string_of_revision : revision -> string (** Convert a {!revision} into a string. *) -val get_image_infos : string -> Yajl.yajl_val +val get_image_infos : string -> JSON_parser.json_parser_val (** [get_image_infos path] Run qemu-img info on the image pointed at - path as YAJL tree. *) + path as JSON tree. *) val increment_revision : revision -> revision (** Add one to the revision number *) diff --git a/builder/yajl-c.c b/common/mltools/JSON_parser-c.c similarity index 94%...

An evolution of: https://www.redhat.com/archives/libguestfs/2018-August/msg00155.html

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