similar to: [PATCH] inspection: Deprecate APIs and remove support for inspecting installer CDs.

Split lib/osinfo.c to provide an API for other pieces of code (namely mllib) to reuse it. The ISO-related processing is thus moved into a lib/osinfo-iso.c file. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 422 +------------------------------------------------- lib/osinfo.h | 27 ++++ 4 files changed, 493

Split lib/osinfo.c to provide an API for other pieces of code (namely mllib) to reuse it. The ISO-related processing is thus moved into a lib/osinfo-iso.c file. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 464 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 424 +------------------------------------------------- lib/osinfo.h | 27 ++++ 4 files changed, 495

Split lib/osinfo.c to provide an API for other pieces of code (namely mllib) to reuse it. The ISO-related processing is thus moved into a lib/osinfo-iso.c file. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 420 +------------------------------------------------- lib/osinfo.h | 27 ++++ 4 files changed, 493

Split lib/osinfo.c to provide an API for other pieces of code (namely mllib) to reuse it. The ISO-related processing is thus moved into a lib/osinfo-iso.c file. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 420 +------------------------------------------------- lib/osinfo.h | 27 ++++ 4 files changed, 493

This patch is not complete yet because it needs to support Fedora, RHEL and Windows CDs. Some examples of the current output: $ virt-inspector ubuntu-10.10-desktop-amd64.iso <?xml version="1.0"?> <operatingsystems> <operatingsystem> <root>/dev/sda</root> <name>linux</name> <distro>ubuntu</distro>

src/osinfo.c has generic code to read the libosinfo DB. Add a wrapper around it to expose it in mllib for use in ocaml code. --- lib/Makefile.am | 2 + lib/osinfo-iso.c | 464 ++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/osinfo.c | 477 ++++++------------------------------------------------ lib/osinfo.h | 27 ++++ mllib/Makefile.am | 11 +- mllib/osinfo-c.c | 100

Make use of the common version code, and avoid a separate regexp. --- src/osinfo.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/osinfo.c b/src/osinfo.c index 4a4cbfc..f4e2c71 100644 --- a/src/osinfo.c +++ b/src/osinfo.c @@ -65,8 +65,6 @@ #include "guestfs.h" #include "guestfs-internal.h" -COMPILE_REGEXP (re_major_minor,

Use the version struct in inspect_fs to hold the version of a filesystem, adapting the inspection code to that. Also, move the parts of the version parsing to helper functions of the version struct, so common bits like parsing "X.Y" or "X" version strings is done only once. --- v2 changes: - adapt to v2 changes in patch #1 src/guestfs-internal.h | 8 +-

Change virt-inspector so it uses the common set of macros. I also added: - single_element(): creates <foo>bar</foo> which is used extensively by virt-inspector - base64(): used by virt-inspector for the icon --- common/utils/libxml2-writer-macros.h | 26 ++ inspector/inspector.c | 524 ++++++++++++--------------- 2 files changed, 258 insertions(+), 292

Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- .gitignore | 1 + inspector/Makefile.am | 1 + inspector/expected-coreos.img.xml | 30 +++++++++++ inspector/test-virt-inspector.sh | 2 +- tests/guests/Makefile.am | 6 +++ tests/guests/guest-aux/make-coreos-img.sh | 83

The osinfo has an "installer" attribute in <media>, which defaults to true, and there are few entries which are marked as not. --- src/guestfs-internal.h | 1 + src/inspect-fs-cd.c | 3 ++- src/osinfo.c | 11 ++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index 03f1034..2b49011 100644 ---

Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- .gitignore | 1 + inspector/Makefile.am | 1 + inspector/expected-coreos.img.xml | 30 +++++++++++ tests/guests/Makefile.am | 6 +++ tests/guests/guest-aux/make-coreos-img.sh | 83 +++++++++++++++++++++++++++++++ tests/guests/guests.xml.in | 16

On Wed, Sep 09, Pino Toscano wrote: > - the content of /etc/SuSE-release SUSE Linux Enterprise Server 12 (x86_64) VERSION = 12 PATCHLEVEL = 0 # This file is deprecated and will be removed in a future service pack or release. # Please check /etc/os-release for details about this release. > - the XML outout of `virt-inspector -a $img` <operatingsystems> <operatingsystem>

Add a new guestfs_int_merge_fs_inspections() function that merges the OS inspection information of two inspect_fs instances into one. This function is useful if the inspection information for an OS are gathered by inspecting multiple filesystems. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/guestfs-internal.h | 1 + src/inspect-fs.c | 102

Add a new guestfs_int_merge_fs_inspections() function that merges the OS inspection information of two inspect_fs instances into one. This function is useful if the inspection information for an OS are gathered by inspecting multiple filesystems. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/guestfs-internal.h | 1 + src/inspect-fs.c | 115

Signed-off-by: Nikos Skalkotos <skalkoto@gmail.com> --- .gitignore | 1 + inspector/Makefile.am | 1 + inspector/expected-archlinux.img.xml | 35 +++++++++++++++++ tests/guests/Makefile.am | 7 ++++ tests/guests/guest-aux/archlinux-package | 15 +++++++ tests/guests/guest-aux/make-archlinux-img.sh |

Because of previous automated commits, such as changing 'guestfs___' -> 'guestfs_int_', several function calls no longer lined up with their parameters, and some lines were too long. The bulk of this commit was done using emacs batch mode and the technique described here: http://www.cslab.pepperdine.edu/warford/BatchIndentationEmacs.html The changes suggested by emacs were

On Fri, Oct 06, 2017 at 09:53:27AM +0200, Pino Toscano wrote: > On Thursday, 5 October 2017 23:49:26 CEST Richard W.M. Jones wrote: > > On Thu, Oct 05, 2017 at 06:55:53PM +0200, Pino Toscano wrote: > > > On Thursday, 5 October 2017 17:36:09 CEST Richard W.M. Jones wrote: > > > > /* We need to mount everything up in order to read out the list of > > > >

--- inspector/virt-inspector.pl | 7 ++++- perl/lib/Sys/Guestfs/Lib.pm | 50 +++++++++++++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/inspector/virt-inspector.pl b/inspector/virt-inspector.pl index 09edbae..9148a48 100755 --- a/inspector/virt-inspector.pl +++ b/inspector/virt-inspector.pl @@ -357,7 +357,9 @@ sub output_text_os print

If a Linux guest has /etc/os-release (mandatory for systemd, so all the recent Linux distributions have it), try to parse it for the distro, its version, and its product name. If we cannot get all of them, the detection as done so far continues. Other than changes in the product_name string (which is free-form anyway, and already documented to not be parseable), there should be no regressions in