- Devel - libvirt List Archives

[PATCH 0/4] qemu: Move <hostdev> preparation into qemuDomainPrepareHostdev()
by Michal Privoznik 21 Apr '23

21 Apr '23

Now, technically 2/4 is a v3 of: https://listman.redhat.com/archives/libvir-list/2023-April/239368.html but when reviewing it, I realized that we can move more code around and this ended up bigger cleanup. Michal Prívozník (3): qemuDomainAttachHostDevice: Prepare device early and for all types qemu: Move <hostdev> SCSI path generation into qemuDomainPrepareHostdev() qemu: Remove empty functions Zhenzhong Duan (1): qemu: Move <hostdev/> PCI backend setting into qemuDomainPrepareHostdev() src/qemu/qemu_domain.c | 22 ++++++++++++++++ src/qemu/qemu_driver.c | 56 --------------------------------------- src/qemu/qemu_hostdev.c | 16 +++++------ src/qemu/qemu_hotplug.c | 11 +++----- src/qemu/qemu_process.c | 57 ---------------------------------------- src/qemu/qemu_process.h | 3 --- tests/qemuxml2argvmock.c | 17 ++++++++++++ tests/qemuxml2argvtest.c | 28 -------------------- 8 files changed, 50 insertions(+), 160 deletions(-) -- 2.39.2

2 5

[PATCH] meson: Work around configure_file(copy:true) deprecation
by Michal Privoznik 21 Apr '23

21 Apr '23

