similar to: [PATCH 1/2] mltools: JSON: add json_parser_tree_parse_file

--- builder/simplestreams_parser.ml | 9 +- .../test-virt-builder-list-simplestreams.sh | 64 ++++++------- builder/utils.mli | 2 +- common/mltools/JSON_parser-c.c | 96 ++++++++++++------- common/mltools/JSON_parser.ml | 29 ++---- common/mltools/JSON_parser.mli | 25 ++---

Commit bd1c5c9f4dcf38458099db8a0bf4659a07ef055d changed all the code to use Jansson instead of yajl. However it didn't change the OCaml API name (which was still Yajl). This commit changes the module to a neutral name ("JSON_parser") and moves it into common/mltools so it can be used by other tools. This leaves us in a slightly awkward situation of having two JSON-ish OCaml

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

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

No need to read the whole file manually. --- builder/simplestreams_parser.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/simplestreams_parser.ml b/builder/simplestreams_parser.ml index ccbfdff67..407eb11fb 100644 --- a/builder/simplestreams_parser.ml +++ b/builder/simplestreams_parser.ml @@ -44,7 +44,7 @@ let get_index ~downloader ~sigchecker { Sources.uri; proxy }

Improve the way the precheck script checks for the specified resources: - look directly for a data center with the specified storage domain - get the storage domain object from the storage domains attached to the data center found - similarly, look for the specified cluster among the ones attached to the data center found When everything is found, return the UUID of the storage domain, and of

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

They do not contain messages. --- Makefile.am | 1 + po/POTFILES-ml | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4dde5002..46a52ca3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,6 +115,7 @@ po/POTFILES-ml: configure.ac grep -v '^common/mlprogress/' | \ grep -v '^common/mlvisit/' | \ grep -v

On Wed, Dec 18, 2019 at 11:13:48AM +0100, Pino Toscano wrote: > They do not contain messages. > --- > Makefile.am | 1 + > po/POTFILES-ml | 11 ----------- > 2 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 4dde5002..46a52ca3 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -115,6 +115,7 @@ po/POTFILES-ml:

On Wed, Aug 22, 2018 at 01:20:55PM +0200, Pino Toscano wrote: > On Monday, 20 August 2018 18:02:06 CEST Richard W.M. Jones wrote: > > - } else > > - rv = Val_none; > > + } > > + else { > > + /* Previously we had a special JSON_parser_null value we could > > + * use here, making the returned type (sort of) an option. > > + * This is a

On Monday, 20 August 2018 18:02:06 CEST Richard W.M. Jones wrote: > - } else > - rv = Val_none; > + } > + else { > + /* Previously we had a special JSON_parser_null value we could > + * use here, making the returned type (sort of) an option. > + * This is a best effort which is better than crashing / > + * throwing an error. > + */ > + rv =

When the machine readable mode is enabled, print all the messages (progress, info, warning, and errors) also as JSON in the machine readable stream: this way, users can easily parse the status of the OCaml tool, and report that back. The formatting of the current date time into the RFC 3999 format is done in C, because of the lack of OCaml APIs for this. --- .gitignore

Prune from the list of sources where to extract messages various sources with no messages: - .pl and .pm files, as they do not contain messages: almost all the .pl files are tests, and the only .pm file is the Perl Sys::Guestfs module, which wraps the XS extension - dummy.c sources; they are empty sources used to build OCaml-only targets using automake - gperf generated sources - C/OCaml

On Tuesday 12 April 2016 08:41:37 Richard W.M. Jones wrote: > We can now use the Guestfs.c_pointer method to access the underlying > guestfs_h *. So no need to use internal APIs for this. > --- > customize/perl_edit-c.c | 18 ++++++------------ > customize/perl_edit.ml | 10 ++++++++-- > 2 files changed, 14 insertions(+), 14 deletions(-) > > diff --git

While YAJL mostly works fine, it did not see any active development in the last 3 years. OTOH, Jansson is another JSON C implementation, with a very liberal license, and a much nicer API. Hence, switch all of libguestfs from YAJL to Jansson: - configure checks, and buildsystem in general - packages pulled in the appliance - actual implementations - contrib scripts - documentation This also

We can now use the Guestfs.c_pointer method to access the underlying guestfs_h *. So no need to use internal APIs for this. --- customize/perl_edit-c.c | 18 ++++++------------ customize/perl_edit.ml | 10 ++++++++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/customize/perl_edit-c.c b/customize/perl_edit-c.c index 753d990..7191bef 100644 --- a/customize/perl_edit-c.c +++

While YAJL mostly works fine, it did not see any active development in the latest 3 years. OTOH, Jansson is another JSON C implementation, with a very liberal license, and a much nicer API. Hence, switch all of libguestfs from YAJL to Jansson: - configure checks, and buildsystem in general - packages pulled in the appliance - actual implementations - contrib scripts - documentation This also

We can now use the Guestfs.c_pointer method to access the underlying guestfs_h *. So no need to use internal APIs for this. --- customize/perl_edit-c.c | 12 +++--------- customize/perl_edit.ml | 5 +++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/customize/perl_edit-c.c b/customize/perl_edit-c.c index 753d990..dd92b5a 100644 --- a/customize/perl_edit-c.c +++

Move the simple OCaml JSON writer to mllib, so that can be enhanced and used also outside v2v. --- mllib/JSON.ml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ mllib/JSON.mli | 26 ++++++++++++++++++++++++++ mllib/Makefile.am | 5 ++++- po/POTFILES-ml | 2 +- v2v/JSON.ml | 53 ----------------------------------------------------- v2v/JSON.mli | 26

When using the direct backend, you should see the result of testing the qemu binary for the availability of KVM: libguestfs: qemu KVM: enabled Thanks: Andrea Bologna. --- lib/guestfs-internal.h | 1 + lib/launch-direct.c | 40 +++++------------- lib/qemu.c | 94 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 105 insertions(+), 30 deletions(-) diff --git