- Devel - libvirt List Archives

[libvirt] [PATCH v2] util: activate directory override when used from library
by Daniel P. Berrangé 09 Sep '19

09 Sep '19

The Perl bindings for libvirt use the test driver for unit tests. This tries to load the cpu_map/index.xml file, and when run from an uninstalled build will fail. The problem is that virFileActivateDirOverride is called by our various binaries like libvirtd, virsh, but is not called when a 3rd party app uses libvirt.so To deal with this we allow the LIBVIRT_DIR_OVERRIDE=1 env variable to be set and make virInitialize look for this. The 'run' script will set it, so now build using this script to run against an uninstalled tree we will correctly resolve files to the source tree. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changed in v2: - Use a separate function for env var override run.in | 7 ++++++ src/libvirt.c | 2 ++ src/libvirt_private.syms | 3 ++- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/remote/remote_daemon.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/util/virfile.c | 40 ++++++++++++++++++++++++++--------- src/util/virfile.h | 3 ++- tests/testutils.c | 2 +- tools/virsh.c | 2 +- tools/virt-admin.c | 2 +- 12 files changed, 50 insertions(+), 19 deletions(-) diff --git a/run.in b/run.in index 9a1c6ea11a..ed946a0899 100644 --- a/run.in +++ b/run.in @@ -60,6 +60,13 @@ else fi export PKG_CONFIG_PATH +# Ensure that any 3rd party apps using libvirt.so from +# the build tree get files resolved to the build/source +# tree too. Typically useful for language bindings +# running tests against non-installed libvirt. +LIBVIRT_DIR_OVERRIDE=1 +export LIBVIRT_DIR_OVERRIDE + # This is a cheap way to find some use-after-free and uninitialized # read problems when using glibc. random_val="$(awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)" diff --git a/src/libvirt.c b/src/libvirt.c index 9650aaa453..a1ecd8bacc 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -247,6 +247,8 @@ virGlobalInit(void) virErrorInitialize() < 0) goto error; + virFileActivateDirOverrideForLib(); + if (getuid() != geteuid() || getgid() != getegid()) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a34d92f5ef..21cd6a8ef7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1917,7 +1917,8 @@ virDirOpenQuiet; virDirRead; virFileAbsPath; virFileAccessibleAs; -virFileActivateDirOverride; +virFileActivateDirOverrideForLib; +virFileActivateDirOverrideForProg; virFileBindMountDevice; virFileBuildPath; virFileCanonicalizePath; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index ac242bf65c..edb61d74c0 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1188,7 +1188,7 @@ int main(int argc, char **argv) { } } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (!(config = virLockDaemonConfigNew(privileged))) { VIR_ERROR(_("Can't create initial configuration")); diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index f74e900aea..85c58aaa7b 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -960,7 +960,7 @@ int main(int argc, char **argv) { } } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (!(config = virLogDaemonConfigNew(privileged))) { VIR_ERROR(_("Can't create initial configuration")); diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 546328b24d..8cf9412128 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -1034,7 +1034,7 @@ int main(int argc, char **argv) { virUpdateSelfLastChanged(argv[0]); - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); while (1) { int optidx = 0; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 3f9d775acc..326cfaf52a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1427,7 +1427,7 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); /* Initialize the log system */ virLogSetFromEnv(); diff --git a/src/util/virfile.c b/src/util/virfile.c index 81a3c096eb..d9ac482435 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1766,7 +1766,7 @@ virFileFindResource(const char *filename, /** - * virFileActivateDirOverride: + * virFileActivateDirOverrideForProg: * @argv0: argv[0] of the calling program * * Look at @argv0 and try to detect if running from @@ -1774,20 +1774,40 @@ virFileFindResource(const char *filename, * on the binary name, or '/.libs/' in the path */ void -virFileActivateDirOverride(const char *argv0) +virFileActivateDirOverrideForProg(const char *argv0) { - char *file = strrchr(argv0, '/'); - if (!file || file[1] == '\0') - return; - file++; - if (STRPREFIX(file, "lt-") || - strstr(argv0, "/.libs/")) { - useDirOverride = true; - VIR_DEBUG("Activating build dir override for %s", argv0); + if (argv0 == NULL) { + if (getenv("LIBVIRT_DIR_OVERRIDE") != NULL) + useDirOverride = true; + } else { + char *file = strrchr(argv0, '/'); + if (!file || file[1] == '\0') + return; + file++; + if (STRPREFIX(file, "lt-") || + strstr(argv0, "/.libs/")) { + useDirOverride = true; + VIR_DEBUG("Activating build dir override for %s", argv0); + } } } +/** + * virFileActivateDirOverrideForEnv: + * + * Look for LIBVIRT_DIR_OVERRIDE env var to see if + * we should find files from the build/src tree + * instead of install tree + */ +void +virFileActivateDirOverrideForLib(void) +{ + if (getenv("LIBVIRT_DIR_OVERRIDE") != NULL) + useDirOverride = true; +} + + /** * virFileLength: * @path: full path of the file diff --git a/src/util/virfile.h b/src/util/virfile.h index a8a5dd8074..2b037b00aa 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -193,8 +193,9 @@ char *virFileFindResourceFull(const char *filename, const char *installdir, const char *envname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5); -void virFileActivateDirOverride(const char *argv0) +void virFileActivateDirOverrideForProg(const char *argv0) ATTRIBUTE_NONNULL(1); +void virFileActivateDirOverrideForLib(void); off_t virFileLength(const char *path, int fd) ATTRIBUTE_NONNULL(1); bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); diff --git a/tests/testutils.c b/tests/testutils.c index 8b2c51044e..003893dc44 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -992,7 +992,7 @@ int virTestMain(int argc, setenv("VIR_TEST_MOCK_PROGNAME", progname, 1); - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (virTestSetEnvPath() < 0) return EXIT_AM_HARDFAIL; diff --git a/tools/virsh.c b/tools/virsh.c index e76d242ec8..ec20f35a77 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -897,7 +897,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 4ff006ffcb..e549ec1f83 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1552,7 +1552,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); -- 2.21.0

