January 2020 - Libguestfs - libguestfs List Archives

[PATCH] python: remove also __pycache__ directories on clean
by Pino Toscano 09 Jan '20

09 Jan '20

--- python/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/Makefile.am b/python/Makefile.am index 9aca202b5..c2f57a6ba 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -159,4 +159,4 @@ CLEANFILES += \ utils.c clean-local: - rm -rf build dist + rm -rf build dist __pycache__ t/__pycache__ -- 2.24.1

2 1

[PATCH] daemon: reorder internal static libs to fix linking
by Pino Toscano 09 Jan '20

09 Jan '20

Move the interal static libraries as the last items in the list of libraries of guestfsd, to make sure their symbols are used for all the other libraries. This is because GCC resolves the symbols looking at the arguments from the beginning to the end of the command line. This currently does not cause failures, however it "just works" because of the tricky situation set up. The situation is the following: 1) common/utils contains few utility sources: one of them is utils.c, which contains various functions -- for example guestfs_int_free_string_list and guestfs_int_drive_name --, it is built as utils.o, and bundled in the static library libutils.a 2) common/mlutils builds a OCaml library with bindings for some utility functions in libutils.a, in particular guestfs_int_drive_name (but not guestfs_int_free_string_list); there are two versions of this library, one OCaml library (dllmlcutils.so) that links with libutils.a, and one static library (libmlcutils.a), which cannot specify the libraries it links to (as it is static) 3) when the daemon is linked, the command line was the following (simplified): $ gcc [...] -o guestfsd guestfsd-9p.o other_daemon_object.o [...] \ ../common/utils/.libs/libutils.a [...] -lmlcutils [...] Some of the objects of the daemon itself use guestfs_int_free_string_list, and thus the compiler opens libutils.a (it is after the objects in the command line) and picks utils.o, which contains also guestfs_int_drive_name (not used directly in the daemon); when linking later on with libmlcutils.a, the symbols for this static library (like guestfs_int_drive_name) are already resolved, and thus all the symbols are resolved, and the linking succeeds This fragile situation can be easily broken by moving e.g. guestfs_int_drive_name out of common/utils/utils.c to a new source (say utils2.c) still built as part of libutils.a: since nothing before -lmlcutils actually needs to pick utils2.o from libutils.a for symbols, then GCC will not be able to resolve all the symbols in libmlcutils.a. As solution, move libutils.a (and other internal static libraries) as last libraries to link guestfsd to: this way, GCC knows where to find all the symbols needed by all the objects and libraries specified in the command line. --- daemon/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index ab3019cc1..25948dbe9 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -217,9 +217,6 @@ guestfsd_LDFLAGS = \ -L../bundled/ocaml-augeas \ -L../common/mlpcre guestfsd_LDADD = \ - ../common/errnostring/liberrnostring.la \ - ../common/protocol/libprotocol.la \ - ../common/utils/libutils.la \ camldaemon.o \ $(ACL_LIBS) \ $(CAP_LIBS) \ @@ -236,7 +233,10 @@ guestfsd_LDADD = \ $(TSK_LIBS) \ $(RPC_LIBS) \ $(YARA_LIBS) \ - $(OCAML_LIBS) + $(OCAML_LIBS) \ + ../common/errnostring/liberrnostring.la \ + ../common/protocol/libprotocol.la \ + ../common/utils/libutils.la guestfsd_CPPFLAGS = \ -DCAML_NAME_SPACE \ -- 2.24.1

2 1

[PATCH] inspect: document OpenMandriva as detected distro
by Pino Toscano 09 Jan '20

09 Jan '20

Also extend the virt-inspector RNG schema to allow it. Followup of commit a4ef6716b4119e476949c55f1bc12d81e735f0c0. --- generator/actions_inspection.ml | 4 ++++ inspector/virt-inspector.rng | 1 + 2 files changed, 5 insertions(+) diff --git a/generator/actions_inspection.ml b/generator/actions_inspection.ml index 809344c8c..054bd8b75 100644 --- a/generator/actions_inspection.ml +++ b/generator/actions_inspection.ml @@ -246,6 +246,10 @@ NetBSD. OpenBSD. +=item \"openmandriva\" + +OpenMandriva. + =item \"opensuse\" OpenSUSE. diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng index 1e3a58af8..7807e4d7c 100644 --- a/inspector/virt-inspector.rng +++ b/inspector/virt-inspector.rng @@ -94,6 +94,7 @@ <value>neokylin</value> <value>netbsd</value> <value>openbsd</value> + <value>openmandriva</value> <value>opensuse</value> <value>oraclelinux</value> <value>pardus</value> -- 2.24.1

