search for: mllibvirt

...ed.c /aclocal.m4 /autom4te.cache/ /build-aux/ diff --git a/Makefile.am b/Makefile.am index 039921c2..72b78769 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,7 @@ SUBDIRS += common/mlxml SUBDIRS += common/mltools SUBDIRS += common/mlcustomize SUBDIRS += common/mlv2v -SUBDIRS += common/mllibvirt +SUBDIRS += 3rdparty/libvirt-ocaml SUBDIRS += v2v SUBDIRS += test-harness diff --git a/configure.ac b/configure.ac index 065c6289..00246f29 100644 --- a/configure.ac +++ b/configure.ac @@ -100,11 +100,11 @@ AC_CONFIG_FILES([run], dnl NB: Remove common/mlstdutils/guestfs_config.ml in future X...

...ux/ > diff --git a/Makefile.am b/Makefile.am > index 039921c2..72b78769 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -41,7 +41,7 @@ SUBDIRS += common/mlxml > SUBDIRS += common/mltools > SUBDIRS += common/mlcustomize > SUBDIRS += common/mlv2v > -SUBDIRS += common/mllibvirt > +SUBDIRS += 3rdparty/libvirt-ocaml It's bikeshedding but how about calling it "bundled"? Anyway, ACK series, and also the patch to remove from common. Rich. > SUBDIRS += v2v > SUBDIRS += test-harness > > diff --git a/configure.ac b/configure.ac > index 065c...

This way no non-namespaced OCaml C symbols are used, reducing the risk of clashes with other code. The only exception is ocaml-augeas, which does not build with CAML_NAME_SPACE; it will be fixed upstream, and it affects only ocaml-augeas itself. --- builder/Makefile.am | 2 ++ common/mllibvirt/Makefile.am | 1 + common/mlpcre/Makefile.am | 1 + common/mlprogress/Makefile.am | 1 + common/mltools/Makefile.am | 1 + common/mlutils/Makefile.am | 1 + common/mlvisit/Makefile.am | 1 + common/mlxml/Makefile.am | 1 + customize/Makefile.am | 1 + daemon/Makefile.am...

So for patches 2, 6 and 7 ... I think for 2, we really need a plan, written down, about how and when we're going to remove the bundled library. It might be included as a README in the common/mllibvirt/ directory. But it needs to be clear about when it goes and how we're going to work towards that. For patch 6, I really need to either get rid of the test harness or move it out somewhere, but your change is fine. Patch 7 is fine, but depends on patch 2. Rich. -- Richard Jones, Virtualiza...

...irt v2v: -o libvirt: use a Lazy for the connection v2v: -o libvirt: switch away from virsh v2v: test-harness: stop using the external ocaml-libvirt build: stop looking for ocaml-libvirt .gitignore | 2 + Makefile.am | 5 +- common/mllibvirt/Makefile.am | 102 ++ common/mllibvirt/generator.pl | 890 ++++++++++++++ common/mllibvirt/libvirt.README | 9 + common/mllibvirt/libvirt.ml | 1624 +++++++++++++++++++++++++ common/mllibvirt/libvirt.mli | 1537 +++++++++++++++++++++++ common/mllibvirt...

...and Xen), but VMware and libvirtxml work fine as before. Changes from v4: - rebase on master - improve libvirt.README following Rich's recommendation - rename lazy_conn to libvirt_comm Changes from v3: - rebase on master - update libvirt-ocaml from its master branch - use $(srcdir) in common/mllibvirt/Makefile.am - parse_libvirt_xml: open a libvirt connection only when needed (and only once) Changes from v2: - rebase on master Changes from v1: - rebase on master - update ocaml-libvirt from libvirt-ocaml.git on libvirt.org, and adjust the code to it - pass again the URI to input_libvirt_vdd...

...irt v2v: -o libvirt: use a Lazy for the connection v2v: -o libvirt: switch away from virsh v2v: test-harness: stop using the external ocaml-libvirt build: stop looking for ocaml-libvirt .gitignore | 2 + Makefile.am | 5 +- common/mllibvirt/Makefile.am | 102 ++ common/mllibvirt/generator.pl | 908 +++++++++++++ common/mllibvirt/libvirt.README | 9 + common/mllibvirt/libvirt.ml | 1661 ++++++++++++++++++++++++ common/mllibvirt/libvirt.mli | 1626 +++++++++++++++++++++++ common/mllibvirt/l...

...f ./autogen.sh autoreconf failes with: autoreconf: running: automake --add-missing --copy --no-force configure.ac:38: installing 'build-aux/missing' configure.ac:221: error: required file 'common/mlcustomize/Makefile.in' not found configure.ac:221: error: required file 'common/mllibvirt/Makefile.in' not found configure.ac:221: error: required file 'common/mlstdutils/guestfs_config.ml.in' not found configure.ac:221: error: required file 'common/mlv2v/Makefile.in' not found Makefile.am:161: error: required directory ./common/mlcustomize does not exist Makefile.am...

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 S...