2 2

[libvirt] [dockerfiles PATCH] refresh: Update Dockerfiles due to new "locales" dependency
by Fabiano Fidêncio 09 Sep '19

09 Sep '19

Let's refresh the archived Dockerfiles as "locales" dependency has to be added to all Debian, Ubuntu, and Fedora files. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- This commit is available in the following branch: https://gitlab.com/fidencio/libvirt-dockerfiles/tree/wip/locales Here's the libvirt-jenkins-ci counter part: https://www.redhat.com/archives/libvir-list/2019-September/msg00270.html --- buildenv-libosinfo-debian-10.zip | Bin 559 -> 567 bytes buildenv-libosinfo-debian-sid.zip | Bin 559 -> 567 bytes buildenv-libosinfo-fedora-29.zip | Bin 492 -> 502 bytes buildenv-libosinfo-fedora-30.zip | Bin 555 -> 564 bytes buildenv-libosinfo-fedora-rawhide.zip | Bin 512 -> 522 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 887 -> 892 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 880 -> 885 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 884 -> 890 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 883 -> 889 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 878 -> 885 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 892 -> 896 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 882 -> 887 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 890 -> 896 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 883 -> 888 bytes buildenv-libvirt-debian-10.zip | Bin 773 -> 778 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 896 -> 901 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 887 -> 892 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 893 -> 898 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 886 -> 892 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 898 -> 903 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 889 -> 895 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 898 -> 903 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 890 -> 895 bytes buildenv-libvirt-debian-9.zip | Bin 777 -> 782 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 886 -> 891 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 879 -> 885 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 884 -> 890 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 883 -> 889 bytes buildenv-libvirt-debian-sid-cross-mips.zip | Bin 877 -> 884 bytes buildenv-libvirt-debian-sid-cross-mips64el.zip | Bin 892 -> 896 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 882 -> 887 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 890 -> 896 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 883 -> 888 bytes buildenv-libvirt-debian-sid.zip | Bin 773 -> 778 bytes buildenv-libvirt-fedora-29.zip | Bin 694 -> 706 bytes buildenv-libvirt-fedora-30.zip | Bin 809 -> 821 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 714 -> 726 bytes buildenv-libvirt-ubuntu-16.zip | Bin 784 -> 788 bytes buildenv-libvirt-ubuntu-18.zip | Bin 783 -> 790 bytes 39 files changed, 0 insertions(+), 0 deletions(-) diff --git a/buildenv-libosinfo-debian-10.zip b/buildenv-libosinfo-debian-10.zip index 4a057eb..6413bb9 100644 Binary files a/buildenv-libosinfo-debian-10.zip and b/buildenv-libosinfo-debian-10.zip differ diff --git a/buildenv-libosinfo-debian-sid.zip b/buildenv-libosinfo-debian-sid.zip index 86cf9dd..b077868 100644 Binary files a/buildenv-libosinfo-debian-sid.zip and b/buildenv-libosinfo-debian-sid.zip differ diff --git a/buildenv-libosinfo-fedora-29.zip b/buildenv-libosinfo-fedora-29.zip index 8fac1a5..185000f 100644 Binary files a/buildenv-libosinfo-fedora-29.zip and b/buildenv-libosinfo-fedora-29.zip differ diff --git a/buildenv-libosinfo-fedora-30.zip b/buildenv-libosinfo-fedora-30.zip index 10f89e9..f3a0914 100644 Binary files a/buildenv-libosinfo-fedora-30.zip and b/buildenv-libosinfo-fedora-30.zip differ diff --git a/buildenv-libosinfo-fedora-rawhide.zip b/buildenv-libosinfo-fedora-rawhide.zip index 7cf81df..8d2d603 100644 Binary files a/buildenv-libosinfo-fedora-rawhide.zip and b/buildenv-libosinfo-fedora-rawhide.zip differ diff --git a/buildenv-libvirt-debian-10-cross-aarch64.zip b/buildenv-libvirt-debian-10-cross-aarch64.zip index 8f2dbbc..ae285b9 100644 Binary files a/buildenv-libvirt-debian-10-cross-aarch64.zip and b/buildenv-libvirt-debian-10-cross-aarch64.zip differ diff --git a/buildenv-libvirt-debian-10-cross-armv6l.zip b/buildenv-libvirt-debian-10-cross-armv6l.zip index 774ff27..bb4adda 100644 Binary files a/buildenv-libvirt-debian-10-cross-armv6l.zip and b/buildenv-libvirt-debian-10-cross-armv6l.zip differ diff --git a/buildenv-libvirt-debian-10-cross-armv7l.zip b/buildenv-libvirt-debian-10-cross-armv7l.zip index 893c929..7bf00e1 100644 Binary files a/buildenv-libvirt-debian-10-cross-armv7l.zip and b/buildenv-libvirt-debian-10-cross-armv7l.zip differ diff --git a/buildenv-libvirt-debian-10-cross-i686.zip b/buildenv-libvirt-debian-10-cross-i686.zip index 97e88e4..2576aac 100644 Binary files a/buildenv-libvirt-debian-10-cross-i686.zip and b/buildenv-libvirt-debian-10-cross-i686.zip differ diff --git a/buildenv-libvirt-debian-10-cross-mips.zip b/buildenv-libvirt-debian-10-cross-mips.zip index 332cb6c..ad9084a 100644 Binary files a/buildenv-libvirt-debian-10-cross-mips.zip and b/buildenv-libvirt-debian-10-cross-mips.zip differ diff --git a/buildenv-libvirt-debian-10-cross-mips64el.zip b/buildenv-libvirt-debian-10-cross-mips64el.zip index 7964dca..2210700 100644 Binary files a/buildenv-libvirt-debian-10-cross-mips64el.zip and b/buildenv-libvirt-debian-10-cross-mips64el.zip differ diff --git a/buildenv-libvirt-debian-10-cross-mipsel.zip b/buildenv-libvirt-debian-10-cross-mipsel.zip index a4198d6..37390da 100644 Binary files a/buildenv-libvirt-debian-10-cross-mipsel.zip and b/buildenv-libvirt-debian-10-cross-mipsel.zip differ diff --git a/buildenv-libvirt-debian-10-cross-ppc64le.zip b/buildenv-libvirt-debian-10-cross-ppc64le.zip index 567f5b5..9e77173 100644 Binary files a/buildenv-libvirt-debian-10-cross-ppc64le.zip and b/buildenv-libvirt-debian-10-cross-ppc64le.zip differ diff --git a/buildenv-libvirt-debian-10-cross-s390x.zip b/buildenv-libvirt-debian-10-cross-s390x.zip index 42723f0..4681152 100644 Binary files a/buildenv-libvirt-debian-10-cross-s390x.zip and b/buildenv-libvirt-debian-10-cross-s390x.zip differ diff --git a/buildenv-libvirt-debian-10.zip b/buildenv-libvirt-debian-10.zip index 14634db..10e73d5 100644 Binary files a/buildenv-libvirt-debian-10.zip and b/buildenv-libvirt-debian-10.zip differ diff --git a/buildenv-libvirt-debian-9-cross-aarch64.zip b/buildenv-libvirt-debian-9-cross-aarch64.zip index 3fbf049..b7b3643 100644 Binary files a/buildenv-libvirt-debian-9-cross-aarch64.zip and b/buildenv-libvirt-debian-9-cross-aarch64.zip differ diff --git a/buildenv-libvirt-debian-9-cross-armv6l.zip b/buildenv-libvirt-debian-9-cross-armv6l.zip index 0e4a55d..8e1e247 100644 Binary files a/buildenv-libvirt-debian-9-cross-armv6l.zip and b/buildenv-libvirt-debian-9-cross-armv6l.zip differ diff --git a/buildenv-libvirt-debian-9-cross-armv7l.zip b/buildenv-libvirt-debian-9-cross-armv7l.zip index 6db735b..7acab06 100644 Binary files a/buildenv-libvirt-debian-9-cross-armv7l.zip and b/buildenv-libvirt-debian-9-cross-armv7l.zip differ diff --git a/buildenv-libvirt-debian-9-cross-mips.zip b/buildenv-libvirt-debian-9-cross-mips.zip index 27b2a88..960f2dc 100644 Binary files a/buildenv-libvirt-debian-9-cross-mips.zip and b/buildenv-libvirt-debian-9-cross-mips.zip differ diff --git a/buildenv-libvirt-debian-9-cross-mips64el.zip b/buildenv-libvirt-debian-9-cross-mips64el.zip index 04711c3..1d84bea 100644 Binary files a/buildenv-libvirt-debian-9-cross-mips64el.zip and b/buildenv-libvirt-debian-9-cross-mips64el.zip differ diff --git a/buildenv-libvirt-debian-9-cross-mipsel.zip b/buildenv-libvirt-debian-9-cross-mipsel.zip index 0403a0b..02954f4 100644 Binary files a/buildenv-libvirt-debian-9-cross-mipsel.zip and b/buildenv-libvirt-debian-9-cross-mipsel.zip differ diff --git a/buildenv-libvirt-debian-9-cross-ppc64le.zip b/buildenv-libvirt-debian-9-cross-ppc64le.zip index 2edfed1..327ee9f 100644 Binary files a/buildenv-libvirt-debian-9-cross-ppc64le.zip and b/buildenv-libvirt-debian-9-cross-ppc64le.zip differ diff --git a/buildenv-libvirt-debian-9-cross-s390x.zip b/buildenv-libvirt-debian-9-cross-s390x.zip index aacac06..3dd9779 100644 Binary files a/buildenv-libvirt-debian-9-cross-s390x.zip and b/buildenv-libvirt-debian-9-cross-s390x.zip differ diff --git a/buildenv-libvirt-debian-9.zip b/buildenv-libvirt-debian-9.zip index 4ef6ccf..ab00cb8 100644 Binary files a/buildenv-libvirt-debian-9.zip and b/buildenv-libvirt-debian-9.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-aarch64.zip b/buildenv-libvirt-debian-sid-cross-aarch64.zip index 0583c1b..3b2ad74 100644 Binary files a/buildenv-libvirt-debian-sid-cross-aarch64.zip and b/buildenv-libvirt-debian-sid-cross-aarch64.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-armv6l.zip b/buildenv-libvirt-debian-sid-cross-armv6l.zip index 0087dd3..b13be7e 100644 Binary files a/buildenv-libvirt-debian-sid-cross-armv6l.zip and b/buildenv-libvirt-debian-sid-cross-armv6l.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-armv7l.zip b/buildenv-libvirt-debian-sid-cross-armv7l.zip index d296967..c4262b1 100644 Binary files a/buildenv-libvirt-debian-sid-cross-armv7l.zip and b/buildenv-libvirt-debian-sid-cross-armv7l.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-i686.zip b/buildenv-libvirt-debian-sid-cross-i686.zip index 0f8bb16..0b64ca7 100644 Binary files a/buildenv-libvirt-debian-sid-cross-i686.zip and b/buildenv-libvirt-debian-sid-cross-i686.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-mips.zip b/buildenv-libvirt-debian-sid-cross-mips.zip index 31912c4..02ba200 100644 Binary files a/buildenv-libvirt-debian-sid-cross-mips.zip and b/buildenv-libvirt-debian-sid-cross-mips.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-mips64el.zip b/buildenv-libvirt-debian-sid-cross-mips64el.zip index 3cbe12e..8d96e14 100644 Binary files a/buildenv-libvirt-debian-sid-cross-mips64el.zip and b/buildenv-libvirt-debian-sid-cross-mips64el.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-mipsel.zip b/buildenv-libvirt-debian-sid-cross-mipsel.zip index 51c59db..12e5704 100644 Binary files a/buildenv-libvirt-debian-sid-cross-mipsel.zip and b/buildenv-libvirt-debian-sid-cross-mipsel.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-ppc64le.zip b/buildenv-libvirt-debian-sid-cross-ppc64le.zip index 27dccb1..ec2f772 100644 Binary files a/buildenv-libvirt-debian-sid-cross-ppc64le.zip and b/buildenv-libvirt-debian-sid-cross-ppc64le.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-s390x.zip b/buildenv-libvirt-debian-sid-cross-s390x.zip index 7504d28..5b77b3a 100644 Binary files a/buildenv-libvirt-debian-sid-cross-s390x.zip and b/buildenv-libvirt-debian-sid-cross-s390x.zip differ diff --git a/buildenv-libvirt-debian-sid.zip b/buildenv-libvirt-debian-sid.zip index 874bb1b..b2ebf71 100644 Binary files a/buildenv-libvirt-debian-sid.zip and b/buildenv-libvirt-debian-sid.zip differ diff --git a/buildenv-libvirt-fedora-29.zip b/buildenv-libvirt-fedora-29.zip index 43594d4..4553498 100644 Binary files a/buildenv-libvirt-fedora-29.zip and b/buildenv-libvirt-fedora-29.zip differ diff --git a/buildenv-libvirt-fedora-30.zip b/buildenv-libvirt-fedora-30.zip index 93773cb..0ca2d35 100644 Binary files a/buildenv-libvirt-fedora-30.zip and b/buildenv-libvirt-fedora-30.zip differ diff --git a/buildenv-libvirt-fedora-rawhide.zip b/buildenv-libvirt-fedora-rawhide.zip index da6c064..dff0361 100644 Binary files a/buildenv-libvirt-fedora-rawhide.zip and b/buildenv-libvirt-fedora-rawhide.zip differ diff --git a/buildenv-libvirt-ubuntu-16.zip b/buildenv-libvirt-ubuntu-16.zip index 8cff046..94ec27a 100644 Binary files a/buildenv-libvirt-ubuntu-16.zip and b/buildenv-libvirt-ubuntu-16.zip differ diff --git a/buildenv-libvirt-ubuntu-18.zip b/buildenv-libvirt-ubuntu-18.zip index 83546be..f4a4b7b 100644 Binary files a/buildenv-libvirt-ubuntu-18.zip and b/buildenv-libvirt-ubuntu-18.zip differ -- 2.21.0

