search for: inspect_utils

Although the commit message ties this to https://bugzilla.redhat.com/1804207, in fact I believe this commit could be applied independently. It's a simple optimization. Rich.

...vex back as it was before commit 64f49df747c0937d9433eb11d4191d92a4af748c. --- .gitignore | 1 + configure.ac | 1 + daemon/Makefile.am | 2 ++ daemon/daemon_config.ml.in | 20 ++++++++++++++++++++ daemon/daemon_config.mli | 19 +++++++++++++++++++ daemon/inspect_utils.ml | 6 +++++- docs/guestfs-building.pod | 2 +- m4/guestfs-ocaml.m4 | 19 +++++++++++++++++++ 8 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 daemon/daemon_config.ml.in create mode 100644 daemon/daemon_config.mli diff --git a/.gitignore b/.gitignore index 8276a...

...ed by inspection. Note that this commit has no effect on its own, it just links extra dead code into the daemon. --- daemon/Makefile.am | 4 + daemon/inspect_types.ml | 314 +++++++++++++++++++++++++++++++++++++++++++++++ daemon/inspect_types.mli | 182 +++++++++++++++++++++++++++ daemon/inspect_utils.ml | 187 ++++++++++++++++++++++++++++ daemon/inspect_utils.mli | 53 ++++++++ 5 files changed, 740 insertions(+) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 3e8bdb44f..51737e511 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -252,6 +252,8 @@ SOURCES_MLI = \ file.ml...

...tfs (the daemon, actually). Amend the building documentation accordingly. --- .gitignore | 1 + configure.ac | 1 + daemon/Makefile.am | 2 ++ daemon/config_daemon.ml.in | 20 ++++++++++++++++++++ daemon/config_daemon.mli | 19 +++++++++++++++++++ daemon/inspect_utils.ml | 2 +- docs/guestfs-building.pod | 2 +- m4/guestfs-ocaml.m4 | 19 +++++++++++++++++++ 8 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 daemon/config_daemon.ml.in create mode 100644 daemon/config_daemon.mli diff --git a/.gitignore b/.gitignore index 8276afb26...

...) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index a4657ed86..80314a524 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -254,6 +254,7 @@ SOURCES_MLI = \ inspect_fs.mli \ inspect_fs_unix.mli \ inspect_fs_unix_fstab.mli \ + inspect_fs_windows.mli \ inspect_types.mli \ inspect_utils.mli \ is.mli \ @@ -296,6 +297,7 @@ SOURCES_ML = \ inspect_utils.ml \ inspect_fs_unix_fstab.ml \ inspect_fs_unix.ml \ + inspect_fs_windows.ml \ inspect_fs.ml \ inspect.ml \ callbacks.ml \ diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml index 9153e68a5..10a15827b 100644 --- a/d...

Use NEVR when querying RPM for the list of files of a package, instead of ENVR. Also, use the epoch only when non-zero, and version of RPM supports it. The approach is basically copied from what supermin does in its RPM package handler. --- v2v/linux.ml | 52 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/v2v/linux.ml

...let re_rpm_version = PCRE.compile "(\\d+)\\.(\\d+)" ... let ver = if PCRE.matches re_rpm_version ver then (int_of_string (PCRE.sub 1), int_of_string (PCRE.sub 2)) else (0, 0) in let is_rpm_lt_4_11 = ver < (4, 11) in (We already have this sort of code in daemon/inspect_utils.ml, but we can't reuse it). Rich. > + let is_rpm_lt_4_11 = > + rpm_major < 4 || (rpm_major = 4 && rpm_minor < 11) in > let pkg_name = > - sprintf "%s-%s-%s" app.G.app2_name > - app.G.app2_version app.G.app2_release in > - l...

...b/daemon/Makefile.am index 51737e511..f035add2b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -252,6 +252,10 @@ SOURCES_MLI = \ file.mli \ filearch.mli \ findfs.mli \ + inspect.mli \ + inspect_fs.mli \ + inspect_fs_unix.mli \ + inspect_fs_unix_fstab.mli \ inspect_types.mli \ inspect_utils.mli \ is.mli \ @@ -291,6 +295,10 @@ SOURCES_ML = \ realpath.ml \ inspect_types.ml \ inspect_utils.ml \ + inspect_fs_unix_fstab.ml \ + inspect_fs_unix.ml \ + inspect_fs.ml \ + inspect.ml \ callbacks.ml \ daemon.ml diff --git a/daemon/inspect.ml b/daemon/inspect.ml new file mode 100644...

...b/daemon/Makefile.am index cab95f34f..a4657ed86 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -250,6 +250,10 @@ SOURCES_MLI = \ file.mli \ filearch.mli \ findfs.mli \ + inspect.mli \ + inspect_fs.mli \ + inspect_fs_unix.mli \ + inspect_fs_unix_fstab.mli \ inspect_types.mli \ inspect_utils.mli \ is.mli \ @@ -290,6 +294,10 @@ SOURCES_ML = \ realpath.ml \ inspect_types.ml \ inspect_utils.ml \ + inspect_fs_unix_fstab.ml \ + inspect_fs_unix.ml \ + inspect_fs.ml \ + inspect.ml \ callbacks.ml \ daemon.ml diff --git a/daemon/inspect.ml b/daemon/inspect.ml new file mode 100644...

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.

v10: https://www.redhat.com/archives/libguestfs/2017-July/msg00245.html No actual change here, but I rebased and retested. Also this series now does not depend on any other patch series since everything else needed is upstream. Rich.

v9 was here: https://www.redhat.com/archives/libguestfs/2017-July/msg00139.html This depends on these three series (the first two being single minor patches): https://www.redhat.com/archives/libguestfs/2017-July/msg00207.html https://www.redhat.com/archives/libguestfs/2017-July/msg00209.html https://www.redhat.com/archives/libguestfs/2017-July/msg00215.html There is no substantive change. I

This depends on the patch series "[PATCH 00/27] Reimplement many daemon APIs in OCaml." (https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html) v8 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00274.html v9: - I split up the mega-patch into a more reviewable series of smaller, incremental patches. There are some other changes vs v8, but

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

...-cleanups.c \ structs-cleanups.h \ @@ -274,6 +273,7 @@ SOURCES_MLI = \ optgroups.mli \ parted.mli \ realpath.mli \ + statvfs.mli \ structs.mli \ sysroot.mli \ utils.mli @@ -300,6 +300,7 @@ SOURCES_ML = \ parted.ml \ listfs.ml \ realpath.ml \ + statvfs.ml \ inspect_types.ml \ inspect_utils.ml \ inspect_fs_unix_fstab.ml \ @@ -348,8 +349,10 @@ camldaemon.o: $(OBJECTS) $(OCAMLFIND) $(BEST) -output-obj -o $@ \ $(OCAMLFLAGS) $(OCAMLPACKAGES) \ -linkpkg \ - mlaugeas.$(MLARCHIVE) mlpcre.$(MLARCHIVE) \ - mlcutils.$(MLARCHIVE) mlstdutils.$(MLARCHIVE) \ + mlaugeas.$...

v2 -> v3: - Drop gnulib fallback.

It started out as "this'll be just a simple fix ..." and turned into something a bit over-engineered in the end. Here it is anyway. Rich.

v1 -> v2: - Removed the f_type field from StatVFS.statvfs structure. - New function StatVFS.filesystem_is_remote, written in C. [Thinking about it, this should probably be called ?is_network_filesystem?, but I can change that before pushing]. - Use statvfs instead of fstatvfs, and statfs instead of fstatfs. - Rejigged the comments in builder/builder.ml to make them simpler

v6 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html and this requires the utilities refactoring posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html Inspection is now complete[*], although not very well tested. I'm intending to compare the output of many guests using old & new virt-inspector to see if I can find any

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.