In our meson scripts, we use configure_file(copy:true) to copy files from srcdir into builddir. However, as of meson-0.64.0, this is deprecated [1] in favor of using: fs = import('fs') fs.copyfile(in, out) Except, the submodule's new method wasn't introduced until 0.64.0. And since we can't bump the minimal meson version we require, we have to work with both: new and old versions. Now, the fun part: fs.copyfile() is not a drop in replacement as it returns different type (a custom_target object). This is incompatible with places where we store the configure_file() retval in a variable to process it further. While we could just replace 'copy:true' with a dummy 'configuration:...' (say 'configuration: configmake_conf') we can't do that for binary files (like src/fonts/ or src/images/). Therefore, places where we are not interested in the retval can be switched to fs.copyfile() and places where we are interested in the retval will just use a dummy 'configuration:'. Except, src/network/meson.build. In here we not just copy the file but also specify alternative install dir and that's not something that fs.copyfile() can handle. Yet, using 'copy: true' is viewed wrong [2]. 1: https://mesonbuild.com/Release-notes-for-0-64-0.html#fscopyfile-to-replace-… 2: https://github.com/mesonbuild/meson/pull/10042 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/css/meson.build | 6 +++++- docs/fonts/meson.build | 6 +++++- docs/images/meson.build | 6 +++++- docs/js/meson.build | 8 ++++++-- docs/logos/meson.build | 6 +++++- docs/meson.build | 6 +++++- meson.build | 3 +++ src/locking/meson.build | 8 ++++---- src/network/meson.build | 2 +- 9 files changed, 39 insertions(+), 12 deletions(-) diff --git a/docs/css/meson.build b/docs/css/meson.build index 384f6e789f..a2a2ccfb28 100644 --- a/docs/css/meson.build +++ b/docs/css/meson.build @@ -11,7 +11,11 @@ install_data(docs_css_files, install_dir: docs_html_dir / 'css') foreach file : docs_css_files # This hack enables us to view the web pages # from within the uninstalled build tree - configure_file(input: file, output: file, copy: true) + if meson.version().version_compare('>=0.64.0') + fs.copyfile(file) + else + configure_file(input: file, output: file, copy: true) + endif install_web_files += '@0@:@1@'.format(meson.current_source_dir() / file, docs_html_dir / 'css') endforeach diff --git a/docs/fonts/meson.build b/docs/fonts/meson.build index 53a060b972..8f2b1c3d28 100644 --- a/docs/fonts/meson.build +++ b/docs/fonts/meson.build @@ -17,7 +17,11 @@ install_data(fonts, install_dir: docs_html_dir / 'fonts') foreach file : fonts # This hack enables us to view the web pages # from within the uninstalled build tree - configure_file(input: file, output: file, copy: true) + if meson.version().version_compare('>=0.64.0') + fs.copyfile(file) + else + configure_file(input: file, output: file, copy: true) + endif install_web_files += '@0@:@1@'.format(meson.current_source_dir() / file, docs_html_dir / 'fonts') endforeach diff --git a/docs/images/meson.build b/docs/images/meson.build index 3c3cb5cce1..b9ab30fc91 100644 --- a/docs/images/meson.build +++ b/docs/images/meson.build @@ -17,7 +17,11 @@ install_data(docs_image_files, install_dir: docs_html_dir / 'images') foreach file : docs_image_files # This hack enables us to view the web pages # from within the uninstalled build tree - configure_file(input: file, output: file, copy: true) + if meson.version().version_compare('>=0.64.0') + fs.copyfile(file) + else + configure_file(input: file, output: file, copy: true) + endif install_web_files += '@0@:@1@'.format(meson.current_source_dir() / file, docs_html_dir / 'images') endforeach diff --git a/docs/js/meson.build b/docs/js/meson.build index cbf2dc2633..9f77b0d85c 100644 --- a/docs/js/meson.build +++ b/docs/js/meson.build @@ -7,7 +7,11 @@ install_data(docs_js_files, install_dir: docs_html_dir / 'js') foreach file : docs_js_files # This hack enables us to view the web pages # from within the uninstalled build tree - configure_file(input: file, output: file, copy: true) + if meson.version().version_compare('>=0.64.0') + fs.copyfile(file) + else + configure_file(input: file, output: file, copy: true) + endif - install_web_files += '@0@:@1@'.format(meson.current_source_dir() / file, docs_html_dir / 'js') + install_web_files += '@0@:@1@'.format(meson.current_source_dir() / file, docs_html_dir / 'js') endforeach diff --git a/docs/logos/meson.build b/docs/logos/meson.build index c65fcdd8ed..c3f4c9f522 100644 --- a/docs/logos/meson.build +++ b/docs/logos/meson.build @@ -25,7 +25,11 @@ install_data(docs_logo_files, install_dir: docs_html_dir / 'logos') foreach file : docs_logo_files # This hack enables us to view the web pages # from within the uninstalled build tree - configure_file(input: file, output: file, copy: true) + if meson.version().version_compare('>=0.64.0') + fs.copyfile(file) + else + configure_file(input: file, output: file, copy: true) + endif install_web_files += '@0@:@1@'.format(meson.current_source_dir() / file, docs_html_dir / 'logos') endforeach diff --git a/docs/meson.build b/docs/meson.build index 864abf0ba5..caa47a1476 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -345,7 +345,11 @@ subdir('manpages') foreach file : docs_assets # This hack enables us to view the web pages # from within the uninstalled build tree - configure_file(input: file, output: file, copy: true) + if meson.version().version_compare('>=0.64.0') + fs.copyfile(file) + else + configure_file(input: file, output: file, copy: true) + endif install_web_files += '@0@:@1@'.format(meson.current_source_dir() / file, docs_html_dir) endforeach diff --git a/meson.build b/meson.build index a0682e8d0b..885fa53e50 100644 --- a/meson.build +++ b/meson.build @@ -11,6 +11,9 @@ project( ], ) +if meson.version().version_compare('>=0.64.0') + fs = import('fs') +endif # figure out if we are building from git diff --git a/src/locking/meson.build b/src/locking/meson.build index 72f7780438..57764b0da6 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -174,7 +174,7 @@ if conf.has('WITH_LIBVIRTD') qemu_lockd_conf = configure_file( input: 'lockd.conf', output: 'qemu-lockd.conf', - copy: true, + configuration: configmake_conf, ) virt_conf_files += qemu_lockd_conf virt_test_aug_files += { @@ -191,7 +191,7 @@ if conf.has('WITH_LIBVIRTD') libxl_lockd_conf = configure_file( input: 'lockd.conf', output: 'libxl-lockd.conf', - copy: true, + configuration: configmake_conf, ) virt_conf_files += libxl_lockd_conf endif @@ -203,7 +203,7 @@ if conf.has('WITH_LIBVIRTD') qemu_sanlock_conf = configure_file( input: 'sanlock.conf', output: 'qemu-sanlock.conf', - copy: true, + configuration: configmake_conf, ) virt_conf_files += qemu_sanlock_conf virt_test_aug_files += { @@ -220,7 +220,7 @@ if conf.has('WITH_LIBVIRTD') libxl_sanlock_conf = configure_file( input: 'sanlock.conf', output: 'libxl-sanlock.conf', - copy: true, + configuration: configmake_conf, ) virt_conf_files += libxl_sanlock_conf endif diff --git a/src/network/meson.build b/src/network/meson.build index d266bb225a..0888d1beac 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -84,7 +84,7 @@ if conf.has('WITH_NETWORK') configure_file( input: 'default.xml.in', output: '@BASENAME@', - copy: true, + configuration: configmake_conf, install: true, install_dir: confdir / 'qemu' / 'networks', ) -- 2.39.2