2 1

[libvirt] [PATCH] libvirtd: Fix control socket path being incorrectly build
by eater 09 Sep '19

09 Sep '19

Socket path in 5.7 would result in libvirt//var/run/libvirt-sock instead of /var/run/libvirt/libvirt-sock Signed-off-by: eater <=(a)eater.me> --- src/remote/remote_daemon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 546328b24d..5d64397062 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -226,14 +226,14 @@ daemonUnixSocketPaths(struct daemonConfig *config, if (config->unix_sock_dir) { if (virAsprintf(sockfile, "%s/%s-sock", - SOCK_PREFIX, config->unix_sock_dir) < 0) + config->unix_sock_dir, SOCK_PREFIX) < 0) goto cleanup; if (privileged) { if (virAsprintf(rosockfile, "%s/%s-sock-ro", - SOCK_PREFIX, config->unix_sock_dir) < 0 || + config->unix_sock_dir, SOCK_PREFIX) < 0 || virAsprintf(admsockfile, "%s/%s-admin-sock", - SOCK_PREFIX, config->unix_sock_dir) < 0) + config->unix_sock_dir, SOCK_PREFIX) < 0) goto cleanup; } } else { -- 2.23.0

2 2

[libvirt] [PATCH v2] util: Set backing file name for LOOP_GET_STATUS64 queries.
by jcfaracco＠gmail.com 06 Sep '19

