similar to: [v2v PATCH] po: do not extract tests

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:

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

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

Enhance the output in machine parseable mode, by outputting all the messages of OCaml tools as JSON to the machine parseable stream. Related, although not strictly needed for this (and thus can be split if requested), is the addition of the fd format for the machine readable stream. Changes from v1: - use Obj.magic to convert int -> Unix.file_descr - add tests Pino Toscano (4):

Hi, this adds the possibility to select the output for --machine-readable in OCaml tools. The possible choices are: * --machine-readable: to stdout, like before * --machine-readable=file:name-of-file: to the specified file * --machine-readable=stream:stdout: explicitly to stdout * --machine-readable=stream:stderr: explicitly to stderr This makes it possible to add additional output for

Add an optional argument for --machine-readable to select the output, adding a new function to specifically write data to that output stream. The possible choices are: * --machine-readable: to stdout, like before * --machine-readable=file:name-of-file: to the specified file * --machine-readable=stream:stdout: explicitly to stdout * --machine-readable=stream:stderr: explicitly to stderr Adapt all

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

They are empty sources used to build OCaml-only targets using automake, so there is no documentation to extract. --- Makefile.am | 1 + docs/C_SOURCE_FILES | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index d3cf64cc1..ec342225a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -320,6 +320,7 @@ docs/C_SOURCE_FILES: configure.ac

- Add $(srcdir), $(builddir) to Makefiles where required - Post-process ocamldep output - generate ocaml/.depends --- builder/Makefile.am | 7 ++++--- common/mlgettext/Makefile.am | 2 +- common/mlpcre/Makefile.am | 2 +- common/mlprogress/Makefile.am | 2 +- common/mlstdutils/Makefile.am | 2 +- common/mltools/Makefile.am | 2 +- common/mlutils/Makefile.am | 2 +-

Miscellaneous refactoring, but the main one is to rename mllib/ as common/mltools/ Rich.

On Mon, Dec 16, 2019 at 03:58:29PM +0100, Pino Toscano wrote: > Use the newer copy shipped locally as 3rdparty, instead of the one in > the common submodule, as the latter copy will go away soon. > --- > .gitignore | 2 ++ > Makefile.am | 2 +- > configure.ac | 2 +- > test-harness/Makefile.am | 2 +- > v2v/Makefile.am | 4

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

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

Use the newer copy shipped locally as 3rdparty, instead of the one in the common submodule, as the latter copy will go away soon. --- .gitignore | 2 ++ Makefile.am | 2 +- configure.ac | 2 +- test-harness/Makefile.am | 2 +- v2v/Makefile.am | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index

- Add $(srcdir), $(builddir) to Makefiles where required - Post-process ocamldep output - generate ocaml/.depends Gbp-Pq: Name 0012-Fix-out-of-tree-builds-of-OCaml-components.patch --- builder/Makefile.am | 7 ++++--- common/mlgettext/Makefile.am | 2 +- common/mlpcre/Makefile.am | 2 +- common/mlprogress/Makefile.am | 2 +- common/mlstdutils/Makefile.am | 2 +-

OCaml has a small runtime which is statically linked into the virt tools (providing things like GC and primitives). Since OCaml 4.03 it has been possible to select variants of this runtime, one of which is compiled with -fPIC, using ‘ocamlopt -runtime-variant _pic’. This has performance implications on i686, but is relatively free on other architectures. Since it (in theory) adds to the

Do not build the mlv2v, and mllibvirt submodules, as they are not used. --- Makefile.am | 4 ---- configure.ac | 2 -- 2 files changed, 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 28f542765..b1e88a42b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -164,10 +164,6 @@ SUBDIRS += common/mlvisit SUBDIRS += common/mlxml SUBDIRS += common/mltools SUBDIRS += common/mlcustomize

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the

--- common/mlstdutils/std_utils_tests.ml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/mlstdutils/std_utils_tests.ml b/common/mlstdutils/std_utils_tests.ml index 81f512cbf..f7b0247a4 100644 --- a/common/mlstdutils/std_utils_tests.ml +++ b/common/mlstdutils/std_utils_tests.ml @@ -29,6 +29,11 @@ let assert_equal_int = assert_equal ~printer:(fun x -> string_of_int x)

This is an extended version of: https://www.redhat.com/archives/libguestfs/2019-September/msg00288.html Apparently I forgot it on my tree, so I'm posting that series again, adding an extra cleanup more due to the v2v/common splits. Pino Toscano (6): tests: switch away from xgetcwd daemon: move read_whole_file to common utils daemon: switch from read_file to read_whole_file daemon: