similar to: [PATCH] inspector: extend the OS "name" in the RELAX NG schema

-- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

This just duplicated libosinfo information, and because it was never tested it didn't work most of the time. --- docs/C_SOURCE_FILES | 2 - generator/actions_inspection.ml | 67 --- generator/actions_inspection_deprecated.ml | 61 +++ inspector/Makefile.am | 11 +- inspector/example-debian-netinst-cd.xml | 23 -

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

Since Void Linux provides only an /etc/os-release with no VERSION_ID field, then special-case it to avoid that the os-release parsing ignore it. This provides basic distro identification, and icon. --- generator/actions.ml | 4 ++++ inspector/virt-inspector.rng | 1 + src/guestfs-internal.h | 1 + src/inspect-fs-unix.c | 14 ++++++++++++-- src/inspect-fs.c |

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>

Thanks: Qingzheng Zhang --- daemon/inspect_fs.ml | 7 +++++++ daemon/inspect_fs_unix.ml | 16 +++++++++++++++- daemon/inspect_types.ml | 2 ++ daemon/inspect_types.mli | 1 + generator/actions_inspection.ml | 4 ++++ inspector/virt-inspector.rng | 1 + 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml

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

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

Run xmllint to validate the XML output files of virt-inspector, so the schema is checked against actual output of virt-inspector. --- inspector/test-virt-inspector.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inspector/test-virt-inspector.sh b/inspector/test-virt-inspector.sh index 2f55cdc..33d749c 100755 --- a/inspector/test-virt-inspector.sh +++ b/inspector/test-virt-inspector.sh @@

Run xmllint to validate the XML output files of virt-inspector, so the schema is checked against actual output of virt-inspector. --- .gitignore | 1 + configure.ac | 2 ++ inspector/{test-virt-inspector.sh => test-virt-inspector.sh.in} | 2 ++ 3 files changed, 5 insertions(+) rename

If /etc/SuSE-release is empty then lines[0] is NULL, which is passed to strdup. As a result virt-inspector will segfault. This was introduced in commit 763ec36cf0c6ffa6d359b65ff7f1ee9ab1c7361e. Signed-off-by: Olaf Hering <olaf@aepfle.de> --- src/inspect-fs-unix.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c index 5fabaa2..c7d52c4

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>

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

On Thursday, 5 October 2017 17:36:09 CEST Richard W.M. Jones wrote: > --- > inspector/inspector.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/inspector/inspector.c b/inspector/inspector.c > index 3583c61df..30d279987 100644 > --- a/inspector/inspector.c > +++ b/inspector/inspector.c > @@ -347,6 +347,7 @@ output_root

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: > > > --- > > > inspector/inspector.c | 12 +++++++++++- > > > 1 file changed, 11 insertions(+), 1 deletion(-) > > > > > > diff --git

--- inspector/inspector.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/inspector/inspector.c b/inspector/inspector.c index 3583c61df..30d279987 100644 --- a/inspector/inspector.c +++ b/inspector/inspector.c @@ -347,6 +347,7 @@ output_root (xmlTextWriterPtr xo, char *root) char buf[32]; char *canonical_root; size_t size; + int is_bsd; XMLERROR

'virt-inspector --xpath' can segfault. When run under valgrind, it shows this error: ==2254== Invalid free() / delete / delete[] / realloc() ==2254== at 0x4C29D6A: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==2254== by 0x53BA198: xmlFreeNodeList (tree.c:3690) ==2254== by 0x53B9F65: xmlFreeDoc (tree.c:1247) ==2254== by 0x405BFA: do_xpath (inspector.c:808)

Add command line options to optionally disable the output of the installed application, and the guest icon. This makes the inspection slightly faster, producing a smaller XML to parse/process in case there is no interest in these details. --- inspector/inspector.c | 59 +++++++++++++++++++++++++++----------------- inspector/virt-inspector.pod | 14 +++++++++++ 2 files changed, 51

On Friday, 6 October 2017 12:11:08 CEST Richard W.M. Jones wrote: > 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: > > > > >

--- inspector/virt-inspector.pod | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/inspector/virt-inspector.pod b/inspector/virt-inspector.pod index f8744b1..1282608 100644 --- a/inspector/virt-inspector.pod +++ b/inspector/virt-inspector.pod @@ -68,6 +68,12 @@ them with separate I<-a> options. The format of the disk image is auto-detected. To override this and force a particular