06 Sep '19

From: Julio Faracco <jcfaracco(a)gmail.com> This is an issue for LXC loop devices when you are trying to get loop devices info using `ioctl`. Modern apps uses `/sys/dev/block` to grab information about devices, but if you use the method mention you won't be able to retrive the associated file with that loop device. See example below from cryptsetup sources: static char *_ioctl_backing_file(const char *loop) { struct loop_info64 lo64 = {0}; int loop_fd; loop_fd = open(loop, O_RDONLY); if (loop_fd < 0) return NULL; if (ioctl(loop_fd, LOOP_GET_STATUS64, &lo64) < 0) { close(loop_fd); return NULL; } lo64.lo_file_name[LO_NAME_SIZE-2] = '*'; lo64.lo_file_name[LO_NAME_SIZE-1] = 0; close(loop_fd); return strdup((char*)lo64.lo_file_name); } It will return an empty string because lo_file_name was not set. Function `virFileLoopDeviceOpenSearch()` is using `ioctl` to query data, but it is not checking `lo_file_name` field. v1: I accidentally committed two wrong lines. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virfile.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index 81a3c096eb..dbfe74e24f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -781,6 +781,14 @@ int virFileLoopDeviceAssociate(const char *file, memset(&lo, 0, sizeof(lo)); lo.lo_flags = LO_FLAGS_AUTOCLEAR; + /* Set backing file name for LOOP_GET_STATUS64 queries */ + if (virStrncpy((char *) lo.lo_file_name, file, + strlen(file), LO_NAME_SIZE) < 0) { + virReportSystemError(errno, + _("Unable to set backing file %s"), file); + goto cleanup; + } + if ((fsfd = open(file, O_RDWR)) < 0) { virReportSystemError(errno, _("Unable to open %s"), file); -- 2.20.1