2 2

[v2v PATCH] docs: remove paragraph about VMware tools on Windows
by Pino Toscano 09 Jan '20

09 Jan '20

Starting from libguestfs/virt-v2v 1.39.12, virt-v2v attempts to uninstall the VMware tools from Windows guests, so there is no need to remove them manually before the conversion. Thanks to: Ming Xie. --- docs/virt-v2v-input-vmware.pod | 36 ---------------------------------- 1 file changed, 36 deletions(-) diff --git a/docs/virt-v2v-input-vmware.pod b/docs/virt-v2v-input-vmware.pod index 11adf1b6..ec905376 100644 --- a/docs/virt-v2v-input-vmware.pod +++ b/docs/virt-v2v-input-vmware.pod @@ -107,18 +107,6 @@ If you find a folder of files called F<I<guest>.vmx>, F<I<guest>.vmxf>, F<I<guest>.nvram> and one or more F<.vmdk> disk images, then you can use this method. -=head2 VMX: Remove VMware tools from Windows guests - -For Windows guests, you should remove VMware tools before conversion. -Although this is not strictly necessary, and the guest will still be -able to run, if you don't do this then the converted guest will -complain on every boot. The tools cannot be removed after conversion -because the uninstaller checks if it is running on VMware and refuses -to start (which is also the reason that virt-v2v cannot remove them). - -This is not necessary for Linux guests, as virt-v2v is able to remove -VMware tools. - =head2 VMX: Guest must be shut down B<The guest must be shut down before conversion starts>. If you don't @@ -320,18 +308,6 @@ Virt-v2v is able to import guests from VMware’s OVA (Open Virtualization Appliance) files. Only OVAs exported from VMware vSphere will work. -=head2 OVA: Remove VMware tools from Windows guests - -For Windows guests, you should remove VMware tools before conversion. -Although this is not strictly necessary, and the guest will still be -able to run, if you don't do this then the converted guest will -complain on every boot. The tools cannot be removed after conversion -because the uninstaller checks if it is running on VMware and refuses -to start (which is also the reason that virt-v2v cannot remove them). - -This is not necessary for Linux guests, as virt-v2v is able to remove -VMware tools. - =head2 OVA: Create OVA To create an OVA in vSphere, use the "Export OVF Template" option @@ -384,18 +360,6 @@ Virt-v2v uses libvirt for access to vCenter, and therefore the input mode should be I<-i libvirt>. As this is the default, you don't need to specify it on the command line. -=head2 vCenter: Remove VMware tools from Windows guests - -For Windows guests, you should remove VMware tools before conversion. -Although this is not strictly necessary, and the guest will still be -able to run, if you don't do this then the converted guest will -complain on every boot. The tools cannot be removed after conversion -because the uninstaller checks if it is running on VMware and refuses -to start (which is also the reason that virt-v2v cannot remove them). - -This is not necessary for Linux guests, as virt-v2v is able to remove -VMware tools. - =head2 vCenter: URI The libvirt URI of a vCenter server looks something like this: -- 2.24.1

2 1

[PATCH] po: reduce the list of extracted sources
by Pino Toscano 09 Jan '20

09 Jan '20

