search for: ocaml_bytes_compat_ml

...let of_string = String.copy let to_string = String.copy let sub_string = String.sub EOF - ln -s ../generator/bytes.ml mllib/bytes.ml - OCAML_GENERATOR_BYTES_COMPAT_CMO='$(top_builddir)/generator/bytes.cmo' - OCAML_BYTES_COMPAT_CMO='$(top_builddir)/mllib/bytes.cmo' - OCAML_BYTES_COMPAT_ML='$(top_builddir)/mllib/bytes.ml' + OCAML_BYTES_COMPAT_CMO='$(top_builddir)/common/mlstdutils/bytes.cmo' + OCAML_BYTES_COMPAT_ML='$(top_builddir)/common/mlstdutils/bytes.ml' safe_string_option= ],[ - OCAML_GENERATOR_BYTES_COMPAT_CMO= OCAML_BYTES_COMPAT_CMO...

Followup/fix of commit 61d4891ef48df171a27873efe90aab51a9b711ef. --- builder/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index 09ae4ae..e64c899 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -311,7 +311,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f

OCaml 4.02 introduced the 'bytes' type, a mutable string intended to replace the existing 'string' type for those cases where the byte array can be mutated. In future the 'string' type will become immutable. This is not the default now, but it can be forced using the '-safe-string' compile option. I tested this on Fedora 24 (OCaml 4.02) & RHEL 7 (OCaml 4.01).

...o]) + have_Hivex_OPEN_UNSAFE=no + fi + dnl Check which OCaml runtime to link the daemon again. dnl We can't use AC_CHECK_LIB here unfortunately because dnl the other symbols are resolved by OCaml itself. @@ -182,6 +195,12 @@ AC_SUBST([OCAML_BYTES_COMPAT_CMO]) AC_SUBST([OCAML_BYTES_COMPAT_ML]) AM_CONDITIONAL([HAVE_BYTES_COMPAT_ML], [test "x$OCAML_BYTES_COMPAT_ML" != "x"]) +AS_IF([test "x$have_Hivex_OPEN_UNSAFE" = "xno"],[ + HIVEX_OPEN_UNSAFE_FLAG="None" +],[ + HIVEX_OPEN_UNSAFE_FLAG="Some Hivex.OPEN_UNSAFE" +])...

...o]) + have_Hivex_OPEN_UNSAFE=no + fi + dnl Check which OCaml runtime to link the daemon again. dnl We can't use AC_CHECK_LIB here unfortunately because dnl the other symbols are resolved by OCaml itself. @@ -182,6 +195,12 @@ AC_SUBST([OCAML_BYTES_COMPAT_CMO]) AC_SUBST([OCAML_BYTES_COMPAT_ML]) AM_CONDITIONAL([HAVE_BYTES_COMPAT_ML], [test "x$OCAML_BYTES_COMPAT_ML" != "x"]) +AS_IF([test "x$have_Hivex_OPEN_UNSAFE" = "xno"],[ + HIVEX_OPEN_UNSAFE_FLAG="" +],[ + HIVEX_OPEN_UNSAFE_FLAG=" Hivex.OPEN_UNSAFE " +]) +AC_SU...

...t;<EOF include String @@ -183,6 +183,7 @@ let of_string = String.copy let to_string = String.copy let sub_string = String.sub EOF + $OCAMLC -i common/mlstdutils/bytes.ml > common/mlstdutils/bytes.mli OCAML_BYTES_COMPAT_CMO='$(top_builddir)/common/mlstdutils/bytes.cmo' OCAML_BYTES_COMPAT_ML='$(top_builddir)/common/mlstdutils/bytes.ml' safe_string_option= -- 2.14.3

...m: "Richard W.M. Jones" <rjones@redhat.com> With OCaml < 4.02 when using the alternate Bytes module, this module would be compiled twice during parallel builds, resulting in occasional corruption. The reason for this is that the ocamldep file mentions ‘bytes.cmo’ whereas the ‘$(OCAML_BYTES_COMPAT_ML)’ macro expands to ‘../../common/mlstdutils/bytes.ml’. Make doesn't recognize these as the same file. Use an alternate way to specify this file to fix this. --- common/mlstdutils/Makefile.am | 9 +++++++-- m4/guestfs_ocaml.m4 | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-)...

Per my previous email: https://www.redhat.com/archives/libguestfs/2017-September/msg00203.html I'd like to talk about requiring a more modern version of the OCaml compiler. These commits show some of the code changes which would be possible with OCaml >= 3.12 [which it turns out we already require by accident] and also with OCaml >= 4.02. The latter is my favoured option. Rich.

...it a/mllib/Makefile.am b/mllib/Makefile.am index ee251e99d..51d71465b 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -28,7 +28,6 @@ EXTRA_DIST = \ SOURCES_MLI = \ checksums.mli \ - unix_utils.mli \ common_utils.mli \ curl.mli \ getopt.mli \ @@ -43,7 +42,6 @@ SOURCES_ML = \ $(OCAML_BYTES_COMPAT_ML) \ common_gettext.ml \ getopt.ml \ - unix_utils.ml \ common_utils.ml \ URI.ml \ planner.ml \ @@ -60,7 +58,6 @@ SOURCES_C = \ ../common/options/uri.c \ common_utils-c.c \ getopt-c.c \ - unix_utils-c.c \ uri-c.c if HAVE_OCAML @@ -91,7 +88,8 @@ libmllib_a_CPPFLAGS = \ -I$(top_sr...

This patch series is just FYI at the moment. However it does pass the tests. The daemon is a self-contained program. We don't need to write it all in C. Writing parts of it in OCaml would make it simpler and less error-prone. In particular if the daemon was written in a more sane programming language then we could move the inspection code to run entirely inside the appliance, which would

We can use the setfiles(8) command to relabel the guest filesystem, even though we don't have a policy loaded nor SELinux enabled in the appliance kernel. This also deprecates or removes the old and broken SELinux support. This patch isn't quite complete - I would like to add some tests to the new API. I'm posting here to garner early feedback. Rich.

v1 -> v2: - Add simple test of the setfiles API. - Use SELinux_relabel module in virt-v2v (instead of touch /.autorelabel). - Small fixes. Rich.

...ware +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +include $(top_srcdir)/subdir-rules.mk + +EXTRA_DIST = \ + $(SOURCES_MLI) \ + $(SOURCES_ML) \ + std_utils_tests.ml + +SOURCES_MLI = \ + std_utils.mli \ + stringMap.mli + +SOURCES_ML = \ + guestfs_config.ml \ + $(OCAML_BYTES_COMPAT_ML) \ + libdir.ml \ + stringMap.ml \ + std_utils.ml + +if HAVE_OCAML + +# We pretend that we're building a C library. automake handles the +# compilation of the C sources for us. At the end we take the C +# objects and OCaml objects and link them into the OCaml library. +# This C library is neve...

...ef72 100644 > --- a/mllib/Makefile.am > +++ b/mllib/Makefile.am > @@ -30,6 +30,7 @@ SOURCES_MLI = \ > common_utils.mli \ > dev_t.mli \ > fsync.mli \ > + getopt.mli \ > JSON.mli \ > mkdtemp.mli \ > planner.mli \ > @@ -43,6 +44,7 @@ SOURCES_ML = \ > $(OCAML_BYTES_COMPAT_ML) \ > libdir.ml \ > common_gettext.ml \ > + getopt.ml \ > dev_t.ml \ > common_utils.ml \ > fsync.ml \ > @@ -59,6 +61,7 @@ SOURCES_C = \ > ../fish/uri.c \ > dev_t-c.c \ > fsync-c.c \ > + getopt-c.c \ > mkdtemp-c.c \ > progress-c.c \ > st...

...mmon/mlstdutils/Makefile.am index a6357bf6c..108adcc52 100644 --- a/common/mlstdutils/Makefile.am +++ b/common/mlstdutils/Makefile.am @@ -24,13 +24,15 @@ EXTRA_DIST = \ SOURCES_MLI = \ std_utils.mli \ - stringMap.mli + stringMap.mli \ + stringSet.mli SOURCES_ML = \ guestfs_config.ml \ $(OCAML_BYTES_COMPAT_ML) \ libdir.ml \ stringMap.ml \ + stringSet.ml \ std_utils.ml # We pretend that we're building a C library. automake handles the diff --git a/common/mlstdutils/stringSet.ml b/common/mlstdutils/stringSet.ml new file mode 100644 index 000000000..b63965705 --- /dev/null +++ b/common/mlstdu...

...t a/mllib/Makefile.am b/mllib/Makefile.am index 10bbebf..b26ef72 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -30,6 +30,7 @@ SOURCES_MLI = \ common_utils.mli \ dev_t.mli \ fsync.mli \ + getopt.mli \ JSON.mli \ mkdtemp.mli \ planner.mli \ @@ -43,6 +44,7 @@ SOURCES_ML = \ $(OCAML_BYTES_COMPAT_ML) \ libdir.ml \ common_gettext.ml \ + getopt.ml \ dev_t.ml \ common_utils.ml \ fsync.ml \ @@ -59,6 +61,7 @@ SOURCES_C = \ ../fish/uri.c \ dev_t-c.c \ fsync-c.c \ + getopt-c.c \ mkdtemp-c.c \ progress-c.c \ statvfs-c.c \ diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml...

...iff --git a/mllib/Makefile.am b/mllib/Makefile.am index e728d54..b0cea5f 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -31,6 +31,7 @@ SOURCES_MLI = \ curl.mli \ dev_t.mli \ fsync.mli \ + getopt.mli \ JSON.mli \ mkdtemp.mli \ planner.mli \ @@ -44,6 +45,7 @@ SOURCES_ML = \ $(OCAML_BYTES_COMPAT_ML) \ libdir.ml \ common_gettext.ml \ + getopt.ml \ dev_t.ml \ common_utils.ml \ fsync.ml \ @@ -61,6 +63,7 @@ SOURCES_C = \ ../fish/uri.c \ dev_t-c.c \ fsync-c.c \ + getopt-c.c \ mkdtemp-c.c \ progress-c.c \ statvfs-c.c \ diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml...

...iff --git a/mllib/Makefile.am b/mllib/Makefile.am index e728d54..041d09a 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -31,6 +31,7 @@ SOURCES_MLI = \ curl.mli \ dev_t.mli \ fsync.mli \ + getopt.mli \ JSON.mli \ mkdtemp.mli \ planner.mli \ @@ -44,6 +45,7 @@ SOURCES_ML = \ $(OCAML_BYTES_COMPAT_ML) \ libdir.ml \ common_gettext.ml \ + getopt.ml \ dev_t.ml \ common_utils.ml \ fsync.ml \ @@ -61,6 +63,7 @@ SOURCES_C = \ ../fish/uri.c \ dev_t-c.c \ fsync-c.c \ + getopt-c.c \ mkdtemp-c.c \ progress-c.c \ statvfs-c.c \ @@ -142,15 +145,18 @@ libdir.ml: Makefile common_utils_...

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: -