search for: mlxml

...#39; This is a usability problem. However since these are not expected to be generic RFC-compliant URIs we can perform the required percent-escaping ourselves instead of demanding that the user does this. Note that the wrapper function should not be used on real URLs or libvirt URLs. --- common/mlxml/Makefile.am | 1 + common/mlxml/xml-c.c | 45 +++++++++-- common/mlxml/xml.ml | 1 + common/mlxml/xml.mli | 4 + common/options/uri.c | 5 +- common/utils/Makefile.am | 2 + common/utils/libxml2-utils.c | 178 ++++++++++++++++++++++++++++++++++++++...

...#39; This is a usability problem. However since these are not expected to be generic RFC-compliant URIs we can perform the required percent-escaping ourselves instead of demanding that the user does this. Note that the wrapper function should not be used on real URLs or libvirt URLs. --- common/mlxml/Makefile.am | 1 + common/mlxml/xml-c.c | 45 +++++++-- common/mlxml/xml.ml | 1 + common/mlxml/xml.mli | 4 + common/options/uri.c | 5 +- common/utils/Makefile.am | 2 + common/utils/libxml2-utils.c | 178 +++++++++++++++++++++++++++++++++...

An alternate solution to: https://www.redhat.com/archives/libguestfs/2017-December/msg00035.html "[PATCH] v2v: -i vmx: Allow ssh URLs to use spaces." is to classify all URLs processed by libguestfs as either ordinary URLs or the special non-standard URLs that we use for things like ‘virt-v2v -i vmx’ and ‘guestfish --add’. For the non-standard URLs, provide a wrapper around

Previously posted: https://www.redhat.com/archives/libguestfs/2017-December/msg00046.html Rich.

...was introduced in OCaml 3.12.1, which is earlier than out minimum required version. mlaugeas is not touched by this change, since it is a copy of a 3rd party library (and thus it will be fixed there first). --- common/mlpcre/pcre-c.c | 3 ++- common/mlprogress/progress-c.c | 3 ++- common/mlxml/xml-c.c | 9 ++++++--- ocaml/guestfs-c.c | 3 ++- v2v/qemuopts-c.c | 3 ++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/common/mlpcre/pcre-c.c b/common/mlpcre/pcre-c.c index 61af616be..da982025f 100644 --- a/common/mlpcre/pcre-c.c +++ b/commo...

...s 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 | 2 ++ ocaml/Makefile.am | 1 + v2v/Makefile.am | 2 ++ 12 files changed, 15 insertions(+) diff --git a/builder/Makefile.am b/builder/Makefile.am index b564fadd6..c7caec5cb 100644...

...| 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 +- common/mlvisit/Makefile.am | 2 +- common/mlxml/Makefile.am | 2 +- customize/Makefile.am | 2 +- daemon/Makefile.am | 10 +++++----- generator/Makefile.am | 2 +- get-kernel/Makefile.am | 2 +- ocaml-dep.sh.in | 18 ++++++++++++++++-- ocaml/Makefile.am | 3 +-- resize/Makefil...

...tignore +++ b/.gitignore @@ -130,6 +130,9 @@ Makefile.in /common/mlstdutils/libdir.ml /common/mlstdutils/oUnit-* /common/mlstdutils/std_utils_tests +/common/mlutils/.depend +/common/mlutils/c_utils_unit_tests +/common/mlutils/oUnit-* /common/mlvisit/.depend /common/mlvisit/visit_tests /common/mlxml/.depend diff --git a/Makefile.am b/Makefile.am index b3eb35349..509bcae83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -156,18 +156,18 @@ SUBDIRS += csharp # OCaml tools. Note 'common/ml*', 'mllib' and 'customize' contain # shared code used by other OCaml tools, so these...

.../libvirt-ocaml/.depend > +/3rdparty/libvirt-ocaml/libvirt_generated.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 It's bikeshedding but how about calling it "bundled"? Anyway, ACK series, and also the patch to remove from com...

...| 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 +- common/mlvisit/Makefile.am | 2 +- common/mlxml/Makefile.am | 2 +- customize/Makefile.am | 2 +- daemon/Makefile.am | 10 +++++----- generator/Makefile.am | 2 +- get-kernel/Makefile.am | 2 +- ocaml-dep.sh.in | 24 ++++++++++++++++++++++-- ocaml/Makefile.am | 3 +-- resize/M...

...@ dll*.so Makefile Makefile.in +/3rdparty/libvirt-ocaml/.depend +/3rdparty/libvirt-ocaml/libvirt_generated.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.a...

Str is a pretty ugly regexp module. Let's try to replace it with PCRE. This series of commits goes some small way towards that eventual goal. - - - I wonder if there was a deep reason why we had this? let unix2dos s = String.concat "\r\n" (Str.split_delim (Str.regexp_string "\n") s) I replaced it with what I think should be (nearly) equivalent: let unix2dos s =

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

...llibvirt 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 -SUBDIRS += common/mlv2v -if HAVE_LIBVIRT -SUBDIRS += common/mllibvirt -endif SUBDIRS += customize SUBDIRS += builder builder/templates SUBDIRS += get-kernel diff --git a/configure.ac b/configure.ac index 7ec2c9b46..4d043dd02 100644 --- a...

This is just the utilities part of the patch series from: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html I believe this addresses everything raised in comments on that patch series. Rich.

This turned out to be rather more involved than I thought. We have lots of utility functions, spread all over the repository, with not a lot of structure. This moves many of them under common/ and structures them so there are clear dependencies. This doesn't complete the job by any means. Other items I had on my to-do list for this change were: - Split up mllib/common_utils into: -

...gt; > 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 future. We can also try to organize it be...

.../mlstdutils/dummy.c common/mltools/JSON_parser-c.c -common/mltools/dummy.c common/mltools/getopt-c.c common/mltools/tools_utils-c.c common/mltools/uri-c.c common/mlutils/c_utils-c.c -common/mlutils/dummy.c common/mlutils/unix_utils-c.c -common/mlvisit/dummy.c common/mlvisit/visit-c.c common/mlxml/xml-c.c common/options/config.c @@ -43,7 +35,6 @@ common/parallel/domains.c common/parallel/estimate-max-threads.c common/parallel/parallel.c common/progress/progress.c -common/qemuopts/qemuopts-tests.c common/qemuopts/qemuopts.c common/structs/structs-cleanups.c common/structs/structs-print...

...try.ml -common/mltools/tools_messages_tests.ml common/mltools/tools_utils.ml -common/mltools/tools_utils_tests.ml common/mltools/urandom.ml common/mltools/xpath_helpers.ml common/mlutils/c_utils.ml -common/mlutils/c_utils_unit_tests.ml common/mlutils/unix_utils.ml common/mlv2v/uefi.ml common/mlxml/xml.ml @@ -86,9 +77,7 @@ v2v/target_bus_assignment.ml v2v/types.ml v2v/utils.ml v2v/v2v.ml -v2v/v2v_unit_tests.ml v2v/vCenter.ml v2v/var_expander.ml -v2v/var_expander_tests.ml v2v/windows.ml v2v/windows_virtio.ml -- 2.24.1

...g 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 future. We...