Prune from the list of sources where to extract messages various sources with no messages: - .pl and .pm files, as they do not contain messages: almost all the .pl files are tests, and the only .pm file is the Perl Sys::Guestfs module, which wraps the XS extension - dummy.c sources; they are empty sources used to build OCaml-only targets using automake - gperf generated sources - C/OCaml tests --- Makefile.am | 6 ++++-- po/POTFILES | 23 ----------------------- po/POTFILES-ml | 11 ----------- 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/Makefile.am b/Makefile.am index ec342225a..25255a62d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -328,11 +328,12 @@ docs/C_SOURCE_FILES: configure.ac po/POTFILES: configure.ac rm -f $@ $@-t cd $(srcdir); \ - find $(DIST_SUBDIRS) -name '*.c' -o -name '*.pl' -o -name '*.pm' | \ + find $(DIST_SUBDIRS) -name '*.c' | \ grep -v -E '^(examples|gnulib|perl/(blib|examples)|po-docs|tests|test-data|bundled)/' | \ - grep -v -E '/((guestfs|rc)_protocol\.c)$$' | \ + grep -v -E '/((guestfs|rc)_protocol\.c|dummy\.c)$$' | \ grep -v -E '^python/utils\.c$$' | \ grep -v -E '^perl/lib/Sys/Guestfs\.c$$' | \ + grep -v -E '.*-(tests|gperf)\.c$$' | \ LC_ALL=C sort -u > $@-t mv $@-t $@ @@ -341,6 +342,7 @@ po/POTFILES-ml: configure.ac cd $(srcdir); \ find builder common/ml* customize dib get-kernel resize sparsify sysprep -name '*.ml' | \ grep -v '^builder/templates/' | \ + grep -v -E '.*_tests\.ml$$' | \ LC_ALL=C sort > $@-t mv $@-t $@ diff --git a/po/POTFILES b/po/POTFILES index 64eb3f9ce..3cd1ddd47 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -12,23 +12,15 @@ cat/log.c cat/ls.c cat/tail.c common/edit/file-edit.c -common/errnostring/errnostring-gperf.c common/errnostring/errnostring.c -common/mlcustomize/dummy.c -common/mlgettext/dummy.c -common/mlpcre/dummy.c common/mlpcre/pcre-c.c common/mlprogress/progress-c.c -common/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.c @@ -54,9 +45,7 @@ common/utils/utils.c common/visit/visit.c common/windows/windows.c customize/crypt-c.c -customize/dummy.c customize/perl_edit-c.c -customize/test-password.pl daemon/9p.c daemon/acl.c daemon/augeas.c @@ -181,9 +170,7 @@ daemon/zerofree.c df/df.c df/main.c df/output.c -dib/dummy.c diff/diff.c -docs/make-internal-documentation.pl edit/edit.c erlang/actions-0.c erlang/actions-1.c @@ -196,7 +183,6 @@ erlang/dispatch.c erlang/main.c erlang/structs.c fish/alloc.c -fish/cmds-gperf.c fish/cmds.c fish/completion.c fish/copy.c @@ -246,7 +232,6 @@ fuse/guestunmount.c fuse/test-fuse.c fuse/test-guestmount-fd.c fuse/test-guestunmount-fd.c -get-kernel/dummy.c gobject/src/optargs-add_domain.c gobject/src/optargs-add_drive.c gobject/src/optargs-add_drive_scratch.c @@ -405,7 +390,6 @@ lib/tmpdirs.c lib/tsk.c lib/uefi.c lib/umask.c -lib/unit-tests.c lib/version.c lib/wait.c lib/whole-file.c @@ -415,8 +399,6 @@ make-fs/make-fs.c ocaml/guestfs-c-actions.c ocaml/guestfs-c-errnos.c ocaml/guestfs-c.c -perl/bindtests.pl -perl/lib/Sys/Guestfs.pm php/extension/guestfs_php.c python/actions-0.c python/actions-1.c @@ -431,9 +413,6 @@ python/structs.c rescue/escape.c rescue/rescue.c rescue/suggest.c -rescue/test-virt-rescue.pl -resize/dummy.c -resize/test-virt-resize.pl ruby/ext/guestfs/actions-0.c ruby/ext/guestfs/actions-1.c ruby/ext/guestfs/actions-2.c @@ -443,6 +422,4 @@ ruby/ext/guestfs/actions-5.c ruby/ext/guestfs/actions-6.c ruby/ext/guestfs/handle.c ruby/ext/guestfs/module.c -sparsify/dummy.c -sysprep/dummy.c test-tool/test-tool.c diff --git a/po/POTFILES-ml b/po/POTFILES-ml index 96de6837b..a9b6efdaa 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -4,7 +4,6 @@ builder/cmdline.ml builder/downloader.ml builder/index.ml builder/index_parser.ml -builder/index_parser_tests.ml builder/ini_reader.ml builder/languages.ml builder/list_entries.ml @@ -23,37 +22,27 @@ common/mlcustomize/customize_cmdline.ml common/mlcustomize/firstboot.ml common/mlgettext/common_gettext.ml common/mlpcre/PCRE.ml -common/mlpcre/pcre_tests.ml common/mlprogress/progress.ml common/mlstdutils/guestfs_config.ml common/mlstdutils/std_utils.ml -common/mlstdutils/std_utils_tests.ml common/mlstdutils/stringMap.ml common/mlstdutils/stringSet.ml common/mltools/JSON.ml common/mltools/JSON_parser.ml -common/mltools/JSON_parser_tests.ml -common/mltools/JSON_tests.ml common/mltools/URI.ml common/mltools/checksums.ml common/mltools/curl.ml common/mltools/getopt.ml -common/mltools/getopt_tests.ml -common/mltools/machine_readable_tests.ml common/mltools/planner.ml common/mltools/regedit.ml common/mltools/registry.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/mlvisit/visit.ml -common/mlvisit/visit_tests.ml common/mlxml/xml.ml customize/append_line.ml customize/crypt.ml -- 2.24.1