3 4

[libvirt PATCH v2 0/6] Fix compilation on msys2, update keycodemapdb
by marcandre.lureau＠redhat.com 21 Apr '23

21 Apr '23

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, libvirt fails to compile on msys2/win32. Also update keycodemapdb to fix CI build issues, and turn it into a subproject(), as that makes things simpler for meson. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/453 v2: - update based on Michal version - update keycodemapdb, make it a subproject() Marc-André Lureau (6): meson: don't look for unix paths on win32 keycodemapdb: update submodule for build fixes meson: don't hard code find_program() location meson: drop explicit python interpreter rpc/ssh: ssh_userauth_agent() is not supported on win32 Move src/keycodemapdb -> subprojects/keycodemapdb .gitmodules | 2 +- docs/manpages/meson.build | 4 ++-- docs/meson.build | 6 ++---- meson.build | 15 ++++++++++----- src/admin/meson.build | 4 ++-- src/esx/meson.build | 4 ++-- src/hyperv/meson.build | 2 +- src/keycodemapdb | 1 - src/meson.build | 8 ++++---- src/rpc/virnetlibsshsession.c | 10 +++++++++- src/util/meson.build | 8 ++++---- subprojects/keycodemapdb | 1 + 12 files changed, 38 insertions(+), 27 deletions(-) delete mode 160000 src/keycodemapdb create mode 160000 subprojects/keycodemapdb -- 2.40.0

3 10

[PATCH 0/3] qemu: migration: implement zstd compression
by Oleg Vasilev 20 Apr '23

20 Apr '23

QEMU now supports multifd-compression=zstd for migration with enabled multifd. Bring the support to libvirt as well. Claudio Fontana (1): qemu: migration: expose qemuMigrationParamsSetString Oleg Vasilev (2): qemu: migration: implement zstd compression tests: qemumigparams: test for zstd compression include/libvirt/libvirt-domain.h | 10 ++++ src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 79 +++++++++++++++++--------- src/qemu/qemu_migration_params.h | 7 +++ tests/qemumigparamsdata/zstd.json | 4 ++ tests/qemumigparamsdata/zstd.reply | 7 +++ tests/qemumigparamsdata/zstd.xml | 6 ++ tests/qemumigparamstest.c | 90 +++++++++++++++++++++++++++--- tools/virsh-completer-domain.c | 2 +- tools/virsh-domain.c | 14 +++++ 10 files changed, 187 insertions(+), 33 deletions(-) create mode 100644 tests/qemumigparamsdata/zstd.json create mode 100644 tests/qemumigparamsdata/zstd.reply create mode 100644 tests/qemumigparamsdata/zstd.xml -- 2.40.0