...irt v2v: -o libvirt: use a Lazy for the connection v2v: -o libvirt: switch away from virsh v2v: test-harness: stop using the external ocaml-libvirt build: stop looking for ocaml-libvirt .gitignore | 2 + Makefile.am | 5 +- common/mllibvirt/Makefile.am | 102 ++ common/mllibvirt/generator.pl | 908 +++++++++++++ common/mllibvirt/libvirt.README | 9 + common/mllibvirt/libvirt.ml | 1661 ++++++++++++++++++++++++ common/mllibvirt/libvirt.mli | 1626 +++++++++++++++++++++++ common/mllibvirt/l...

...now requires libvirt, as keeping it optional would create too much burden. I could not test all the libvirt input modes (like VDDK, and Xen), but VMware and libvirtxml work fine as before. Changes from v3: - rebase on master - update libvirt-ocaml from its master branch - use $(srcdir) in common/mllibvirt/Makefile.am - parse_libvirt_xml: open a libvirt connection only when needed (and only once) Changes from v2: - rebase on master Changes from v1: - rebase on master - update ocaml-libvirt from libvirt-ocaml.git on libvirt.org, and adjust the code to it - pass again the URI to input_libvirt_vdd...

...e6665e3, which has all the features we need (and that builds fine). It is expected to stay synchronized with upstream, until there is a new upstream release, and it will be widespread enough. --- .gitignore | 2 + Makefile.am | 3 + common/mllibvirt/Makefile.am | 102 ++ common/mllibvirt/generator.pl | 908 +++++++++++++ common/mllibvirt/libvirt.README | 9 + common/mllibvirt/libvirt.ml | 1673 ++++++++++++++++++++++++ common/mllibvirt/libvirt.mli | 1647 ++++++++++++++++++++++++ common/mllibvirt/...

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

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:

...on/, we would need to add a commit to the > > other 3 repos updating the submodule hash. > > The current common/ subdirectory is a giant mixup of different > components needed by some or just one tool each; few examples: > - common/mlaugeas -> only for the daemon > - common/mllibvirt -> only for v2v > - common/mlxml -> only for v2v > - some of the ml modules are need by any OCaml stuff > - some of the ml modules are used by 1/2 tools > - etc It's a step on the path rather than the end point. We can definitely move mllibvirt & mlxml to virt-v2v in fut...

...3rdparty/ocaml-augeas SUBDIRS += common/mlpcre if ENABLE_DAEMON SUBDIRS += daemon @@ -316,7 +316,7 @@ ChangeLog: configure.ac docs/C_SOURCE_FILES: configure.ac rm -f $@ $@-t find $(DIST_SUBDIRS) -name '*.[ch]' | \ - grep -v -E '^(builder/index-parse\.|builder/index-scan\.|common/mllibvirt/libvirt_c\.c|examples/|gnulib/|gobject/|java/com_redhat_et_libguestfs|perl/|php/extension/config\.h|ruby/ext/guestfs/extconf\.h|tests/|test-data/)' | \ + grep -v -E '^(builder/index-parse\.|builder/index-scan\.|common/mllibvirt/libvirt_c\.c|examples/|gnulib/|gobject/|java/com_redhat_et_libg...

...mmit to the > > > other 3 repos updating the submodule hash. > > > > The current common/ subdirectory is a giant mixup of different > > components needed by some or just one tool each; few examples: > > - common/mlaugeas -> only for the daemon > > - common/mllibvirt -> only for v2v > > - common/mlxml -> only for v2v > > - some of the ml modules are need by any OCaml stuff > > - some of the ml modules are used by 1/2 tools > > - etc > > It's a step on the path rather than the end point. We can definitely > move mllib...

On Wednesday, 10 April 2019 15:19:54 CEST Richard W.M. Jones wrote: > I think for 2, we really need a plan, written down, about how and when > we're going to remove the bundled library. It might be included as a > README in the common/mllibvirt/ directory. But it needs to be clear > about when it goes and how we're going to work towards that. Well, I'm not the libvirt-ocaml maintainer, so I cannot pin down releases, and deadlines for it. Note a similar situation applies to ocaml-augeas, bundled when the daemon was partially...

...; there's a change to common/, we would need to add a commit to the > other 3 repos updating the submodule hash. The current common/ subdirectory is a giant mixup of different components needed by some or just one tool each; few examples: - common/mlaugeas -> only for the daemon - common/mllibvirt -> only for v2v - common/mlxml -> only for v2v - some of the ml modules are need by any OCaml stuff - some of the ml modules are used by 1/2 tools - etc -- Pino Toscano

...l-link.sh -cclib '$(OCAMLCLIBS)' -- \ + $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OBJECTS) -o $@ @@ -293,9 +293,9 @@ virt_v2v_copy_to_local_DEPENDENCIES = \ ../bundled/libvirt-ocaml/mllibvirt.$(MLARCHIVE) \ ../common/mlcustomize/mlcustomize.$(MLARCHIVE) \ ../common/mlv2v/mlv2v.$(MLARCHIVE) \ - $(top_srcdir)/ocaml-link.sh + $(top_builddir)/ocaml-link.sh virt_v2v_copy_to_local_LINK = \ - $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ + $(top_builddir)/ocaml-link.sh -...