3 2

[libvirt] [PATCH] libxl: Fix libxlDomainPMSuspendForDuration domain active check
by Marek Marczykowski-Górecki 06 Sep '19

06 Sep '19

virDomainObjCheckActive() returns -1 if domain is not active, not 0. Fixes cb50436c6f "libxl: implement virDomainPM* functions" Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index d0396e4781..215471fa0d 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1459,7 +1459,7 @@ libxlDomainPMSuspendForDuration(virDomainPtr dom, if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) goto cleanup; - if (!virDomainObjCheckActive(vm)) + if (virDomainObjCheckActive(vm) < 0) goto endjob; /* Unlock virDomainObjPtr to not deadlock with even handler, which will try -- 2.21.0

2 1

[libvirt] [PATCH v2 00/23] Use a slirp helper process
by marcandre.lureau＠redhat.com 06 Sep '19

06 Sep '19

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, SLIRP networking can be running in a separate process. This allows for stricter security policies for QEMU & SLIRP, as SLIRP is notoriously not very safe (discussed on ML, various CVEs, and even the code says so explicitly in the comments), yet people rely on it for various reasons. With this series, for a network interface "user", libvirt will: - check the slirp-helper presence and capabilites (see [1]) - setup a socket pair between qemu and the helper - use -net socket - setup migration thanks to dbus-vmstate There are no changes required to domain configuration to benefit it. "guestfwd" isn't supported at this point, but it is known to be in a broken state with libvirt+qemu anyway. The dbus-vmstate is being proposed to QEMU. The libslirp-rs slirp-helper hasn't yet received a release. The current DBus p2p mode works ok, but is a hack. This is due to poor DBus support in Rust, and also relatively poor DBus p2p mode support in libdbus. fwiw, I have been working on an alternative rust-only implementation of a slirp-helper that will also follow [1], but I am now wondering if netstack or vpnkit could do the job. [1] https://gitlab.freedesktop.org/slirp/libslirp-rs/blob/master/src/bin/README… Marc-André Lureau (23): Add .editorconfig tests: fix xml2xml tpm-emulator.xml test dbus: correctly build reply message qemu: replace logCtxt with qemuDomainLogAppendMessage() qemu: add socket datagram capability qemu: add dbus-vmstate capability qemu: reset VM id after external devices stop qemu-security: add qemuSecurityCommandRun() qemu: add dbus-vmstate domain-conf: add network def private data qemu: add qemuDomainNetworkPrivate qemu-conf: add configurable slirp-helper location qemu-conf: add slirp state dir qemu: add slirp helper unit qemu-domain: save and restore slirp state qemu: add a flag to the cookie to prevent slirp-helper setup qemu-migration: prevent migration if dbus-vmstate is required qemu-migration: prevent migration if slirp cannot be migrated qemu-extdevice: prepare, start and stop slirp-helper qemu-command: use -net socket,fd= with slirp-helper qemu-process: prepare slirp-helper qemu-hotplug: handle hotplugging of slirp-helper tests: add slirp-helper qemuxml2argv test .editorconfig | 21 + m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 21 +- src/conf/domain_conf.h | 6 + src/qemu/Makefile.inc.am | 4 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 3 + src/qemu/qemu_alias.c | 17 + src/qemu/qemu_alias.h | 3 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 118 ++++- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_conf.c | 11 +- src/qemu/qemu_conf.h | 2 + src/qemu/qemu_dbus.c | 94 ++++ src/qemu/qemu_dbus.h | 42 ++ src/qemu/qemu_domain.c | 220 ++++++++- src/qemu/qemu_domain.h | 20 + src/qemu/qemu_driver.c | 8 + src/qemu/qemu_extdevice.c | 82 ++-- src/qemu/qemu_extdevice.h | 10 +- src/qemu/qemu_hotplug.c | 112 ++++- src/qemu/qemu_hotplug.h | 11 + src/qemu/qemu_interface.c | 27 ++ src/qemu/qemu_interface.h | 4 + src/qemu/qemu_migration.c | 19 + src/qemu/qemu_monitor.c | 13 +- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_process.c | 24 +- src/qemu/qemu_security.c | 22 + src/qemu/qemu_security.h | 6 + src/qemu/qemu_slirp.c | 448 ++++++++++++++++++ src/qemu/qemu_slirp.h | 81 ++++ src/qemu/qemu_tpm.c | 4 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virdbus.c | 18 +- src/util/virdbus.h | 6 +- .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../net-user.x86_64-4.0.0.args | 34 ++ tests/qemuxml2argvdata/tpm-emulator.xml | 2 +- tests/qemuxml2argvtest.c | 16 + tests/testutilsqemu.h | 1 + tests/virfirewalltest.c | 9 +- tests/virpolkittest.c | 3 +- 51 files changed, 1498 insertions(+), 77 deletions(-) create mode 100644 .editorconfig create mode 100644 src/qemu/qemu_dbus.c create mode 100644 src/qemu/qemu_dbus.h create mode 100644 src/qemu/qemu_slirp.c create mode 100644 src/qemu/qemu_slirp.h create mode 100644 tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args -- 2.23.0.rc1

3 48

[libvirt] [jenkins-ci PATCH] guests: Include "locales" by default
by Fabiano Fidêncio 06 Sep '19

06 Sep '19

osinfo-db tests require "en_US.UTF-8" locale to be set. Unfortunately, our containers do not contain the needed locale file. After a discussion on libosinfo mailing list[0], it's been agreed on having the locale as part of our libvirt-jenkins-ci's base packages. [0]: https://www.redhat.com/archives/libosinfo/2019-September/msg00011.html Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/base.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index c5a7824..90ac611 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -431,6 +431,12 @@ mappings: rpm: libxslt-devel cross-policy-deb: foreign + locales: + CentOS: glibc-common + deb: locales + Fedora: glibc-langpack-en + FreeBSD: + lsof: default: lsof diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index a7e572b..2a84029 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -16,6 +16,7 @@ packages: - glibc - libtool - libtoolize + - locales - lsof - net-tools - make -- 2.21.0

1 1

[libvirt] [PATCH 0/2] test_driver: implement PM suspend/wakeup APIs
by Ilias Stamatis 06 Sep '19

06 Sep '19

Ilias Stamatis (2): test_driver: implement virDomainPMSuspendForDuration test_driver: implement virDomainPMWakeup src/test/test_driver.c | 116 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) -- 2.22.0

2 6

[libvirt] [PATCH] qemu: qapi: Limit traversal depth for QAPI schema queries
by Peter Krempa 06 Sep '19

06 Sep '19

Implicitly the query depth is limited by the length of the QAPI schema query, but 'alternate' and 'array' QAPI meta-types don't consume a part of the query string thus a loop on such types would get our traversal code stuck in an infinite loop. Prevent this from happening by limiting the nesting depth to 1000. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_qapi.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 0226d6c659..93fcae0d44 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -74,9 +74,23 @@ struct virQEMUQAPISchemaTraverseContext { virHashTablePtr schema; char **queries; virJSONValuePtr returnType; + size_t depth; }; +static int +virQEMUQAPISchemaTraverseContextValidateDepth(struct virQEMUQAPISchemaTraverseContext *ctxt) +{ + if (ctxt->depth++ > 1000) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("possible loop in QMP schema")); + return -1; + } + + return 0; +} + + static void virQEMUQAPISchemaTraverseContextInit(struct virQEMUQAPISchemaTraverseContext *ctxt, char **queries, @@ -329,6 +343,9 @@ virQEMUQAPISchemaTraverse(const char *baseName, const char *metatype; size_t i; + if (virQEMUQAPISchemaTraverseContextValidateDepth(ctxt) < 0) + return -2; + if (!(cur = virHashLookup(ctxt->schema, baseName))) return -2; -- 2.21.0

2 3

[libvirt] [PATCH] qemu: maintain user alias for video type 'none'
by Jonathon Jongsma 06 Sep '19

06 Sep '19

After parsing a video device with a model type of VIR_DOMAIN_VIDEO_TYPE_NONE, all device info is cleared (see virDomainDefPostParseVideo()) in order to avoid formatting any auto-generated values for the XML. Subsequently, however, an alias is generated for the video device (e.g. 'video0'), which results in an alias property being formatted in the XML output anyway. This creates confusion if the user has explicitly provided an alias for the video device since the alias will change. To avoid this, don't clear the user-defined alias for video devices of type "none". See https://bugzilla.redhat.com/show_bug.cgi?id=1720612 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/domain_conf.c | 7 +++++-- tests/qemuxml2argvdata/video-none-device.xml | 1 + tests/qemuxml2xmloutdata/video-none-device.xml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6c429cd593..d11d1fb903 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5635,11 +5635,14 @@ virDomainDefPostParseVideo(virDomainDefPtr def, return 0; if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_NONE) { + char *alias; /* we don't want to format any values we automatically fill in for - * videos into the XML, so clear them - */ + * videos into the XML, so clear them, but retain any user-assigned + * alias */ + VIR_STEAL_PTR(alias, def->videos[0]->info.alias); virDomainVideoDefClear(def->videos[0]); def->videos[0]->type = VIR_DOMAIN_VIDEO_TYPE_NONE; + VIR_STEAL_PTR(def->videos[0]->info.alias, alias); } else { virDomainDeviceDef device = { .type = VIR_DOMAIN_DEVICE_VIDEO, diff --git a/tests/qemuxml2argvdata/video-none-device.xml b/tests/qemuxml2argvdata/video-none-device.xml index 4b591562b7..c1c60c1d9e 100644 --- a/tests/qemuxml2argvdata/video-none-device.xml +++ b/tests/qemuxml2argvdata/video-none-device.xml @@ -31,6 +31,7 @@ <graphics type='vnc'/> <video> <model type='none'/> + <alias name='ua-user-video-alias'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/video-none-device.xml b/tests/qemuxml2xmloutdata/video-none-device.xml index 6e76b394fe..82615f5125 100644 --- a/tests/qemuxml2xmloutdata/video-none-device.xml +++ b/tests/qemuxml2xmloutdata/video-none-device.xml @@ -34,6 +34,7 @@ </graphics> <video> <model type='none'/> + <alias name='ua-user-video-alias'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> -- 2.21.0

3 2