2 4

[libvirt PATCH 0/4] Various cleanups
by Ján Tomko 20 Apr '23

20 Apr '23

Found by cppcheck. Ján Tomko (4): conf: domain: remove unreachable break qemu: command: join two adjacent conditions ch: pinVcpuLive: remove unused variable conf: storage: remove redundant condition src/ch/ch_driver.c | 5 ----- src/conf/domain_conf.c | 1 - src/conf/storage_conf.c | 22 +++++++++------------- src/qemu/qemu_command.c | 2 -- 4 files changed, 9 insertions(+), 21 deletions(-) -- 2.39.2

2 5

[PATCH 0/2] Small fixes for restrictive numatune mode
by Martin Kletzander 20 Apr '23

20 Apr '23

See individual commit messages for explanations (duh!) Martin Kletzander (2): qemu, ch: Move threads to cgroup dir before changing parameters docs: Clarify restrictive numatune mode docs/formatdomain.rst | 11 ++++++++++- src/ch/ch_process.c | 12 ++++++------ src/qemu/qemu_process.c | 10 +++++----- 3 files changed, 21 insertions(+), 12 deletions(-) -- 2.40.0

3 4

[PATCH 0/3] docs improvements
by Peter Krempa 20 Apr '23

20 Apr '23

Peter Krempa (3): kbase: debuglogs: Emphasize disabling daemon timeout in 'TL;DR' section docs: manpages: Clarify that only TLS/TCP remote access needs 'virtproxyd' docs: manpages: State that TCP connection is insecure in 'virtproxyd' man page docs/kbase/debuglogs.rst | 6 ++++-- docs/manpages/virtbhyved.rst | 4 ++-- docs/manpages/virtinterfaced.rst | 4 ++-- docs/manpages/virtlxcd.rst | 4 ++-- docs/manpages/virtnetworkd.rst | 4 ++-- docs/manpages/virtnodedevd.rst | 4 ++-- docs/manpages/virtnwfilterd.rst | 4 ++-- docs/manpages/virtproxyd.rst | 3 +++ docs/manpages/virtqemud.rst | 4 ++-- docs/manpages/virtsecretd.rst | 4 ++-- docs/manpages/virtstoraged.rst | 4 ++-- docs/manpages/virtvboxd.rst | 4 ++-- docs/manpages/virtvzd.rst | 4 ++-- docs/manpages/virtxend.rst | 4 ++-- 14 files changed, 31 insertions(+), 26 deletions(-) -- 2.39.2

2 4

[PATCH 0/7] Various watchdog fixes
by Martin Kletzander 20 Apr '23

20 Apr '23

Los blurbos aqui. Martin Kletzander (7): conf: Add missing empty lines before virDomainWatchdogDefParseXML qemu: Fix grammar and quoting in watchdog error message on hotplug qemu: Forbid device attach of existing platform watchdog qemu: Forbid ib700 watchdogs for non-i440fx machine types qemu: Check all watchdogs for iTCO duplicates qemu: Validate watchdog action compatibility per-device qemu: Forbid most duplicated watchdogs src/conf/domain_conf.c | 2 + src/qemu/qemu_driver.c | 13 +++++ src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_validate.c | 51 +++++++++++-------- tests/qemuhotplugtest.c | 3 ++ .../qemuhotplug-watchdog-reset.xml | 1 + ...plug-base-live+watchdog+watchdog-reset.xml | 1 + .../watchdog-q35-multiple.x86_64-latest.args | 4 +- .../watchdog-q35-multiple.xml | 2 +- .../watchdog-q35-multiple.x86_64-latest.xml | 4 +- 10 files changed, 58 insertions(+), 25 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-watchdog-reset.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog+watchdog-reset.xml -- 2.40.0