2 1

[PATCH] docs: exclude dummy.c sources
by Pino Toscano 09 Jan '20

09 Jan '20

They are empty sources used to build OCaml-only targets using automake, so there is no documentation to extract. --- Makefile.am | 1 + docs/C_SOURCE_FILES | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index d3cf64cc1..ec342225a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -320,6 +320,7 @@ docs/C_SOURCE_FILES: configure.ac grep -v -E '/(guestfs|rc)_protocol\.' | \ grep -v -E '.*/errnostring\.' | \ grep -v -E '.*-gperf\.' | \ + grep -v -E '/dummy.c$$' | \ LC_ALL=C sort -u > $@-t mv $@-t $@ diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES index c2d1c3465..c9fc3533e 100644 --- a/docs/C_SOURCE_FILES +++ b/docs/C_SOURCE_FILES @@ -12,21 +12,14 @@ cat/ls.c cat/tail.c common/edit/file-edit.c common/edit/file-edit.h -common/mlcustomize/dummy.c -common/mlgettext/dummy.c -common/mlpcre/dummy.c common/mlpcre/pcre-c.c common/mlprogress/progress-c.c -common/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 @@ -67,7 +60,6 @@ common/visit/visit.h common/windows/windows.c common/windows/windows.h customize/crypt-c.c -customize/dummy.c customize/perl_edit-c.c daemon/9p.c daemon/acl.c @@ -202,7 +194,6 @@ df/df.c df/main.c df/output.c df/virt-df.h -dib/dummy.c diff/diff.c edit/edit.c erlang/actions-0.c @@ -270,7 +261,6 @@ fuse/guestunmount.c fuse/test-fuse.c fuse/test-guestmount-fd.c fuse/test-guestunmount-fd.c -get-kernel/dummy.c inspector/inspector.c java/actions-0.c java/actions-1.c @@ -370,7 +360,6 @@ rescue/escape.c rescue/rescue.c rescue/rescue.h rescue/suggest.c -resize/dummy.c ruby/ext/guestfs/actions-0.c ruby/ext/guestfs/actions-1.c ruby/ext/guestfs/actions-2.c @@ -381,6 +370,4 @@ ruby/ext/guestfs/actions-6.c ruby/ext/guestfs/actions.h ruby/ext/guestfs/handle.c ruby/ext/guestfs/module.c -sparsify/dummy.c -sysprep/dummy.c test-tool/test-tool.c -- 2.24.1

2 1

[PATCH 0/3] Various dist/build fixes
by Pino Toscano 09 Jan '20

09 Jan '20

Fix one dist issue, and various builddir!=srcdir issues, also with the patch proposed in the Debian bug #946594. Patch #3 applies also to the virt-v2v repository, and will be committed there too (with references to the libguestfs commit). Pino Toscano (3): inspector: ship the actual test script tests: fix srcdir references build: fix make implicit dependencies on ml/mli files align/test-virt-alignment-scan-docs.sh | 2 +- builder/templates/Makefile.am | 4 +++- builder/templates/validate.sh | 4 ++-- builder/test-docs.sh | 4 ++-- builder/test-virt-index-validate.sh | 10 +++++----- cat/test-docs.sh | 10 +++++----- customize/test-virt-customize-docs.sh | 2 +- df/test-virt-df-docs.sh | 2 +- dib/test-virt-dib-docs.sh | 2 +- diff/test-virt-diff-docs.sh | 2 +- edit/test-virt-edit-docs.sh | 2 +- fish/test-docs.sh | 2 +- format/test-virt-format-docs.sh | 2 +- fuse/test-docs.sh | 4 ++-- get-kernel/test-virt-get-kernel-docs.sh | 2 +- inspector/Makefile.am | 2 +- inspector/test-virt-inspector-docs.sh | 2 +- inspector/test-virt-inspector-luks.sh | 2 +- inspector/test-virt-inspector.sh | 2 +- make-fs/test-virt-make-fs-docs.sh | 2 +- rescue/test-virt-rescue-docs.sh | 2 +- resize/test-virt-resize-docs.sh | 2 +- sparsify/test-virt-sparsify-docs.sh | 2 +- subdir-rules.mk | 6 +++--- sysprep/test-virt-sysprep-docs.sh | 2 +- test-tool/test-libguestfs-test-tool-docs.sh | 2 +- 26 files changed, 41 insertions(+), 39 deletions(-) -- 2.23.0