3 12

[libvirt PATCH] qemu: Allow sockets in long or deep paths.
by Nick Guenther 19 Apr '23

19 Apr '23

The qemu driver creates IPC sockets using absolute paths, but under POSIX socket paths are constrained pretty tightly. On systems with homedirs on an unusual mount point, like network homedirs, or just particularly long usernames, this could make starting VMs under qemu:///session impossible. Resolves https://gitlab.com/libvirt/libvirt/-/issues/466 Signed-off-by: Nick Guenther <nick.guenther(a)polymtl.ca> --- src/qemu/qemu_command.c | 52 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4ca93bf3dc..3f180d5fb6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -53,6 +53,7 @@ #include "virmdev.h" #include "virutil.h" +#include <libgen.h> #include <sys/stat.h> #include <fcntl.h> @@ -4866,6 +4867,37 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) struct sockaddr_un addr; socklen_t addrlen = sizeof(addr); int fd; + char* wd = NULL; + char* socket_dir_c = NULL; + char* socket_name_c = NULL; + char* socket_dir = NULL; + char* socket_name = NULL; + + /* The path length is limited to what fits in sockaddr_un. + * It's pretty short: 108 on Linux, and this is too easy to hit. + * Work around this limit by using a *relative path*. + * + * background: https://stackoverflow.com/questions/34829600/why-is-the-maximal-path-length… + * + * docker added a different workaround: https://github.com/moby/moby/pull/13408 + */ + if ((wd = getcwd(NULL, 0)) == NULL) { + virReportSystemError(errno, "%s", + _("Unable to get working directory")); + goto error; + } + + socket_dir_c = strdup(dev->data.nix.path); // dirname edits the string given it, so it must be copied + socket_name_c = strdup(dev->data.nix.path); + + socket_dir = dirname(socket_dir_c); + socket_name = basename(socket_name_c); + + if (chdir(socket_dir) < 0) { + virReportSystemError(errno, "%s", + _("Unable to get change to socket directory")); + goto error; + } if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(errno, "%s", @@ -4875,10 +4907,10 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_UNIX; - if (virStrcpyStatic(addr.sun_path, dev->data.nix.path) < 0) { + if (virStrcpyStatic(addr.sun_path, socket_name) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("UNIX socket path '%1$s' too long"), - dev->data.nix.path); + _("UNIX socket name '%1$s' too long"), + socket_name); goto error; } @@ -4909,9 +4941,23 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) if (virFileUpdatePerm(dev->data.nix.path, 0002, 0664) < 0) goto error; + /* restore working directory */ + if (chdir(wd) < 0) { + virReportSystemError(errno, "%s", + _("Unable to restore working directory")); + goto error; + } + + free(socket_name_c); + free(socket_dir_c); + free(wd); + return fd; error: + if (socket_name_c != NULL) { free(socket_name_c); } + if (socket_dir_c != NULL) { free(socket_dir_c); } + if (wd != NULL) { free(wd); } VIR_FORCE_CLOSE(fd); return -1; } -- 2.34.1

5 6

[PATCH 0/3] qemu: hotplug: Fix media change in a hotplugged cdrom
by Peter Krempa 19 Apr '23

19 Apr '23

We need to update private data to handle it properly. Peter Krempa (3): qemuProcessRefreshDisks: Properly compare tray status qemuProcessRefreshDisks: Extract update of a single disk qemu: hotplug: Update disk private data after hotplug src/qemu/qemu_hotplug.c | 21 ++++++++++++---- src/qemu/qemu_process.c | 55 ++++++++++++++++++++++++----------------- src/qemu/qemu_process.h | 3 +++ tests/qemuhotplugtest.c | 40 ++++++++++++++++++++---------- 4 files changed, 79 insertions(+), 40 deletions(-) -- 2.39.2

2 4