2 5

[common PATCH] tests: fix srcdir references
by Pino Toscano 09 Jan '20

09 Jan '20

Make sure to properly reference to files in the source directory. --- mltools/test-tools-messages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mltools/test-tools-messages.sh b/mltools/test-tools-messages.sh index 0e24d6c..73e1beb 100755 --- a/mltools/test-tools-messages.sh +++ b/mltools/test-tools-messages.sh @@ -25,4 +25,4 @@ set -x $TEST_FUNCTIONS skip_if_skipped -$PYTHON parse_tools_messages_test.py +$PYTHON "$srcdir/parse_tools_messages_test.py" -- 2.23.0

2 1

[v2v PATCH 0/3] Various dist/build fixes
by Pino Toscano 09 Jan '20

09 Jan '20

Fix one dist issue, and almost all the builddir!=srcdir issues. (For the record, only 3 tests still fail in that setup.) Pino Toscano (3): libvirt-ocaml: add libvirt_c.h as source tests: fix path to sources of fake-virtio-win.iso tests: fix srcdir references bundled/libvirt-ocaml/Makefile.am | 1 + test-data/fake-virtio-win/Makefile.am | 2 +- tests/rhbz1232192.sh | 2 +- tests/test-v2v-cdrom.sh | 4 ++-- tests/test-v2v-floppy.sh | 4 ++-- tests/test-v2v-i-ova-as-root.sh | 2 +- tests/test-v2v-i-ova-bad-sha1.sh | 2 +- tests/test-v2v-i-ova-bad-sha256.sh | 2 +- tests/test-v2v-i-ova-formats.sh | 4 ++-- tests/test-v2v-i-ova-good-checksums.sh | 2 +- tests/test-v2v-i-ova-gz.sh | 4 ++-- tests/test-v2v-i-ova-invalid-manifest1.sh | 2 +- tests/test-v2v-i-ova-invalid-manifest2.sh | 2 +- tests/test-v2v-i-ova-snapshots.sh | 6 +++--- tests/test-v2v-i-ova-subfolders.sh | 6 +++--- tests/test-v2v-i-ova-tar.sh | 6 +++--- tests/test-v2v-i-ova-two-disks.sh | 6 +++--- tests/test-v2v-i-ova.sh | 4 ++-- tests/test-v2v-i-vmx.sh | 2 +- tests/test-v2v-mac.sh | 4 ++-- tests/test-v2v-networks-and-bridges.sh | 4 ++-- tests/test-v2v-o-rhv.sh | 2 +- tests/test-v2v-o-vdsm-options.sh | 2 +- tests/test-v2v-print-estimate.sh | 2 +- tests/test-v2v-print-source.sh | 4 ++-- tests/test-v2v-sound.sh | 2 +- v2v/test-v2v-python-syntax.sh | 4 ++-- 27 files changed, 44 insertions(+), 43 deletions(-) -- 2.23.0

2 6

[PATCH] inspect: avoid returning "unknownX.Y" for unknown Linux distros
by Pino Toscano 09 Jan '20

09 Jan '20

If it is not possible to detect the distribution of a Linux OS, do not propose "unknownX.Y" (where X is the major version number, and Y the minor) as short osinfo ID. Just return "unknown" instead. --- lib/inspect-osinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/inspect-osinfo.c b/lib/inspect-osinfo.c index ba07e4564..d2272dfdd 100644 --- a/lib/inspect-osinfo.c +++ b/lib/inspect-osinfo.c @@ -70,7 +70,7 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root) return safe_asprintf (g, "%s%d.%d", distro, major, minor); } - if (major > 0 || minor > 0) + if (STRNEQ (distro, "unknown") && (major > 0 || minor > 0)) return safe_asprintf (g, "%s%d.%d", distro, major, minor); } else if (STREQ (type, "freebsd") || STREQ (type, "netbsd") || STREQ (type, "openbsd")) -- 2.24.1

2 1