- Devel - libvirt List Archives

GSoC 2022 CI project idea proposal
by Erik Skultety 25 Feb '22

25 Feb '22

So, we're offloading as much CI configuration/workflow stuff to lcitool as possible. We can generate config files, install/update machines (local or remote), dump Dockerfiles...we can't build and run those containers locally. Instead, we have a CI helper script in libvirt repo which essentially just wraps a Makefile which pulls a gitlab container for you and: - gives you shell, or - runs the build and tests I'm not sure how many people actually know we have that helper script let alone use it. I've been playing with the idea that we could integrate what's done in the Makefile to lcitool utilizing either the podman library [1] or the docker library [2]. Apart from consolidating all CI services-related efforts to lcitool the other benefit would be that we could gain the ability to run and debug in a project-specific container also in other libvirt projects not just main libvirt. So, I though this could be a nice project for GSoC. Ideas? Unless there are arguments against this idea then I'd eventually add the idea to our gitlab GSoC issue tracker. [1] https://github.com/containers/podman-py [2] https://docker-py.readthedocs.io/en/stable/ Erik

4 11

Re: REST service for libvirt to simplify SEV(ES) launch measurement
by Dewey, Larry 25 Feb '22

25 Feb '22

[AMD Official Use Only] I definitely agree that adding functionality to simplify, and hopefully unify, the attestation workflow for confidential containers would be extremely helpful, and would be very interested in being an integral part of the process. I have my own opinions about using a REST service instead of others due to potential maintenance overhead and lack of contract rule enforcement, but there are definitely pros and cons to all of the current protocols. I am excited to see where this goes.

1 0

Entering freeze for libvirt-8.1.0
by Jiri Denemark 25 Feb '22

25 Feb '22

I have just tagged v8.1.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

GSoC 2022 introduction
by Moteen Shah 25 Feb '22

25 Feb '22

Hello, This is Moteen Shah, I have completed the build of the project and also read the contribution.html <https://libvirt.org/contribute.html>, I am still trying to figure out the issues I can work on, it would be really helpful if you can give some advice on good first issues to work with. Regards, Moteen

3 2

[RFC PATCH 0/2] logging: add service to cleanup internal log files
by Nikolay Shirokovskiy 24 Feb '22

24 Feb '22

Hi, all. This is a RFC for cleanup service suggested in [1]. I argumented there that logrotate is not suitable in current form to cooperate with virtlogd and only peform cleanup function. There I thought we need to have file locking for cleanup service to cooperate nicely with virtlogd. In this patch series I used timestamps for that purpuse which seems to be more simple/reliable technique. The idea is to keep logs for active VMs fresh by touching them periodically for the case when log is not actually written for a long time. This is an RFC and so it misses a lot of pieces: - we only need to touch internal log files (and not log files of serial devices for example) - openrc support is missing - spec bits are missing I guess service itself need to be written in C. For a couple of reasons: - not sure if we have a policy not to use shell scripts in deployments (we still have libvirt-guests.sh) - cleaner time complexity in this version is O(N^2). It is not a big deal to write a O(N) version but looks like it will be ugly looking in shell script - I'd like to make at least max age to be configurable parameter in virtlogd.conf. And we have conf parser in C already. As a side note I'm not sure if we should make cleanup invocation period and touching period to be configurable (both are 1 day currently) There is also a need for drivers to add their cleanup paths to cleanup service configuration. I guess we can - add "cleanup_paths = []" to virtlogd.conf - drivers can add conf files to virtlogd.d/. For example qemu drivers will have in virtlogd.d/qemu.conf: cleanup_paths += "/var/log/libvirt/qemu/" On this way we need to support configure directories and += syntax for lists. [1] Re: removing VMs logs https://listman.redhat.com/archives/libvir-list/2022-February/msg00425.html Nikolay Shirokovskiy (2): logging: touch opened files periodically logging: add virtlogcleaner service src/logging/log_handler.c | 113 ++++++++++++++++++++++---- src/logging/meson.build | 15 ++++ src/logging/virtlogcleaner.service.in | 7 ++ src/logging/virtlogcleaner.sh | 9 ++ src/logging/virtlogcleaner.timer | 8 ++ src/logging/virtlogd.service.in | 1 + 6 files changed, 138 insertions(+), 15 deletions(-) create mode 100644 src/logging/virtlogcleaner.service.in create mode 100755 src/logging/virtlogcleaner.sh create mode 100644 src/logging/virtlogcleaner.timer -- 2.31.1

1 2

Virtqemud wants to unlink /dev/urandom
by Nikola Knazekova 24 Feb '22

24 Feb '22

Hi, when I am creating virtual machine on system with new SELinux policy for Libvirt, I am getting this error message: Unable to complete install: 'Unable to create device /dev/urandom: File exists' Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/asyncjob.py", line 65, in cb_wrapper callback(asyncjob, *args, **kwargs) File "/usr/share/virt-manager/virtManager/createvm.py", line 2001, in _do_async_install installer.start_install(guest, meter=meter) File "/usr/share/virt-manager/virtinst/install/installer.py", line 701, in start_install domain = self._create_guest( File "/usr/share/virt-manager/virtinst/install/installer.py", line 649, in _create_guest domain = self.conn.createXML(install_xml or final_xml, 0) File "/usr/lib64/python3.10/site-packages/libvirt.py", line 4393, in createXML raise libvirtError('virDomainCreateXML() failed') libvirt.libvirtError: Unable to create device /dev/urandom: File exists And SELinux denial, where SELinux prevents virtqemud to unlink character device /dev/urandom: time->Wed Feb 23 19:30:33 2022 type=PROCTITLE msg=audit(1645662633.819:930): proctitle=2F7573722F7362696E2F7669727471656D7564002D2D74696D656F757400313230 type=PATH msg=audit(1645662633.819:930): item=1 name="/dev/urandom" inode=6 dev=00:44 mode=020666 ouid=0 ogid=0 rdev=01:09 obj=system_u:object_r:urandom_device_t:s0 nametype=DELETE cap_fp=0 cap_fi=0 cap_fe=0 cap_fver=0 cap_frootid=0 type=PATH msg=audit(1645662633.819:930): item=0 name="/dev/" inode=1 dev=00:44 mode=040755 ouid=0 ogid=0 rdev=00:00 obj=system_u:object_r:tmpfs_t:s0 nametype=PARENT cap_fp=0 cap_fi=0 cap_fe=0 cap_fver=0 cap_frootid=0 type=CWD msg=audit(1645662633.819:930): cwd="/" type=SYSCALL msg=audit(1645662633.819:930): arch=c000003e syscall=87 success=no exit=-13 a0=7f9418064f50 a1=7f943909c930 a2=7f941d0ef6d4 a3=0 items=2 ppid=6722 pid=7196 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="rpc-worker" exe="/usr/sbin/virtqemud" subj=system_u:system_r:virtqemud_t:s0 key=(null) type=AVC msg=audit(1645662633.819:930): avc: denied { unlink } for pid=7196 comm="rpc-worker" name="urandom" dev="tmpfs" ino=6 scontext=system_u:system_r:virtqemud_t:s0 tcontext=system_u:object_r:urandom_device_t:s0 tclass=chr_file permissive=0 Is this expected behavior? Thanks, Nikola

2 1

[PATCH] tests: don't use auto-generated NVRAM path in tests
by Daniel P. Berrangé 23 Feb '22

23 Feb '22

By using the auto-generated NVRAM path in test data files, we won't see bugs where a user specified path gets accidentally overwritten by a post-parse callback, or VM startup. For example, this caused us to miss the bug fixed by: commit 24adb6c7a6cbd8ce5f9de67e6af5d89e0e57c270 Author: Michal Prívozník <mprivozn(a)redhat.com> Date: Wed Feb 23 08:50:44 2022 +0100 qemu: Don't regenerate NVRAM path if parsed from domain XML Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.xml | 2 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml | 2 +- .../qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-graphics.xml | 2 +- .../qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args | 2 +- tests/qemuxml2argvdata/aarch64-virt-headless.xml | 2 +- tests/qemuxml2argvdata/bios-nvram-os-interleave.xml | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.xml | 2 +- tests/qemuxml2argvdata/bios-nvram.args | 2 +- tests/qemuxml2argvdata/bios-nvram.xml | 2 +- tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args | 2 +- tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml | 2 +- tests/qemuxml2argvdata/os-firmware-bios.xml | 2 +- .../qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/os-firmware-efi-secboot.xml | 2 +- tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/os-firmware-efi.xml | 2 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 2 +- tests/qemuxml2argvdata/q35-acpi-uefi.xml | 2 +- tests/qemuxml2argvdata/q35-noacpi-uefi.xml | 2 +- .../qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml | 2 +- .../qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml | 2 +- tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml | 2 +- tests/qemuxml2xmloutdata/bios-nvram.xml | 2 +- tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml | 2 +- tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml | 2 +- .../os-firmware-efi-secboot.x86_64-latest.xml | 2 +- tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args index a92f22744d..21ee68be07 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -accel tcg \ -cpu cortex-a57 \ -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \ --drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,unit=1 \ +-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml b/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml index 5de2eb5d3c..ef95ba5c17 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml @@ -6,7 +6,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> - <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> </os> <features> <acpi/> diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args index 4ffbad8188..4382f0736c 100644 --- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -accel tcg \ -cpu cortex-a57 \ -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \ --drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,unit=1 \ +-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml index e66b805da4..c36ce824ac 100644 --- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml +++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml @@ -6,7 +6,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> - <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> </os> <cpu mode='custom'> <model>cortex-a57</model> diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 2e311adf33..6604d1e5bd 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ -machine virt,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \ -accel tcg \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml index e908d24ac2..b1b5e87c22 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml @@ -12,7 +12,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> - <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> </os> <features> diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index 3ca8409e35..0f78840cb3 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ -machine virt,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \ -accel tcg \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.xml b/tests/qemuxml2argvdata/aarch64-virt-headless.xml index 7e4fe64b43..27825e9a55 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.xml @@ -12,7 +12,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> - <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> </os> <features> diff --git a/tests/qemuxml2argvdata/bios-nvram-os-interleave.xml b/tests/qemuxml2argvdata/bios-nvram-os-interleave.xml index 8e2286e519..d6c86c661c 100644 --- a/tests/qemuxml2argvdata/bios-nvram-os-interleave.xml +++ b/tests/qemuxml2argvdata/bios-nvram-os-interleave.xml @@ -6,7 +6,7 @@ <vcpu placement='static'>1</vcpu> <os> <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> - <nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <bootmenu enable='yes'/> diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args index f0799bec3c..e5595d3de7 100644 --- a/tests/qemuxml2argvdata/bios-nvram-secure.args +++ b/tests/qemuxml2argvdata/bios-nvram-secure.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -accel tcg \ -global driver=cfi.pflash01,property=secure,value=on \ -drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on \ --drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \ +-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.xml b/tests/qemuxml2argvdata/bios-nvram-secure.xml index 0788bb9b03..fb5ca4c48d 100644 --- a/tests/qemuxml2argvdata/bios-nvram-secure.xml +++ b/tests/qemuxml2argvdata/bios-nvram-secure.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='q35'>hvm</type> <loader readonly='yes' secure='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader> - <nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdata/bios-nvram.args index bfbe29a63e..e5f4e2bc4c 100644 --- a/tests/qemuxml2argvdata/bios-nvram.args +++ b/tests/qemuxml2argvdata/bios-nvram.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -machine pc,usb=off,dump-guest-core=off \ -accel tcg \ -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \ --drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \ +-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/bios-nvram.xml b/tests/qemuxml2argvdata/bios-nvram.xml index 9cc7853e48..329d510e95 100644 --- a/tests/qemuxml2argvdata/bios-nvram.xml +++ b/tests/qemuxml2argvdata/bios-nvram.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> - <nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args index 0f1eed66c2..840ece3893 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args @@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \ -machine virt,usb=off,dump-guest-core=off,gic-version=2 \ -accel hvf \ -drive file=/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw,if=pflash,format=raw,unit=0,readonly=on \ --drive file=/var/lib/libvirt/qemu/nvram/test_VARS.fd,if=pflash,format=raw,unit=1 \ +-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \ -m 4096 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml index ef13820e17..01997b9731 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml @@ -7,7 +7,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader> - <nvram>/var/lib/libvirt/qemu/nvram/test_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> </os> <features> diff --git a/tests/qemuxml2argvdata/os-firmware-bios.xml b/tests/qemuxml2argvdata/os-firmware-bios.xml index 63886666dd..18ceafa948 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.xml +++ b/tests/qemuxml2argvdata/os-firmware-bios.xml @@ -7,7 +7,7 @@ <os firmware='bios'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> <loader secure='no'/> - <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args index fdbf8deabe..1bf6ec65bd 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ -machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \ -accel kvm \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.xml b/tests/qemuxml2argvdata/os-firmware-efi-secboot.xml index a285e06334..67c93fdbb9 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.xml +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.xml @@ -7,7 +7,7 @@ <os firmware='efi'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> <loader secure='yes'/> - <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args index 470fe31256..16eb08078c 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \ -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ -machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \ -accel kvm \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi.xml b/tests/qemuxml2argvdata/os-firmware-efi.xml index 46a7b1b780..8109e227c0 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.xml +++ b/tests/qemuxml2argvdata/os-firmware-efi.xml @@ -7,7 +7,7 @@ <os firmware='efi'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> <loader secure='no'/> - <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argvdata/q35-acpi-uefi.args index 60da1e282a..52d902612b 100644 --- a/tests/qemuxml2argvdata/q35-acpi-uefi.args +++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args @@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \ -accel tcg \ -cpu Haswell \ -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \ --drive file=/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=pflash,format=raw,unit=1 \ +-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.xml b/tests/qemuxml2argvdata/q35-acpi-uefi.xml index 4eb5a466e9..7e3fa48e9d 100644 --- a/tests/qemuxml2argvdata/q35-acpi-uefi.xml +++ b/tests/qemuxml2argvdata/q35-acpi-uefi.xml @@ -6,7 +6,7 @@ <os> <type arch='x86_64' machine='q35'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> - <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> </os> <features> <acpi/> diff --git a/tests/qemuxml2argvdata/q35-noacpi-uefi.xml b/tests/qemuxml2argvdata/q35-noacpi-uefi.xml index 91c83c808c..4e4d6fa3d1 100644 --- a/tests/qemuxml2argvdata/q35-noacpi-uefi.xml +++ b/tests/qemuxml2argvdata/q35-noacpi-uefi.xml @@ -6,7 +6,7 @@ <os> <type arch='x86_64' machine='q35'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> - <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> </os> <cpu mode='custom'> <model>Haswell</model> diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml index a3571c62d7..b4e7e0a944 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml @@ -12,7 +12,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> - <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> </os> <features> diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml index 4f1e9cc18b..3a7961df10 100644 --- a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml @@ -12,7 +12,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> - <nvram>/var/lib/libvirt/qemu/nvram/guest_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> </os> <features> diff --git a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml index 0a2f718faa..6a40866b0b 100644 --- a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml +++ b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> - <nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxml2xmloutdata/bios-nvram.xml b/tests/qemuxml2xmloutdata/bios-nvram.xml index 17f15fd00b..7049f5e9c5 100644 --- a/tests/qemuxml2xmloutdata/bios-nvram.xml +++ b/tests/qemuxml2xmloutdata/bios-nvram.xml @@ -7,7 +7,7 @@ <os> <type arch='x86_64' machine='pc'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader> - <nvram>/usr/share/OVMF/OVMF_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml b/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml index b5193a02b4..16e8c23a79 100644 --- a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml +++ b/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml @@ -7,7 +7,7 @@ <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader> - <nvram>/var/lib/libvirt/qemu/nvram/test_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> </os> <features> diff --git a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml index df6f61421a..e6704fb7de 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml @@ -7,7 +7,7 @@ <os firmware='bios'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> <loader secure='no'/> - <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml index c383546cc6..35ee0a61b0 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml @@ -7,7 +7,7 @@ <os firmware='efi'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> <loader secure='yes'/> - <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml index 04d57860e7..ca323482f8 100644 --- a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml @@ -7,7 +7,7 @@ <os firmware='efi'> <type arch='x86_64' machine='pc-q35-4.0'>hvm</type> <loader secure='no'/> - <nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram> + <nvram>/some/user/nvram/path/guest_VARS.fd</nvram> <boot dev='hd'/> <bootmenu enable='yes'/> </os> -- 2.34.1

2 1

[PATCH] qemu: honour user's nvram path when undefining VM
by Daniel P. Berrangé 23 Feb '22

23 Feb '22

When undefining a VM, we must optionally delete any NVRAM that might exist. When using firmware auto-select we always check the generated path, ignoring any user specified path. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e417d358cd..b74b0375a7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6615,11 +6615,10 @@ qemuDomainUndefineFlags(virDomainPtr dom, } } - if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { + if (vm->def->os.loader->nvram) { + nvram_path = g_strdup(vm->def->os.loader->nvram); + } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); - } else { - if (vm->def->os.loader) - nvram_path = g_strdup(vm->def->os.loader->nvram); } if (nvram_path && virFileExists(nvram_path)) { -- 2.34.1

2 1

[libvirt PATCH] qemu: support parsing firmware descriptor flash 'mode' for optional NVRAM
by Daniel P. Berrangé 23 Feb '22

23 Feb '22

Currently the 'nvram_template' entry is mandatory when parsing the firmware descriptor based on flash. QEMU is extending the firmware descriptor spec to make the 'nvram_template' optional, depending on the value of a new 'mode' field: - "split" * "executable" contains read-only CODE * "nvram_template" contains read-write VARS - "combined" * "executable" contains read-write CODE and VARs * "nvram_template" not present, as the "executable" is effectively the template on its own - "stateless" * "executable" contains read-only CODE and VARs * "nvram_template" not present In the latter case, the guest OS can write vars but the firmware will make no attempt to persist them, so any changes will be lost at poweroff. For now we parse this new 'mode' but discard any firmware which is not 'mode=split' when matching for a domain. This is the minimum required to have libvirt not break when seeing the new firmware descriptors. Future changes will support the new modes. In the tests we have a mixture of files with and without the mode attribute. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_firmware.c | 79 ++++++++++++++++--- .../share/qemu/firmware/50-ovmf-sb-keys.json | 33 ++++++++ .../out/usr/share/qemu/firmware/61-ovmf.json | 31 ++++++++ .../out/usr/share/qemu/firmware/70-aavmf.json | 28 +++++++ .../qemu/firmware/45-ovmf-sev-stateless.json | 31 ++++++++ .../qemu/firmware/55-ovmf-sb-combined.json | 33 ++++++++ .../usr/share/qemu/firmware/60-ovmf-sb.json | 1 + tests/qemufirmwaretest.c | 31 ++++++-- 8 files changed, 246 insertions(+), 21 deletions(-) create mode 100644 tests/qemufirmwaredata/out/usr/share/qemu/firmware/50-ovmf-sb-keys.json create mode 100644 tests/qemufirmwaredata/out/usr/share/qemu/firmware/61-ovmf.json create mode 100644 tests/qemufirmwaredata/out/usr/share/qemu/firmware/70-aavmf.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/45-ovmf-sev-stateless.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/55-ovmf-sb-combined.json diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index ff364996b8..e403ee98e4 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -59,6 +59,22 @@ VIR_ENUM_IMPL(qemuFirmwareOSInterface, ); +typedef enum { + QEMU_FIRMWARE_FLASH_MODE_SPLIT, + QEMU_FIRMWARE_FLASH_MODE_COMBINED, + QEMU_FIRMWARE_FLASH_MODE_STATELESS, + + QEMU_FIRMWARE_FLASH_MODE_LAST, +} qemuFirmwareFlashMode; + +VIR_ENUM_DECL(qemuFirmwareFlashMode); +VIR_ENUM_IMPL(qemuFirmwareFlashMode, + QEMU_FIRMWARE_FLASH_MODE_LAST, + "split", + "combined", + "stateless", +); + typedef struct _qemuFirmwareFlashFile qemuFirmwareFlashFile; struct _qemuFirmwareFlashFile { char *filename; @@ -68,6 +84,7 @@ struct _qemuFirmwareFlashFile { typedef struct _qemuFirmwareMappingFlash qemuFirmwareMappingFlash; struct _qemuFirmwareMappingFlash { + qemuFirmwareFlashMode mode; qemuFirmwareFlashFile executable; qemuFirmwareFlashFile nvram_template; }; @@ -359,9 +376,31 @@ qemuFirmwareMappingFlashParse(const char *path, virJSONValue *doc, qemuFirmwareMappingFlash *flash) { + virJSONValue *mode; virJSONValue *executable; virJSONValue *nvram_template; + if (!(mode = virJSONValueObjectGet(doc, "mode"))) { + /* Historical default */ + flash->mode = QEMU_FIRMWARE_FLASH_MODE_SPLIT; + } else { + const char *modestr = virJSONValueGetString(mode); + int modeval; + if (!modestr) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Firmware flash mode value was malformed")); + return -1; + } + modeval = qemuFirmwareFlashModeTypeFromString(modestr); + if (modeval < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Firmware flash mode value '%s' unexpected"), + modestr); + return -1; + } + flash->mode = modeval; + } + if (!(executable = virJSONValueObjectGet(doc, "executable"))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("missing 'executable' in '%s'"), @@ -372,15 +411,17 @@ qemuFirmwareMappingFlashParse(const char *path, if (qemuFirmwareFlashFileParse(path, executable, &flash->executable) < 0) return -1; - if (!(nvram_template = virJSONValueObjectGet(doc, "nvram-template"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'nvram-template' in '%s'"), - path); - return -1; - } + if (flash->mode == QEMU_FIRMWARE_FLASH_MODE_SPLIT) { + if (!(nvram_template = virJSONValueObjectGet(doc, "nvram-template"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("missing 'nvram-template' in '%s'"), + path); + return -1; + } - if (qemuFirmwareFlashFileParse(path, nvram_template, &flash->nvram_template) < 0) - return -1; + if (qemuFirmwareFlashFileParse(path, nvram_template, &flash->nvram_template) < 0) + return -1; + } return 0; } @@ -693,10 +734,12 @@ qemuFirmwareMappingFlashFormat(virJSONValue *mapping, g_autoptr(virJSONValue) executable = NULL; g_autoptr(virJSONValue) nvram_template = NULL; - if (!(executable = qemuFirmwareFlashFileFormat(flash->executable))) + if (virJSONValueObjectAppendString(mapping, + "mode", + qemuFirmwareFlashModeTypeToString(flash->mode)) < 0) return -1; - if (!(nvram_template = qemuFirmwareFlashFileFormat(flash->nvram_template))) + if (!(executable = qemuFirmwareFlashFileFormat(flash->executable))) return -1; if (virJSONValueObjectAppend(mapping, @@ -704,11 +747,15 @@ qemuFirmwareMappingFlashFormat(virJSONValue *mapping, &executable) < 0) return -1; + if (flash->mode == QEMU_FIRMWARE_FLASH_MODE_SPLIT) { + if (!(nvram_template = qemuFirmwareFlashFileFormat(flash->nvram_template))) + return -1; - if (virJSONValueObjectAppend(mapping, + if (virJSONValueObjectAppend(mapping, "nvram-template", - &nvram_template) < 0) - return -1; + &nvram_template) < 0) + return -1; + } return 0; } @@ -1070,6 +1117,12 @@ qemuFirmwareMatchDomain(const virDomainDef *def, return false; } + if (fw->mapping.device == QEMU_FIRMWARE_DEVICE_FLASH && + fw->mapping.data.flash.mode != QEMU_FIRMWARE_FLASH_MODE_SPLIT) { + VIR_DEBUG("Discarding loader without split flash"); + return false; + } + if (def->sec) { switch ((virDomainLaunchSecurity) def->sec->sectype) { case VIR_DOMAIN_LAUNCH_SECURITY_SEV: diff --git a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/50-ovmf-sb-keys.json b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/50-ovmf-sb-keys.json new file mode 100644 index 0000000000..c251682cd9 --- /dev/null +++ b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/50-ovmf-sb-keys.json @@ -0,0 +1,33 @@ +{ + "interface-types": [ + "uefi" + ], + "mapping": { + "device": "flash", + "mode": "split", + "executable": { + "filename": "/usr/share/OVMF/OVMF_CODE.secboot.fd", + "format": "raw" + }, + "nvram-template": { + "filename": "/usr/share/OVMF/OVMF_VARS.secboot.fd", + "format": "raw" + } + }, + "targets": [ + { + "architecture": "x86_64", + "machines": [ + "pc-q35-*" + ] + } + ], + "features": [ + "acpi-s3", + "amd-sev", + "enrolled-keys", + "requires-smm", + "secure-boot", + "verbose-dynamic" + ] +} diff --git a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/61-ovmf.json b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/61-ovmf.json new file mode 100644 index 0000000000..2a9aa23efb --- /dev/null +++ b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/61-ovmf.json @@ -0,0 +1,31 @@ +{ + "interface-types": [ + "uefi" + ], + "mapping": { + "device": "flash", + "mode": "split", + "executable": { + "filename": "/usr/share/OVMF/OVMF_CODE.fd", + "format": "raw" + }, + "nvram-template": { + "filename": "/usr/share/OVMF/OVMF_VARS.fd", + "format": "raw" + } + }, + "targets": [ + { + "architecture": "x86_64", + "machines": [ + "pc-i440fx-*", + "pc-q35-*" + ] + } + ], + "features": [ + "acpi-s3", + "amd-sev", + "verbose-dynamic" + ] +} diff --git a/tests/qemufirmwaredata/out/usr/share/qemu/firmware/70-aavmf.json b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/70-aavmf.json new file mode 100644 index 0000000000..9bd5ac2868 --- /dev/null +++ b/tests/qemufirmwaredata/out/usr/share/qemu/firmware/70-aavmf.json @@ -0,0 +1,28 @@ +{ + "interface-types": [ + "uefi" + ], + "mapping": { + "device": "flash", + "mode": "split", + "executable": { + "filename": "/usr/share/AAVMF/AAVMF_CODE.fd", + "format": "raw" + }, + "nvram-template": { + "filename": "/usr/share/AAVMF/AAVMF_VARS.fd", + "format": "raw" + } + }, + "targets": [ + { + "architecture": "aarch64", + "machines": [ + "virt-*" + ] + } + ], + "features": [ + + ] +} diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/45-ovmf-sev-stateless.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/45-ovmf-sev-stateless.json new file mode 100644 index 0000000000..5a619f3ab0 --- /dev/null +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/45-ovmf-sev-stateless.json @@ -0,0 +1,31 @@ +{ + "description": "OVMF for x86_64, with SEV, without SB, without SMM, with NO varstore", + "interface-types": [ + "uefi" + ], + "mapping": { + "device": "flash", + "mode": "stateless", + "executable": { + "filename": "/usr/share/OVMF/OVMF.sev.fd", + "format": "raw" + } + }, + "targets": [ + { + "architecture": "x86_64", + "machines": [ + "pc-q35-*" + ] + } + ], + "features": [ + "acpi-s3", + "amd-sev", + "amd-sev-es", + "verbose-dynamic" + ], + "tags": [ + + ] +} diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/55-ovmf-sb-combined.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/55-ovmf-sb-combined.json new file mode 100644 index 0000000000..eb3332e4ab --- /dev/null +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/55-ovmf-sb-combined.json @@ -0,0 +1,33 @@ +{ + "description": "OVMF with SB+SMM, SB enabled, MS certs enrolled", + "interface-types": [ + "uefi" + ], + "mapping": { + "device": "flash", + "mode": "combined", + "executable": { + "filename": "/usr/share/OVMF/OVMF.secboot.fd", + "format": "raw" + } + }, + "targets": [ + { + "architecture": "x86_64", + "machines": [ + "pc-q35-*" + ] + } + ], + "features": [ + "acpi-s3", + "amd-sev", + "enrolled-keys", + "requires-smm", + "secure-boot", + "verbose-dynamic" + ], + "tags": [ + + ] +} diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/60-ovmf-sb.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/60-ovmf-sb.json index 5e8a94ae78..a5273a5e8b 100644 --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/60-ovmf-sb.json +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/60-ovmf-sb.json @@ -5,6 +5,7 @@ ], "mapping": { "device": "flash", + "mode": "split", "executable": { "filename": "/usr/share/OVMF/OVMF_CODE.secboot.fd", "format": "raw" diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index cad4b6d383..fc3416b2ae 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -17,22 +17,31 @@ static int testParseFormatFW(const void *opaque) { const char *filename = opaque; - g_autofree char *path = NULL; + g_autofree char *inpath = NULL; + g_autofree char *outpath = NULL; g_autoptr(qemuFirmware) fw = NULL; - g_autofree char *buf = NULL; g_autoptr(virJSONValue) json = NULL; g_autofree char *expected = NULL; g_autofree char *actual = NULL; + g_autofree char *buf = NULL; - path = g_strdup_printf("%s/qemufirmwaredata/%s", abs_srcdir, filename); + inpath = g_strdup_printf("%s/qemufirmwaredata/%s", abs_srcdir, filename); + outpath = g_strdup_printf("%s/qemufirmwaredata/out/%s", abs_srcdir, filename); - if (!(fw = qemuFirmwareParse(path))) + if (!(fw = qemuFirmwareParse(inpath))) return -1; - if (virFileReadAll(path, - 1024 * 1024, /* 1MiB */ - &buf) < 0) - return -1; + if (virFileExists(outpath)) { + if (virFileReadAll(outpath, + 1024 * 1024, /* 1MiB */ + &buf) < 0) + return -1; + } else { + if (virFileReadAll(inpath, + 1024 * 1024, /* 1MiB */ + &buf) < 0) + return -1; + } if (!(json = virJSONValueFromString(buf))) return -1; @@ -60,7 +69,9 @@ testFWPrecedence(const void *opaque G_GNUC_UNUSED) const char *expected[] = { PREFIX "/share/qemu/firmware/40-bios.json", SYSCONFDIR "/qemu/firmware/40-ovmf-sb-keys.json", + PREFIX "/share/qemu/firmware/45-ovmf-sev-stateless.json", PREFIX "/share/qemu/firmware/50-ovmf-sb-keys.json", + PREFIX "/share/qemu/firmware/55-ovmf-sb-combined.json", PREFIX "/share/qemu/firmware/61-ovmf.json", PREFIX "/share/qemu/firmware/70-aavmf.json", NULL @@ -218,7 +229,9 @@ mymain(void) } while (0) DO_PARSE_TEST("usr/share/qemu/firmware/40-bios.json"); + DO_PARSE_TEST("usr/share/qemu/firmware/45-ovmf-sev-stateless.json"); DO_PARSE_TEST("usr/share/qemu/firmware/50-ovmf-sb-keys.json"); + DO_PARSE_TEST("usr/share/qemu/firmware/55-ovmf-sb-combined.json"); DO_PARSE_TEST("usr/share/qemu/firmware/60-ovmf-sb.json"); DO_PARSE_TEST("usr/share/qemu/firmware/61-ovmf.json"); DO_PARSE_TEST("usr/share/qemu/firmware/70-aavmf.json"); @@ -250,6 +263,8 @@ mymain(void) DO_SUPPORTED_TEST("pc-q35-3.1", VIR_ARCH_X86_64, true, "/usr/share/seabios/bios-256k.bin:NULL:" "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.secboot.fd:" + "/usr/share/OVMF/OVMF.sev.fd:NULL:" + "/usr/share/OVMF/OVMF.secboot.fd:NULL:" "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd", VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS, VIR_DOMAIN_OS_DEF_FIRMWARE_EFI); -- 2.34.1

2 2

[PATCH] qemu: block copy: Propagate 'detect_zeroes' properly into mirror definition
by Peter Krempa 23 Feb '22

23 Feb '22

'qemuDomainPrepareDiskSourceData' propagates 'detect_zeroes' only for the disk source image, but the mirror destination has the ambition to replace the disk source when the job is finished, so we need to propagate the 'detect_zeroes' setting also in that case. Unfortunately it would become very hairy to either set 'disk->mirror' sooner or propagate that we want this done into 'qemuDomainPrepareDiskSourceData', so the most straightforward solution is to do the propagation inside 'qemuDomainBlockCopyCommon'. Closes: https://gitlab.com/libvirt/libvirt/-/issues/277 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e417d358cd..4fc998cde5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14977,6 +14977,14 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) goto endjob; } + + /* 'qemuDomainPrepareStorageSourceBlockdev' calls + * 'qemuDomainPrepareDiskSourceData' which propagates 'detect_zeroes' + * into the topmost virStorage source of the disk chain. + * Since 'mirror' has the ambition to replace it we need to propagate + * it into the mirror too. We do it directly as otherwise we'd need + * to modify all callers of 'qemuDomainPrepareStorageSourceBlockdev' */ + mirror->detect_zeroes = disk->detect_zeroes; } /* If reusing an external image that includes a backing file but the user -- 2.35.1

2 1

[PATCH] qemu: blockjob: Avoid spurious log errors when cancelling a shallow copy with reused images
by Peter Krempa 23 Feb '22

23 Feb '22

In case when a user starts a block copy operation with VIR_DOMAIN_BLOCK_COPY_SHALLOW and VIR_DOMAIN_BLOCK_COPY_REUSE_EXT and both the reused image and the original disk have a backing image libvirt specifically does not insert the backing image until after the job is asked to be completed via virBlockJobAbort with VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT. This is so that management applications can copy the backing image on the background. Now when a user aborts the block job instead of cancelling it we'd ignore the fact that we didn't insert the backing image yet and the cancellation would result into a 'blockdev-del' of a invalid node name and thus an 'error' severity entry in the log. To solve this issue we use the same conditions when the backing image addition is avoided to remove the internal state for them prior to the call to unplug the mirror destination. Reported-by: Kashyap Chamarthy <kchamart(a)redhat.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_blockjob.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 726df95067..2442865b9b 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -1406,6 +1406,8 @@ qemuBlockJobProcessEventConcludedCopyAbort(virQEMUDriver *driver, qemuBlockJobData *job, qemuDomainAsyncJob asyncJob) { + qemuDomainObjPrivate *priv = vm->privateData; + VIR_DEBUG("copy job '%s' on VM '%s' aborted", job->name, vm->def->name); /* mirror may be NULL for copy job corresponding to migration */ @@ -1413,6 +1415,21 @@ qemuBlockJobProcessEventConcludedCopyAbort(virQEMUDriver *driver, !job->disk->mirror) return; + if (!job->jobflagsmissing) { + bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW; + bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT; + + /* In the special case of a shallow copy with reused image we don't + * hotplug the full chain when QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY + * is supported. Attempting to delete it would thus result in spurious + * errors as we'd attempt to blockdev-del images which were not added + * yet */ + if (reuse && shallow && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY) && + virStorageSourceHasBacking(job->disk->mirror)) + g_clear_pointer(&job->disk->mirror->backingStore, virObjectUnref); + } + /* activeWrite bitmap is removed automatically here */ qemuBlockJobEventProcessConcludedRemoveChain(driver, vm, asyncJob, job->disk->mirror); g_clear_pointer(&job->disk->mirror, virObjectUnref); -- 2.35.1

3 4

[libvirt PATCH] util: Fix machined servicename
by Martin Kletzander 23 Feb '22

23 Feb '22

Commit 4e42686adef8 wrongly assumed how g_variant_new_parsed() works and broke starting of domains on systems with systemd (machined). Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virsystemd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 0554884811a7..18bf2932a426 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -360,6 +360,7 @@ int virSystemdCreateMachine(const char *name, g_autofree char *creatorname = NULL; g_autofree char *slicename = NULL; g_autofree char *scopename = NULL; + g_autofree char *servicename = NULL; static int hasCreateWithNetwork = 1; if ((rc = virSystemdHasMachined()) < 0) @@ -369,6 +370,7 @@ int virSystemdCreateMachine(const char *name, return -1; creatorname = g_strdup_printf("libvirt-%s", drivername); + servicename = g_strdup_printf("virt%sd.service", drivername); if (partition) { if (!(slicename = virSystemdMakeSliceName(partition))) @@ -440,11 +442,10 @@ int virSystemdCreateMachine(const char *name, gnicindexes = g_variant_new_fixed_array(G_VARIANT_TYPE("i"), nicindexes, nnicindexes, sizeof(int)); gprops = g_variant_new_parsed("[('Slice', <%s>)," - " ('After', <['libvirtd.service']>)," - " ('After', <['virt%sd.service']>)," + " ('After', <['libvirtd.service', %s]>)," " ('Before', <['virt-guest-shutdown.target']>)]", slicename, - drivername); + servicename); message = g_variant_new("(s@ayssus@ai@a(sv))", name, guuid, @@ -490,11 +491,10 @@ int virSystemdCreateMachine(const char *name, guuid = g_variant_new_fixed_array(G_VARIANT_TYPE("y"), uuid, 16, sizeof(unsigned char)); gprops = g_variant_new_parsed("[('Slice', <%s>)," - " ('After', <['libvirtd.service']>)," - " ('After', <['virt%sd.service']>)," + " ('After', <['libvirtd.service', %s]>)," " ('Before', <['virt-guest-shutdown.target']>)]", slicename, - drivername); + servicename); message = g_variant_new("(s@ayssus@a(sv))", name, guuid, -- 2.35.1

3 3

[PATCH] qemu: Don't regenerate NVRAM path if parsed from domain XML
by Michal Privoznik 23 Feb '22

23 Feb '22

After v8.0.0-466-g08101bde5d we unconditionally regenerate per domain NVRAM path even though it might have been parsed earlier from domain XML. The way we do that leads to a memleak: 43 bytes in 1 blocks are definitely lost in loss record 330 of 682 at 0x483F7E5: malloc (vg_replace_malloc.c:381) by 0x50D5B18: g_malloc (in /usr/lib64/libglib-2.0.so.0.7000.2) by 0x50EFA4F: g_strdup (in /usr/lib64/libglib-2.0.so.0.7000.2) by 0x49E774E: virXPathString (virxml.c:88) by 0x4A3F0E4: virDomainDefParseBootLoaderOptions (domain_conf.c:18226) by 0x4A3F49C: virDomainDefParseBootOptions (domain_conf.c:18298) by 0x4A448C3: virDomainDefParseXML (domain_conf.c:19598) by 0x4A487A1: virDomainDefParseNode (domain_conf.c:20404) by 0x117FCF: testCompareXMLToArgv (qemuxml2argvtest.c:726) by 0x142124: virTestRun (testutils.c:142) by 0x1423D4: virTestRunLog (testutils.c:197) by 0x140A76: mymain (qemuxml2argvtest.c:3406) If we parsed NVRAM path from domain XML we must refrain from generating new path. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_firmware.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 4b02cb2802..59dc76fec4 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1139,7 +1139,8 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, VIR_FREE(def->os.loader->nvramTemplate); def->os.loader->nvramTemplate = g_strdup(flash->nvram_template.filename); - qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram); + if (!def->os.loader->nvram) + qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram); VIR_DEBUG("decided on firmware '%s' template '%s' NVRAM '%s'", def->os.loader->path, -- 2.34.1

4 6

[PATCH v2 00/29] ppc64 PowerNV machines support
by Daniel Henrique Barboza 22 Feb '22

22 Feb '22

Hi, This v2 has changes proposed by Peter and Daniel on the v1 review. Peter's reviewed-by tags were kept when applicable. The usability change made is that, now, we'll fail to launch powernv domains that has a pnv-phb* device and it's running a QEMU version that doesn't support these devices to be user creatable. Trying to run the 'powernv8-basic' domain with a QEMU 6.2.0 binary will result in an error: $ sudo ./run tools/virsh define ../tests/qemuxml2argvdata/powernv8-basic.xml error: Failed to define domain from ../tests/qemuxml2argvdata/powernv8-basic.xml error: unsupported configuration: The 'pnv-phb3' device is not supported by this QEMU binary Using the current QEMU upstream will allow the domain to be defined and started. Changes from v1: - all tests are now using CAPS_LATEST; - QEMU_CAPS_DEVICE_PNV_PHB3_ROOT_PORT is no longer being used. Capability for the pnv-phb3-root-port is infered to exist if the capabilitity for its PHB (QEMU_CAPS_DEVICE_PNV_PHB3) is present. Same thing for the case of QEMU_CAPS_DEVICE_PNV_PHB4_ROOT_PORT and QEMU_CAPS_DEVICE_PNV_PHB4; - QEMU_CAPS_DEVICE_PNV_PHB3 and QEMU_CAPS_DEVICE_PNV_PHB4 are no longer being probed. They are being set by hand after checking for QEMU version in virQEMUCapsInitQMPVersionCaps(); - patch 01 (QEMU ppc64 capabilities for qemu 7.0): * dropped since it's already upstream - patch 09 (forbid powernv domains migration): * removed. This will be handled on QEMU side - patch 14 (new): * added documentation of the different semantics 'targetIndex' will have for PowerNV PHBs - several other minor changes suggested by Peter - v1 link: https://listman.redhat.com/archives/libvir-list/2022-January/msg00902.html Daniel Henrique Barboza (29): qemu_domain.c: add PowerNV machine helpers qemu_capabilities.c: use 'MachineIsPowerPC' in DeviceDiskCaps qemu_domain: turn qemuDomainMachineIsPSeries() static qemu_validate.c: use qemuDomainIsPowerPC() in qemuValidateDomainChrDef() qemu_domain.c: define ISA as default PowerNV serial qemu_validate.c: enhance 'machine type not supported' message qemu_domain.c: disable default devices for PowerNV machines tests: add basic PowerNV8 test qemu: introduce QEMU_CAPS_DEVICE_PNV_PHB3 conf, qemu: add 'pnv-phb3-root-port' PCI controller model name conf, qemu: add 'pnv-phb3' PCI controller model name domain_conf.c: fix identation in virDomainControllerDefParseXML() conf: parse and format <target chip-id='...'/> formatdomain.rst: add 'index' semantics for PowerNV domains introduce virDomainControllerIsPowerNVPHB conf, qemu: add default 'chip-id' value for pnv-phb3 controllers conf, qemu: add default 'targetIndex' value for pnv-phb3 devs qemu_command.c: add command line for the pnv-phb3 device qemu_domain_address.c: change pnv-phb3 minimal downstream slot domain_conf: format pnv-phb3-root-port empty addr tests: add pnv-phb3-root-port test domain_validate.c: allow targetIndex 0 out of idx 0 for PowerNV PHBs domain_conf.c: reject duplicated pnv-phb3 devices qemu: introduce QEMU_CAPS_DEVICE_PNV_PHB4 conf, qemu: add 'pnv-phb4-root-port' PCI controller model name domain_conf.c: add phb4-root-port to IsPowerNVRootPort() conf, qemu: add 'pnv-phb4' controller model name domain_conf.c: add pnv-phb4 to ControllerIsPowerNVPHB() tests: add PowerNV9 tests docs/formatdomain.rst | 12 +- docs/schemas/domaincommon.rng | 10 ++ src/conf/domain_conf.c | 157 ++++++++++++++---- src/conf/domain_conf.h | 8 + src/conf/domain_validate.c | 5 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 28 +++- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 21 ++- src/qemu/qemu_domain.c | 56 ++++++- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_domain_address.c | 64 ++++++- src/qemu/qemu_validate.c | 62 ++++++- .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 + .../powernv8-basic.ppc64-latest.args | 34 ++++ tests/qemuxml2argvdata/powernv8-basic.xml | 16 ++ tests/qemuxml2argvdata/powernv8-dupPHBs.err | 1 + .../powernv8-dupPHBs.ppc64-latest.err | 1 + tests/qemuxml2argvdata/powernv8-dupPHBs.xml | 27 +++ .../powernv8-root-port.ppc64-latest.args | 35 ++++ tests/qemuxml2argvdata/powernv8-root-port.xml | 17 ++ .../powernv8-two-sockets.ppc64-latest.args | 35 ++++ .../qemuxml2argvdata/powernv8-two-sockets.xml | 26 +++ .../powernv9-dupPHBs.ppc64-latest.err | 1 + tests/qemuxml2argvdata/powernv9-dupPHBs.xml | 27 +++ .../powernv9-root-port.ppc64-latest.args | 35 ++++ tests/qemuxml2argvdata/powernv9-root-port.xml | 17 ++ tests/qemuxml2argvtest.c | 7 + .../powernv8-basic.ppc64-latest.xml | 34 ++++ .../powernv8-root-port.ppc64-latest.xml | 39 +++++ .../powernv8-two-sockets.ppc64-latest.xml | 39 +++++ .../powernv9-root-port.ppc64-latest.xml | 39 +++++ .../qemuxml2xmloutdata/powernv9-root-port.xml | 36 ++++ tests/qemuxml2xmltest.c | 5 + 34 files changed, 855 insertions(+), 48 deletions(-) create mode 100644 tests/qemuxml2argvdata/powernv8-basic.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/powernv8-basic.xml create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.err create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.ppc64-latest.err create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.xml create mode 100644 tests/qemuxml2argvdata/powernv8-root-port.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/powernv8-root-port.xml create mode 100644 tests/qemuxml2argvdata/powernv8-two-sockets.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/powernv8-two-sockets.xml create mode 100644 tests/qemuxml2argvdata/powernv9-dupPHBs.ppc64-latest.err create mode 100644 tests/qemuxml2argvdata/powernv9-dupPHBs.xml create mode 100644 tests/qemuxml2argvdata/powernv9-root-port.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/powernv9-root-port.xml create mode 100644 tests/qemuxml2xmloutdata/powernv8-basic.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/powernv8-root-port.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/powernv8-two-sockets.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/powernv9-root-port.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/powernv9-root-port.xml -- 2.34.1

2 59

[libvirt PATCH v2 0/5] Cleanup and test more firmware handling scenarios
by Daniel P. Berrangé 22 Feb '22

22 Feb '22

There are a mind bending number of possible ways to configure the firmware with/without NVRAM. Only a small portion are tested and many error scenarios are silently ignored. This series attempts to get coverage of every possible XML config scenario and report explicit errors in all invalid configs. There is an open question on patch 4. Essentially the use of NVRAM combined with writable executable feels like an accidental feature in libvirt that hasn't really been thought through. I'd like to better define expectations here but there are several possible strategies and I'm undecided which is best. Changed in v2: - Merged 5 self contained patches already reviewed - Moved checks out of post-parse, into validate methods - Instead of rejecting R/W loader with NVRAM template honour the template in QEMU driver. A R/W loader is conceptually relevant if the loader allows guest to live flash upgrade itself. Not possible today but we shouldn't reject this combo since QEMU allows it. Daniel P. Berrangé (5): qemu: fix populating NVRAM vars from template with R/W loader tests: don't permit NVRAM path when using firmware auto-select conf: switch nvram parsing to use XML node / property helpers conf: move nvram parsing into virDomainLoaderDefParseXML conf: stop ignoring <loader>/<nvram> with firmware auto-select src/conf/domain_conf.c | 67 ++++++++---------- src/conf/domain_validate.c | 32 +++++++++ src/qemu/qemu_domain.c | 6 +- ...-nvram-rw-template-vars.x86_64-latest.args | 41 +++++++++++ .../bios-nvram-rw-template-vars.xml | 36 ++++++++++ .../bios-nvram-rw-template.x86_64-latest.args | 41 +++++++++++ .../bios-nvram-rw-template.xml | 36 ++++++++++ .../bios-nvram-rw-vars.x86_64-latest.args | 41 +++++++++++ tests/qemuxml2argvdata/bios-nvram-rw-vars.xml | 36 ++++++++++ tests/qemuxml2argvdata/os-firmware-bios.xml | 1 - ...ware-efi-bad-loader-path.x86_64-latest.err | 1 + .../os-firmware-efi-bad-loader-path.xml | 67 ++++++++++++++++++ ...ware-efi-bad-loader-type.x86_64-latest.err | 1 + .../os-firmware-efi-bad-loader-type.xml | 67 ++++++++++++++++++ ...mware-efi-bad-nvram-path.x86_64-latest.err | 1 + .../os-firmware-efi-bad-nvram-path.xml | 68 +++++++++++++++++++ ...e-efi-bad-nvram-template.x86_64-latest.err | 1 + .../os-firmware-efi-bad-nvram-template.xml | 68 +++++++++++++++++++ .../os-firmware-efi-secboot.xml | 1 - tests/qemuxml2argvdata/os-firmware-efi.xml | 1 - tests/qemuxml2argvtest.c | 7 ++ .../os-firmware-bios.x86_64-latest.xml | 1 - .../os-firmware-efi-secboot.x86_64-latest.xml | 1 - .../os-firmware-efi.x86_64-latest.xml | 1 - 24 files changed, 578 insertions(+), 45 deletions(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-rw-template-vars.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-rw-template-vars.xml create mode 100644 tests/qemuxml2argvdata/bios-nvram-rw-template.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-rw-template.xml create mode 100644 tests/qemuxml2argvdata/bios-nvram-rw-vars.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-rw-vars.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-bad-loader-path.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-bad-loader-path.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-bad-loader-type.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-bad-loader-type.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-bad-nvram-path.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-bad-nvram-path.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-bad-nvram-template.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-bad-nvram-template.xml -- 2.34.1

1 5

[PATCH] qemu: Don't ignore failure when building default memory backend
by Michal Privoznik 22 Feb '22

22 Feb '22

When building the default memory backend (which has id='pc.ram') and no guest NUMA is configured then qemuBuildMemCommandLineMemoryDefaultBackend() is called. However, its return value is ignored which means that on invalid configuration (e.g. when non-existent hugepage size was requested) an error is reported into the logs but QEMU is started anyway. And while QEMU does error out its error message doesn't give much clue what's going on: qemu-system-x86_64: Memory backend 'pc.ram' not found While at it, introduce a test case. While I could chose a nice looking value (e.g. 4MiB) that's exactly what I wanted to avoid, because while such value might not be possible on x84_64 it may be possible on other arches (e.g. ppc is notoriously known for supporting wide range of HP sizes). Let's stick with obviously wrong value of 5MiB. Reported-by: Charles Polisher <chas(a)chasmo.org> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 5 ++-- .../hugepages-default-5M.x86_64-latest.err | 1 + .../qemuxml2argvdata/hugepages-default-5M.xml | 27 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/hugepages-default-5M.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/hugepages-default-5M.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2c963a7297..c836799888 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7369,8 +7369,9 @@ qemuBuildMemCommandLine(virCommand *cmd, * regular memory because -mem-path and -mem-prealloc are obsolete. * However, if domain has one or more NUMA nodes then there is no * default RAM and we mustn't generate the memory object. */ - if (!virDomainNumaGetNodeCount(def->numa)) - qemuBuildMemCommandLineMemoryDefaultBackend(cmd, def, priv, defaultRAMid); + if (!virDomainNumaGetNodeCount(def->numa) && + qemuBuildMemCommandLineMemoryDefaultBackend(cmd, def, priv, defaultRAMid) < 0) + return -1; } else { /* * Add '-mem-path' (and '-mem-prealloc') parameter here if diff --git a/tests/qemuxml2argvdata/hugepages-default-5M.x86_64-latest.err b/tests/qemuxml2argvdata/hugepages-default-5M.x86_64-latest.err new file mode 100644 index 0000000000..bf5e54c9e4 --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-default-5M.x86_64-latest.err @@ -0,0 +1 @@ +internal error: Unable to find any usable hugetlbfs mount for 5120 KiB diff --git a/tests/qemuxml2argvdata/hugepages-default-5M.xml b/tests/qemuxml2argvdata/hugepages-default-5M.xml new file mode 100644 index 0000000000..280ea4bb71 --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-default-5M.xml @@ -0,0 +1,27 @@ +<domain type="kvm"> + <name>NonExistentPageSize</name> + <uuid>21433e10-aea8-434a-8f81-55781c2e9035</uuid> + <memory unit="KiB">4194304</memory> + <currentMemory unit="KiB">4194304</currentMemory> + <memoryBacking> + <hugepages> + <page size="5" unit="MiB"/> + </hugepages> + </memoryBacking> + <vcpu placement="static">2</vcpu> + <os> + <type arch="x86_64" machine="pc">hvm</type> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset="utc"/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9c5c394e03..a32c5a8250 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1270,6 +1270,7 @@ mymain(void) DO_TEST("hugepages-default", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-default-2M", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-default-system-size", QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST_CAPS_LATEST_FAILURE("hugepages-default-5M"); DO_TEST_PARSE_ERROR_NOCAPS("hugepages-default-1G-nodeset-2M"); DO_TEST("hugepages-nodeset", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_PARSE_ERROR("hugepages-nodeset-nonexist", -- 2.34.1

3 2

[PATCH] NEWS: Mention chardev hot(un)plug fixes, '-sock' removal and RPM storage driver fix
by Peter Krempa 22 Feb '22

22 Feb '22

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index b684416909..169ac9b740 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -64,6 +64,25 @@ v8.1.0 (unreleased) * **Bug fixes** + * Remove unix sockets from filesystem when disabling a '.socket' systemd unit + + The presence of the socket files is used by our remote driver to determine + which service to access. Since neiter systemd nor the daemons clean up the + socket file clients were running into problems when a modular deployment was + switched to monolithic ``libvirtd``. + + * qemu: Fixes of fd passing during hotplug and hotunplug of chardevs + + FDs used as chardev backing are now properly removed when hot-unplugging + a chardev from qemu and hotplugged chardevs now properly use ``virtlogd`` + to handle the input and output from qemu. + + * RPM: Run pre/post-install steps on ``daemon-driver-storage-core`` + + Previously the pre/post-install code was part of the meta-package which + installed all storage driver sub-packages thus a minimalistic install + of the storage driver didn't behave correctly. + v8.0.0 (2022-01-14) =================== -- 2.35.1

2 1

[PATCH 0/3] Unbreak MIPS Malta
by Lubomir Rintel 22 Feb '22

22 Feb '22

My day started like this: # virt-install --connect qemu:///system --arch mips --machine malta --memory 256 --disk none --import Using default --name vm-mips Starting install... ERROR XML error: No PCI buses available Needless to say, it ended up completely ruined. Chained to this message are the patches I've created in an attempt to remedy the highly unfortunate situation, with hope that they'll be treated with warmth, understanding and perhaps even applied to the libvirt tree. Yours, Lubo

3 5

[libvirt PATCH 00/11] Automatic mutex management - part 3
by Tim Wiederhake 22 Feb '22

22 Feb '22

Use the recently implemented VIR_LOCK_GUARD and VIR_WITH_MUTEX_LOCK_GUARD to simplify mutex management. Tim Wiederhake (11): test: Use automatic mutex management openvz: Use automatic mutex management remote_daemon_dispatch: Use automatic mutex management netdev: Use automatic mutex management nodesuspend: Use automatic mutex management admin: Use automatic mutex management esx_stream: Use automatic mutex management esx_vi: Use automatic mutex management storage: Statically initialize mutex storage: Move and split up storateStateCleanup storage: Use automatic mutex management src/admin/admin_server_dispatch.c | 3 +- src/conf/virstorageobj.h | 2 - src/esx/esx_stream.c | 65 ++++------ src/esx/esx_vi.c | 109 +++++++--------- src/openvz/openvz_driver.c | 91 +++++--------- src/remote/remote_daemon_dispatch.c | 187 +++++++++------------------- src/storage/storage_driver.c | 97 +++++++-------- src/test/test_driver.c | 15 +-- src/util/virnetdev.c | 20 ++- src/util/virnodesuspend.c | 54 +++----- 10 files changed, 228 insertions(+), 415 deletions(-) -- 2.31.1

2 14

[libvirt PATCH][merged][trivial] Fix typo in NEWS
by Tim Wiederhake 22 Feb '22

22 Feb '22

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index b684416909..cc5666fa91 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -32,7 +32,7 @@ v8.1.0 (unreleased) either of the following 3 options: ``page-sampling, dirty-bitmap, dirty-ring``. - Add ``calc_mode`` field for dirtyrate statistics retured by + Add ``calc_mode`` field for dirtyrate statistics returned by ``virsh domstats --dirtyrate``, also add ``vCPU dirtyrate`` if ``dirty-ring`` mode was used in last measurement. -- 2.31.1

1 0

[PATCH] qemu: Move some enums impl to qemu_monitor.c
by Michal Privoznik 22 Feb '22

22 Feb '22

There are some enums that are declared in qemu_monitor.h but implemented in qemu_monitor_json.c. While from compiler and linker POV it doesn't matter, the code is cleaner if an enum is implemented in .c file that corresponds to .h file which declared the enum. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor.c | 40 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.c | 34 ------------------------------ 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0ff938a577..8fc2a49abf 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -111,6 +111,38 @@ static int qemuMonitorOnceInit(void) VIR_ONCE_GLOBAL_INIT(qemuMonitor); +VIR_ENUM_IMPL(qemuMonitorJob, + QEMU_MONITOR_JOB_TYPE_LAST, + "", + "commit", + "stream", + "mirror", + "backup", + "create", +); + +VIR_ENUM_IMPL(qemuMonitorJobStatus, + QEMU_MONITOR_JOB_STATUS_LAST, + "", + "created", + "running", + "paused", + "ready", + "standby", + "waiting", + "pending", + "aborting", + "concluded", + "undefined", + "null", +); + +VIR_ENUM_IMPL(qemuMonitorCPUProperty, + QEMU_MONITOR_CPU_PROPERTY_LAST, + "boolean", + "string", + "number", +); VIR_ENUM_IMPL(qemuMonitorMigrationStatus, QEMU_MONITOR_MIGRATION_STATUS_LAST, @@ -4473,6 +4505,14 @@ qemuMonitorTransactionBackup(virJSONValue *actions, } +VIR_ENUM_IMPL(qemuMonitorDirtyRateCalcMode, + QEMU_MONITOR_DIRTYRATE_CALC_MODE_LAST, + "page-sampling", + "dirty-bitmap", + "dirty-ring", +); + + int qemuMonitorStartDirtyRateCalc(qemuMonitor *mon, int seconds, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 345b81cd12..4d339f29b8 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -53,30 +53,6 @@ VIR_LOG_INIT("qemu.qemu_monitor_json"); #define LINE_ENDING "\r\n" -VIR_ENUM_IMPL(qemuMonitorJob, - QEMU_MONITOR_JOB_TYPE_LAST, - "", - "commit", - "stream", - "mirror", - "backup", - "create"); - -VIR_ENUM_IMPL(qemuMonitorJobStatus, - QEMU_MONITOR_JOB_STATUS_LAST, - "", - "created", - "running", - "paused", - "ready", - "standby", - "waiting", - "pending", - "aborting", - "concluded", - "undefined", - "null"); - static void qemuMonitorJSONHandleShutdown(qemuMonitor *mon, virJSONValue *data); static void qemuMonitorJSONHandleReset(qemuMonitor *mon, virJSONValue *data); static void qemuMonitorJSONHandleStop(qemuMonitor *mon, virJSONValue *data); @@ -5347,11 +5323,6 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitor *mon, } -VIR_ENUM_IMPL(qemuMonitorCPUProperty, - QEMU_MONITOR_CPU_PROPERTY_LAST, - "boolean", "string", "number", -); - static int qemuMonitorJSONParseCPUModelProperty(const char *key, virJSONValue *value, @@ -8740,11 +8711,6 @@ qemuMonitorJSONGetCPUMigratable(qemuMonitor *mon, migratable); } -VIR_ENUM_IMPL(qemuMonitorDirtyRateCalcMode, - QEMU_MONITOR_DIRTYRATE_CALC_MODE_LAST, - "page-sampling", - "dirty-bitmap", - "dirty-ring"); int qemuMonitorJSONStartDirtyRateCalc(qemuMonitor *mon, -- 2.34.1

3 3

[libvirt PATCH v2] Make systemd unit ordering more robust
by Martin Kletzander 22 Feb '22

22 Feb '22

Since libvirt-guests script/service can operate on various URIs and we do support both socket activation and traditional services, the ordering should be specified for all the possible sockets and services. Also remove the Wants= dependency since do not want to start any service. We cannot know which one libvirt-guests is configured, so we'd have to start all the daemons which would break if unused colliding services are not masked (libvirtd.service in the modular case and all the modular daemon service units in the monolithic scenario). Fortunately we can assume that the system is configured properly to start services/sockets that are of interest to the user. That also works with the setup described in https://libvirt.org/daemons.html . To make it even more robust we add the daemon service into the machine units created for individual domains as it was missing there. https://bugzilla.redhat.com/show_bug.cgi?id=1868537 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virsystemd.c | 8 ++++++-- tools/libvirt-guests.service.in | 12 +++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index a86d4c6bb905..f156c2f39ae5 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -441,8 +441,10 @@ int virSystemdCreateMachine(const char *name, nicindexes, nnicindexes, sizeof(int)); gprops = g_variant_new_parsed("[('Slice', <%s>)," " ('After', <['libvirtd.service']>)," + " ('After', <['virt%sd.service']>)," " ('Before', <['virt-guest-shutdown.target']>)]", - slicename); + slicename, + drivername); message = g_variant_new("(s@ayssus@ai@a(sv))", name, guuid, @@ -489,8 +491,10 @@ int virSystemdCreateMachine(const char *name, uuid, 16, sizeof(unsigned char)); gprops = g_variant_new_parsed("[('Slice', <%s>)," " ('After', <['libvirtd.service']>)," + " ('After', <['virt%sd.service']>)," " ('Before', <['virt-guest-shutdown.target']>)]", - slicename); + slicename, + drivername); message = g_variant_new("(s@ayssus@a(sv))", name, guuid, diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index 1a9b233e1177..3cf647619612 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -1,10 +1,20 @@ [Unit] Description=Suspend/Resume Running libvirt Guests -Wants=libvirtd.service Requires=virt-guest-shutdown.target After=network.target After=time-sync.target +After=libvirtd.socket +After=virtqemud.socket +After=virtlxcd.socket +After=virtvboxd.socket +After=virtvzd.socket +After=virtxend.socket After=libvirtd.service +After=virtqemud.service +After=virtlxcd.service +After=virtvboxd.service +After=virtvzd.service +After=virtxend.service After=virt-guest-shutdown.target Documentation=man:libvirt-guests(8) Documentation=https://libvirt.org -- 2.35.1

2 1

Re: Call for GSoC and Outreachy project ideas for summer 2022
by Paolo Bonzini 21 Feb '22

21 Feb '22

On 1/28/22 16:47, Stefan Hajnoczi wrote: > Dear QEMU, KVM, and rust-vmm communities, > QEMU will apply for Google Summer of Code 2022 > (https://summerofcode.withgoogle.com/) and has been accepted into > Outreachy May-August 2022 (https://www.outreachy.org/) You can now > submit internship project ideas for QEMU, KVM, and rust-vmm! > > If you have experience contributing to QEMU, KVM, or rust-vmm you can > be a mentor. It's a great way to give back and you get to work with > people who are just starting out in open source. > > Please reply to this email by February 21st with your project ideas. I would like to co-mentor one or more projects about adding more statistics to Mark Kanda's newly-born introspectable statistics subsystem in QEMU (https://patchew.org/QEMU/20220215150433.2310711-1-mark.kanda@oracle.com/) for example integrating "info blockstats"; and/or, to add matching functionality to libvirt. However, I will only be available for co-mentoring unfortunately. Paolo > Good project ideas are suitable for remote work by a competent > programmer who is not yet familiar with the codebase. In > addition, they are: > - Well-defined - the scope is clear > - Self-contained - there are few dependencies > - Uncontroversial - they are acceptable to the community > - Incremental - they produce deliverables along the way > > Feel free to post ideas even if you are unable to mentor the project. > It doesn't hurt to share the idea! > > I will review project ideas and keep you up-to-date on QEMU's > acceptance into GSoC. > > Internship program details: > - Paid, remote work open source internships > - GSoC projects are 175 or 350 hours, Outreachy projects are 30 > hrs/week for 12 weeks > - Mentored by volunteers from QEMU, KVM, and rust-vmm > - Mentors typically spend at least 5 hours per week during the coding period > > Changes since last year: GSoC now has 175 or 350 hour project sizes > instead of 12 week full-time projects. GSoC will accept applicants who > are not students, before it was limited to students. > > For more background on QEMU internships, check out this video: > https://www.youtube.com/watch?v=xNVCX7YMUL8 > > Please let me know if you have any questions! > > Stefan >

3 7

[PATCH] NEWS: Document domain dirty page rate calculation APIs
by huangy81＠chinatelecom.cn 21 Feb '22

21 Feb '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> The Libvirt API virDomainStartDirtyRateCalc was extended. Document this change. Signed-off-by: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> --- NEWS.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index f545325..b684416 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -22,6 +22,20 @@ v8.1.0 (unreleased) It works on Intel machines as well as recent machines powered by Apple Silicon. QEMU 6.2.0 is needed for Apple Silicon support. + * qemu: Support mode option for dirtyrate calculation + + Introduce ``virDomainDirtyRateCalcFlags`` as parameter of + ``virDomainStartDirtyRateCalc``, which is used to specify the mode of + dirty page rate calculation. + + Add ``--mode`` option to ``virsh domdirtyrate-calc``, which can be + either of the following 3 options: + ``page-sampling, dirty-bitmap, dirty-ring``. + + Add ``calc_mode`` field for dirtyrate statistics retured by + ``virsh domstats --dirtyrate``, also add ``vCPU dirtyrate`` if + ``dirty-ring`` mode was used in last measurement. + * **Improvements** * packaging: sysconfig files no longer installed -- 1.8.3.1

2 1

[PATCH] qemu: Use virDomainObjCheckActive() more
by Michal Privoznik 21 Feb '22

21 Feb '22

Using the following spatch, I've identified two places which could be switched from explicit virDomainObjIsActive() + virReportError() to virDomainObjCheckActive(): @@ expression dom; @@ if ( - !virDomainObjIsActive(dom) + virDomainObjCheckActive(dom) < 0 ) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); ... } Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- BTW. if I'm more aggressive and let virReportError() have just any args then even more places fit the rule (approx. two dozen more). src/qemu/qemu_driver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 70d51855b2..e417d358cd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19924,9 +19924,7 @@ qemuDomainGetSEVInfo(virQEMUDriver *driver, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) return -1; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckActive(vm) < 0) { goto endjob; } @@ -20744,9 +20742,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckActive(vm) < 0) { goto endjob; } -- 2.34.1

3 2

[PATCH v6 0/8] support mode option for dirtyrate calculation
by huangy81＠chinatelecom.cn 21 Feb '22

21 Feb '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> v6: - rebase on mastr - drop the commit [PATCH v5 1/9] in this patchset, post an extra commit if needed in the future. Please review, thanks ! Regards Yong v5: - [PATCH v5 9/9]: Fix alignment error in qemuDomainGetStatsDirtyRate. v4: - Rebase the master - [PATCH v4 1/9]: Refactor dirty page rate calculation status implementation, display calc_status as string when 'virsh domstats --dirtyrate' api return. - [PATCH v4 3/9]: Adjust the 'cap check' block before BeginJob(). - [PATCH v4 5/9]: Drop the virDomainDirtyRateCalcMode and introduce internal enum qemuMonitorDirtyRateCalcMode instead. - [PATCH v4 6/9]: Code clean. - [PATCH v4 7/9]: Split qemu_driver logic of domdirtyrate-calc virsh api into a separate commit. - [PATCH v4 8/9]: Change the 'mode' parameter usage as --mode=[xxx|yyy], code clean in qemuDomainStartDirtyRateCalc. - [PATCH v4 9/9]: Display calc_mode as string and do code clean in qemuMonitorJSONExtractDirtyRateInfo. Thanks Michal and Peter for reviewing the previous versions, please review. Regards Yong v3: - Rebase the master - [PATCH v2 2/6]: Fix the usage of virQEMUCapsGet - [PATCH v2 4/6]: Fix the cleanup missed in qemuDomainStartDirtyRateCalc - [PATCH v2 4/6]: Move all blocks below ACL check - [PATCH v2 4/6]: Make the qemuMonitorJSONStartDirtyRateCalc cleaner by merging the different case of qemuMonitorJSONMakeCommand - [PATCH v2 4/6]: Code clean, make the error message not be line-broken - [PATCH v2 5/6]: Abstract the enum definition into a standalone commit - [PATCH v2 5/6]: Move the validations code above calculating flags block - [PATCH v2 6/6]: Change the type of 'value' field to unsigned in struct qemuMonitorDirtyRateVcpu - [PATCH v2 6/6]: Rename the enum type qemuMonitorDirtyRateCalcMode to virDomainDirtyRateCalcMode - [PATCH v2 6/6]: Code clean, align the code in qemuDomainGetStatsDirtyRate Thanks Peter for quick and precise response, please review. Regards Yong v2: Rebase master and fix confilicts with commit "Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_PREALLOC" Thanks ! v1: This patchset introduce mode option as the supplement of qemuDomainStartDirtyRateCalc api, add calc_mode for dirtyrate statistics correspondingly. Qemu add mode parameter for calc-dirty-rate command since >= 6.2.0, either of these three mode "page-sampling, dirty-bitmap, dirty-ring" can be specified when calculating dirty page rate. Page sampling is the original mode and used as default mode. Dirty bitmap mode use kvm log sync api to fetch the dirty-bitmap and count the increased 1 bits number during measurement, thus, calculate the dirty page rate. Dirty ring mode use the dirty-ring mechanism implemented in Qemu which can count the increased dirty page on virtual cpu granularity, thus, calculate the per-vcpu dirty page rate. These three calculation mode can be used in different scenarios, and the dirty-bitmap, dirty-ring mode may be more accurate to a certain degree. So maybe it's time to support the mode option for dirtyrate calculation. This series make main modifications as the following: 1. introduce QEMU_CAPS_CALC_DIRTY_RATE capability to probe calc-dirty-rate command in case of failure since it just introduced since >= 5.2.0 2. introduce QEMU_CAPS_DIRTYRATE_MODE capability to probe mode option of calc-dirty-rate command in case of failure, same as 1. 3. implement mode option support for dirtyrate calculation. Please review, thanks ! Best Regards ! Hyman Huang(黄勇) (8): qemu_capabilities: Introduce QEMU_CAPS_CALC_DIRTY_RATE capability qemu_driver: Probe capability before calculating dirty page rate qemu_capabilities: Introduce QEMU_CAPS_DIRTYRATE_MODE capability include: Introduce virDomainDirtyRateCalcFlags qemu_driver: Add mode parameter to qemuDomainStartDirtyRateCalc qemu_driver: Extend flags parameter of virDomainStartDirtyRateCalc virsh: Add mode option to domdirtyrate-calc virsh api qemu_driver: Add calc_mode for dirtyrate statistics docs/manpages/virsh.rst | 7 ++- include/libvirt/libvirt-domain.h | 13 +++++ src/libvirt-domain.c | 18 +++++- src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 56 ++++++++++++++++-- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 27 ++++++++- src/qemu/qemu_monitor_json.c | 69 ++++++++++++++++++++++- src/qemu/qemu_monitor_json.h | 3 +- tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 2 + tools/virsh-completer-domain.c | 17 ++++++ tools/virsh-completer-domain.h | 4 ++ tools/virsh-domain.c | 42 +++++++++++++- tools/virsh-domain.h | 9 +++ 28 files changed, 278 insertions(+), 16 deletions(-) -- 1.8.3.1

3 16

[PATCH v2 0/4] qemu: Introduce 'virDomainQemuMonitorCommandWithFiles'
by Peter Krempa 21 Feb '22

21 Feb '22

I was doing some tests with 'add-fd' and 'getfd' and made this to help me. v2: - add API support for passing FDs back, but for now we don't have use for it Peter Krempa (4): virnetmessage: Introduce virNetMessageClearFDs lib: Introduce 'virDomainQemuMonitorCommandWithFiles' virsh: Implement support for virDomainQemuMonitorCommandWithFiles qemu: Implement qemuDomainQemuMonitorCommandWithFiles docs/manpages/virsh.rst | 6 +- include/libvirt/libvirt-qemu.h | 8 +++ src/driver-hypervisor.h | 10 ++++ src/libvirt-qemu.c | 89 +++++++++++++++++++++++++++++ src/libvirt_qemu.syms | 5 ++ src/libvirt_remote.syms | 1 + src/qemu/qemu_driver.c | 42 ++++++++++++-- src/qemu/qemu_monitor.c | 7 ++- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 6 +- src/qemu/qemu_monitor_json.h | 2 + src/qemu/qemu_monitor_text.c | 8 +-- src/qemu_protocol-structs | 9 +++ src/remote/qemu_protocol.x | 20 ++++++- src/remote/remote_daemon_dispatch.c | 62 ++++++++++++++++++++ src/remote/remote_driver.c | 57 ++++++++++++++++++ src/rpc/virnetmessage.c | 9 ++- src/rpc/virnetmessage.h | 1 + tools/virsh-domain.c | 19 +++++- 19 files changed, 345 insertions(+), 17 deletions(-) -- 2.35.1

2 5

[PATCH v5 0/9] support mode option for dirtyrate calculation
by huangy81＠chinatelecom.cn 21 Feb '22

21 Feb '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> v5: - [PATCH v5 9/9]: Fix alignment error in qemuDomainGetStatsDirtyRate. v4: - Rebase the master - [PATCH v4 1/9]: Refactor dirty page rate calculation status implementation, display calc_status as string when 'virsh domstats --dirtyrate' api return. - [PATCH v4 3/9]: Adjust the 'cap check' block before BeginJob(). - [PATCH v4 5/9]: Drop the virDomainDirtyRateCalcMode and introduce internal enum qemuMonitorDirtyRateCalcMode instead. - [PATCH v4 6/9]: Code clean. - [PATCH v4 7/9]: Split qemu_driver logic of domdirtyrate-calc virsh api into a separate commit. - [PATCH v4 8/9]: Change the 'mode' parameter usage as --mode=[xxx|yyy], code clean in qemuDomainStartDirtyRateCalc. - [PATCH v4 9/9]: Display calc_mode as string and do code clean in qemuMonitorJSONExtractDirtyRateInfo. Thanks Michal and Peter for reviewing the previous versions, please review. Regards Yong v3: - Rebase the master - [PATCH v2 2/6]: Fix the usage of virQEMUCapsGet - [PATCH v2 4/6]: Fix the cleanup missed in qemuDomainStartDirtyRateCalc - [PATCH v2 4/6]: Move all blocks below ACL check - [PATCH v2 4/6]: Make the qemuMonitorJSONStartDirtyRateCalc cleaner by merging the different case of qemuMonitorJSONMakeCommand - [PATCH v2 4/6]: Code clean, make the error message not be line-broken - [PATCH v2 5/6]: Abstract the enum definition into a standalone commit - [PATCH v2 5/6]: Move the validations code above calculating flags block - [PATCH v2 6/6]: Change the type of 'value' field to unsigned in struct qemuMonitorDirtyRateVcpu - [PATCH v2 6/6]: Rename the enum type qemuMonitorDirtyRateCalcMode to virDomainDirtyRateCalcMode - [PATCH v2 6/6]: Code clean, align the code in qemuDomainGetStatsDirtyRate Thanks Peter for quick and precise response, please review. Regards Yong v2: Rebase master and fix confilicts with commit "Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_PREALLOC" Thanks ! v1: This patchset introduce mode option as the supplement of qemuDomainStartDirtyRateCalc api, add calc_mode for dirtyrate statistics correspondingly. Qemu add mode parameter for calc-dirty-rate command since >= 6.2.0, either of these three mode "page-sampling, dirty-bitmap, dirty-ring" can be specified when calculating dirty page rate. Page sampling is the original mode and used as default mode. Dirty bitmap mode use kvm log sync api to fetch the dirty-bitmap and count the increased 1 bits number during measurement, thus, calculate the dirty page rate. Dirty ring mode use the dirty-ring mechanism implemented in Qemu which can count the increased dirty page on virtual cpu granularity, thus, calculate the per-vcpu dirty page rate. These three calculation mode can be used in different scenarios, and the dirty-bitmap, dirty-ring mode may be more accurate to a certain degree. So maybe it's time to support the mode option for dirtyrate calculation. This series make main modifications as the following: 1. introduce QEMU_CAPS_CALC_DIRTY_RATE capability to probe calc-dirty-rate command in case of failure since it just introduced since >= 5.2.0 2. introduce QEMU_CAPS_DIRTYRATE_MODE capability to probe mode option of calc-dirty-rate command in case of failure, same as 1. 3. implement mode option support for dirtyrate calculation. Please review, thanks ! Best Regards ! Hyman Huang(黄勇) (9): qemu: Refactor dirty page rate calculation status implementation qemu_capabilities: Introduce QEMU_CAPS_CALC_DIRTY_RATE capability qemu_driver: Probe capability before calculating dirty page rate qemu_capabilities: Introduce QEMU_CAPS_DIRTYRATE_MODE capability include: Introduce virDomainDirtyRateCalcFlags qemu_driver: Add mode parameter to qemuDomainStartDirtyRateCalc qemu_driver: Extend flags parameter of virDomainStartDirtyRateCalc virsh: Add mode option to domdirtyrate-calc virsh api qemu_driver: Add calc_mode for dirtyrate statistics docs/manpages/virsh.rst | 7 ++- include/libvirt/libvirt-domain.h | 21 +++---- src/libvirt-domain.c | 22 ++++++- src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 63 ++++++++++++++++--- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 45 +++++++++++++- src/qemu/qemu_monitor_json.c | 73 +++++++++++++++++++++-- src/qemu/qemu_monitor_json.h | 3 +- tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 2 + tools/virsh-completer-domain.c | 17 ++++++ tools/virsh-completer-domain.h | 4 ++ tools/virsh-domain.c | 42 ++++++++++++- tools/virsh-domain.h | 9 +++ 28 files changed, 298 insertions(+), 37 deletions(-) -- 1.8.3.1

4 12

[libvirt PATCH] docs: Fix template matching in page.xsl
by Martin Kletzander 21 Feb '22

21 Feb '22

Our last default template had a match of "node()" which incidentally matched everything, including text nodes. Since this has the same priority according to the XSLT spec, section 5.5: https://www.w3.org/TR/1999/REC-xslt-19991116#conflict this is an error. Also according to the same spec section, the XSLT processor may signal the error or pick the last rule. This was uncovered with libxslt 1.1.35 which contains the following commit: https://gitlab.gnome.org/GNOME/libxslt/-/commit/b0074eeca3c6b21b4da14fdf712… which makes the build fail with: runtime error: file ../docs/page.xsl line 223 element element xsl:element: The effective name '' is not a valid QName. because our last rule also matches text nodes and we are trying to extract the node name out of them. To fix this we change the match to "*" which only matches elements and not all the nodes, and to avoid any possible errors with different XSLT processors we also bump the priority of the match="text()" rule a little higher, just in case someone needs to use an XSLT processor that chooses signalling the error instead of the optional recovery. https://bugs.gentoo.org/833586 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/page.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/page.xsl b/docs/page.xsl index fd67918d3b08..72a6fa084235 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -215,11 +215,11 @@ </xsl:element> </xsl:template> - <xsl:template match="text()" mode="copy"> + <xsl:template match="text()" mode="copy" priority="0"> <xsl:value-of select="."/> </xsl:template> - <xsl:template match="node()" mode="copy"> + <xsl:template match="*" mode="copy"> <xsl:element name="{name()}"> <xsl:copy-of select="./@*"/> <xsl:apply-templates mode="copy" /> -- 2.35.1

2 1

[PATCH] libxl: Fix libvirtd crash on domain restore
by Jim Fehlig 18 Feb '22

18 Feb '22

Commit cc2a3c2a94 missed one case in the libxl driver where virDomainDef is returned from libxlDomainSaveImageOpen and a g_steal_pointer is needed. Without it, the virDomainDef object is freed and the driver crashes later in the restore process when accessing the object. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index c91e531a9a..ee031267ca 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -811,7 +811,7 @@ libxlDomainSaveImageOpen(libxlDriverPrivate *driver, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) goto error; - *ret_def = def; + *ret_def = g_steal_pointer(&def); *ret_hdr = hdr; return fd; -- 2.35.1

2 1

[libvirt PATCH 00/10] Automatic mutex management - part 2
by Tim Wiederhake 17 Feb '22

17 Feb '22

Use the recently implemented VIR_LOCK_GUARD and VIR_WITH_MUTEX_LOCK_GUARD to simplify mutex management. Tim Wiederhake (10): vz: Use automatic mutex management vmware: Use automatic mutex management secret: Factor out mutex secret: Use automatic mutex management virlockspace: Use automatic mutex management virtpm: Use automatic mutex management vbox: Use automatic mutex management tools: Use automatic mutex management qemusecuritymock: Use automatic mutex management qemumonitortestutils: Use automatic mutex management src/secret/secret_driver.c | 62 ++++++++------------ src/util/virfirewall.c | 13 ++--- src/util/virlockspace.c | 106 +++++++++++------------------------ src/util/virtpm.c | 39 ++++--------- src/vbox/vbox_common.c | 18 +----- src/vmware/vmware_driver.c | 100 ++++++++++----------------------- src/vz/vz_driver.c | 44 +++++++-------- tests/qemumonitortestutils.c | 65 +++++++++------------ tests/qemusecuritymock.c | 88 ++++++++++------------------- tools/virsh.c | 12 ++-- tools/virt-admin.c | 12 ++-- tools/vsh.c | 8 +-- 12 files changed, 201 insertions(+), 366 deletions(-) -- 2.31.1

3 12

[PATCH] virsystemdtest: remove unused 'demo_socket_path'
by Peter Krempa 17 Feb '22

17 Feb '22

Commit b56a833243ca7324 removed bunch of old code after which 'demo_socket_path' in 'testActivationFDNames' is no longer used Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as a build fix (for clang). tests/virsystemdtest.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 9b513697e0..fcd76514e1 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -526,15 +526,12 @@ testActivationFDNames(const void *opaque G_GNUC_UNUSED) size_t nfds = 0; g_autoptr(virSystemdActivation) act = NULL; g_auto(virBuffer) names = VIR_BUFFER_INITIALIZER; - g_autofree char *demo_socket_path = NULL; virBufferAddLit(&names, "demo-unix.socket"); if (testActivationCreateFDs(&sockUNIX, &sockIP, &nsockIP) < 0) return -1; - demo_socket_path = virNetSocketGetPath(sockUNIX); - for (i = 0; i < nsockIP; i++) virBufferAddLit(&names, ":demo-ip.socket"); -- 2.35.1

1 0

[PATCH] libsemanage: allow spaces in user/group names
by Vit Mojzis 17 Feb '22

17 Feb '22

"semanage login -a" accepts whitespaces in user/group name (e.g. users/groups from Active Directory), which may lead to issues down the line since libsemanage doesn't expect whitespaces in /var/lib/selinux/targeted/active/seusers and other config files. Fixes: Artificial but simple reproducer # groupadd server_admins # sed -i "s/^server_admins/server admins/" /etc/group # semanage login -a -s staff_u %server\ admins # semanage login -l (or "semodule -B") libsemanage.parse_assert_ch: expected character ':', but found 'a' (/var/lib/selinux/targeted/active/seusers: 6): %server admins:staff_u:s0-s0:c0.c1023 (No such file or directory). libsemanage.seuser_parse: could not parse seuser record (No such file or directory). libsemanage.dbase_file_cache: could not cache file database (No such file or directory). libsemanage.enter_ro: could not enter read-only section (No such file or directory). FileNotFoundError: [Errno 2] No such file or directory Signed-off-by: Vit Mojzis <vmojzis(a)redhat.com> --- libsemanage/src/booleans_file.c | 2 +- libsemanage/src/fcontexts_file.c | 6 +++--- libsemanage/src/ibendports_file.c | 4 ++-- libsemanage/src/ibpkeys_file.c | 4 ++-- libsemanage/src/interfaces_file.c | 6 +++--- libsemanage/src/nodes_file.c | 8 ++++---- libsemanage/src/parse_utils.c | 6 +++--- libsemanage/src/parse_utils.h | 11 +++++------ libsemanage/src/ports_file.c | 4 ++-- libsemanage/src/seusers_file.c | 6 +++--- libsemanage/src/users_base_file.c | 7 +++---- libsemanage/src/users_extra_file.c | 4 ++-- 12 files changed, 33 insertions(+), 35 deletions(-) diff --git a/libsemanage/src/booleans_file.c b/libsemanage/src/booleans_file.c index f79d0b44..6d600bbc 100644 --- a/libsemanage/src/booleans_file.c +++ b/libsemanage/src/booleans_file.c @@ -48,7 +48,7 @@ static int bool_parse(semanage_handle_t * handle, goto last; /* Extract name */ - if (parse_fetch_string(handle, info, &str, '=') < 0) + if (parse_fetch_string(handle, info, &str, '=', 0) < 0) goto err; if (semanage_bool_set_name(handle, boolean, str) < 0) diff --git a/libsemanage/src/fcontexts_file.c b/libsemanage/src/fcontexts_file.c index 04cd365a..f3579410 100644 --- a/libsemanage/src/fcontexts_file.c +++ b/libsemanage/src/fcontexts_file.c @@ -90,7 +90,7 @@ static int fcontext_parse(semanage_handle_t * handle, goto last; /* Regexp */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_fcontext_set_expr(handle, fcontext, str) < 0) goto err; @@ -100,7 +100,7 @@ static int fcontext_parse(semanage_handle_t * handle, /* Type */ if (parse_assert_space(handle, info) < 0) goto err; - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (!strcasecmp(str, "-s")) semanage_fcontext_set_type(fcontext, SEMANAGE_FCONTEXT_SOCK); @@ -124,7 +124,7 @@ static int fcontext_parse(semanage_handle_t * handle, /* Context */ if (parse_assert_space(handle, info) < 0) goto err; - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; process_context: diff --git a/libsemanage/src/ibendports_file.c b/libsemanage/src/ibendports_file.c index bafa8c1d..2fa2a67c 100644 --- a/libsemanage/src/ibendports_file.c +++ b/libsemanage/src/ibendports_file.c @@ -75,7 +75,7 @@ static int ibendport_parse(semanage_handle_t *handle, goto err; /* IB Device Name */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_ibendport_set_ibdev_name(handle, ibendport, str) < 0) goto err; @@ -92,7 +92,7 @@ static int ibendport_parse(semanage_handle_t *handle, /* context */ if (parse_assert_space(handle, info) < 0) goto err; - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_context_from_string(handle, str, &con) < 0) { ERR(handle, "invalid security context \"%s\" (%s: %u)\n%s", diff --git a/libsemanage/src/ibpkeys_file.c b/libsemanage/src/ibpkeys_file.c index 929bc31e..edde69f0 100644 --- a/libsemanage/src/ibpkeys_file.c +++ b/libsemanage/src/ibpkeys_file.c @@ -80,7 +80,7 @@ static int ibpkey_parse(semanage_handle_t *handle, goto err; /* Subnet Prefix */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_ibpkey_set_subnet_prefix(handle, ibpkey, str) < 0) goto err; @@ -115,7 +115,7 @@ static int ibpkey_parse(semanage_handle_t *handle, semanage_ibpkey_set_pkey(ibpkey, low); } /* Pkey context */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_context_from_string(handle, str, &con) < 0) { ERR(handle, "invalid security context \"%s\" (%s: %u)\n%s", diff --git a/libsemanage/src/interfaces_file.c b/libsemanage/src/interfaces_file.c index c19c8f94..244f0ae5 100644 --- a/libsemanage/src/interfaces_file.c +++ b/libsemanage/src/interfaces_file.c @@ -72,7 +72,7 @@ static int iface_parse(semanage_handle_t * handle, goto err; /* Name */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_iface_set_name(handle, iface, str) < 0) goto err; @@ -82,7 +82,7 @@ static int iface_parse(semanage_handle_t * handle, /* Interface context */ if (parse_assert_space(handle, info) < 0) goto err; - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_context_from_string(handle, str, &con) < 0) { ERR(handle, "invalid security context \"%s\" (%s: %u)\n%s", @@ -106,7 +106,7 @@ static int iface_parse(semanage_handle_t * handle, /* Message context */ if (parse_assert_space(handle, info) < 0) goto err; - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_context_from_string(handle, str, &con) < 0) { ERR(handle, "invalid security context \"%s\" (%s: %u)\n%s", diff --git a/libsemanage/src/nodes_file.c b/libsemanage/src/nodes_file.c index c3647f2a..2d2b7fe0 100644 --- a/libsemanage/src/nodes_file.c +++ b/libsemanage/src/nodes_file.c @@ -77,7 +77,7 @@ static int node_parse(semanage_handle_t * handle, goto err; /* Protocol */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (!strcasecmp(str, "ipv4")) proto = SEMANAGE_PROTO_IP4; @@ -96,7 +96,7 @@ static int node_parse(semanage_handle_t * handle, /* Address */ if (parse_assert_space(handle, info) < 0) goto err; - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_node_set_addr(handle, node, proto, str) < 0) goto err; @@ -106,7 +106,7 @@ static int node_parse(semanage_handle_t * handle, str = NULL; /* Netmask */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_node_set_mask(handle, node, proto, str) < 0) goto err; @@ -116,7 +116,7 @@ static int node_parse(semanage_handle_t * handle, str = NULL; /* Port context */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_context_from_string(handle, str, &con) < 0) { ERR(handle, "invalid security context \"%s\" (%s: %u)\n%s", diff --git a/libsemanage/src/parse_utils.c b/libsemanage/src/parse_utils.c index 4fb54fc3..918dee43 100644 --- a/libsemanage/src/parse_utils.c +++ b/libsemanage/src/parse_utils.c @@ -239,7 +239,7 @@ int parse_fetch_int(semanage_handle_t * handle, char *test = NULL; int value = 0; - if (parse_fetch_string(handle, info, &str, delim) < 0) + if (parse_fetch_string(handle, info, &str, delim, 0) < 0) goto err; if (!isdigit((int)*str)) { @@ -267,7 +267,7 @@ int parse_fetch_int(semanage_handle_t * handle, } int parse_fetch_string(semanage_handle_t * handle, - parse_info_t * info, char **str, char delim) + parse_info_t * info, char **str, char delim, int allow_spaces) { char *start = info->ptr; @@ -277,7 +277,7 @@ int parse_fetch_string(semanage_handle_t * handle, if (parse_assert_noeof(handle, info) < 0) goto err; - while (*(info->ptr) && !isspace(*(info->ptr)) && + while (*(info->ptr) && (allow_spaces || !isspace(*(info->ptr))) && (*(info->ptr) != delim)) { info->ptr++; len++; diff --git a/libsemanage/src/parse_utils.h b/libsemanage/src/parse_utils.h index 0f334860..3e44aca1 100644 --- a/libsemanage/src/parse_utils.h +++ b/libsemanage/src/parse_utils.h @@ -71,12 +71,11 @@ extern int parse_optional_str(parse_info_t * info, const char *str); int parse_fetch_int(semanage_handle_t * hgandle, parse_info_t * info, int *num, char delim); -/* Extract the next string (delimited by - * whitespace), and move the read pointer past it. - * Stop of the optional character delim is encountered, - * or if whitespace/eof is encountered. Fail if the - * string is of length 0. */ +/* Extract the next string and move the read pointer past it. + * Stop if the optional character delim (or eof) is encountered, + * or if whitespace is encountered and allow_spaces is 0. + * Fail if the string is of length 0. */ extern int parse_fetch_string(semanage_handle_t * handle, - parse_info_t * info, char **str_ptr, char delim); + parse_info_t * info, char **str_ptr, char delim, int allow_spaces); #endif diff --git a/libsemanage/src/ports_file.c b/libsemanage/src/ports_file.c index ade4102f..1356021a 100644 --- a/libsemanage/src/ports_file.c +++ b/libsemanage/src/ports_file.c @@ -77,7 +77,7 @@ static int port_parse(semanage_handle_t * handle, goto err; /* Protocol */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (!strcasecmp(str, "tcp")) semanage_port_set_proto(port, SEMANAGE_PROTO_TCP); @@ -123,7 +123,7 @@ static int port_parse(semanage_handle_t * handle, semanage_port_set_port(port, low); /* Port context */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_context_from_string(handle, str, &con) < 0) { ERR(handle, "invalid security context \"%s\" (%s: %u)\n%s", diff --git a/libsemanage/src/seusers_file.c b/libsemanage/src/seusers_file.c index 910bedf4..21b970ac 100644 --- a/libsemanage/src/seusers_file.c +++ b/libsemanage/src/seusers_file.c @@ -53,7 +53,7 @@ static int seuser_parse(semanage_handle_t * handle, goto last; /* Extract name */ - if (parse_fetch_string(handle, info, &str, ':') < 0) + if (parse_fetch_string(handle, info, &str, ':', 1) < 0) goto err; if (semanage_seuser_set_name(handle, seuser, str) < 0) goto err; @@ -68,7 +68,7 @@ static int seuser_parse(semanage_handle_t * handle, goto err; /* Extract sename */ - if (parse_fetch_string(handle, info, &str, ':') < 0) + if (parse_fetch_string(handle, info, &str, ':', 1) < 0) goto err; if (semanage_seuser_set_sename(handle, seuser, str) < 0) goto err; @@ -83,7 +83,7 @@ static int seuser_parse(semanage_handle_t * handle, goto err; /* NOTE: does not allow spaces/multiline */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_seuser_set_mlsrange(handle, seuser, str) < 0) diff --git a/libsemanage/src/users_base_file.c b/libsemanage/src/users_base_file.c index 0f0a8fdb..a0f8cd7e 100644 --- a/libsemanage/src/users_base_file.c +++ b/libsemanage/src/users_base_file.c @@ -83,7 +83,7 @@ static int user_base_parse(semanage_handle_t * handle, goto err; /* Parse user name */ - if (parse_fetch_string(handle, info, &name_str, ' ') < 0) + if (parse_fetch_string(handle, info, &name_str, ' ', 0) < 0) goto err; if (semanage_user_base_set_name(handle, user, name_str) < 0) { @@ -150,7 +150,7 @@ static int user_base_parse(semanage_handle_t * handle, goto err; /* NOTE: does not allow spaces/multiline */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_user_base_set_mlslevel(handle, user, str) < 0) goto err; @@ -165,8 +165,7 @@ static int user_base_parse(semanage_handle_t * handle, if (parse_assert_space(handle, info) < 0) goto err; - /* NOTE: does not allow spaces/multiline */ - if (parse_fetch_string(handle, info, &str, ';') < 0) + if (parse_fetch_string(handle, info, &str, ';', 1) < 0) goto err; if (semanage_user_base_set_mlsrange(handle, user, str) < 0) goto err; diff --git a/libsemanage/src/users_extra_file.c b/libsemanage/src/users_extra_file.c index 8f2bebd6..7aa9df3c 100644 --- a/libsemanage/src/users_extra_file.c +++ b/libsemanage/src/users_extra_file.c @@ -57,7 +57,7 @@ static int user_extra_parse(semanage_handle_t * handle, goto err; /* Extract name */ - if (parse_fetch_string(handle, info, &str, ' ') < 0) + if (parse_fetch_string(handle, info, &str, ' ', 0) < 0) goto err; if (semanage_user_extra_set_name(handle, user_extra, str) < 0) goto err; @@ -73,7 +73,7 @@ static int user_extra_parse(semanage_handle_t * handle, goto err; /* Extract prefix */ - if (parse_fetch_string(handle, info, &str, ';') < 0) + if (parse_fetch_string(handle, info, &str, ';', 1) < 0) goto err; if (semanage_user_extra_set_prefix(handle, user_extra, str) < 0) goto err; -- 2.30.2

1 1

[PATCH 0/8] driver: Fix handling of driver feature flags
by Peter Krempa 17 Feb '22

17 Feb '22

In a review of code using FD passing I was asked to add the check, so I wanted to see how it works and found a few issues. Peter Krempa (8): driver: Introduce global driver feature flag handling function virDriverFeatureIsGlobal: Handle VIR_DRV_FEATURE_REMOTE virDriverFeatureIsGlobal: Handle VIR_DRV_FEATURE_PROGRAM_KEEPALIVE virDriverFeatureIsGlobal: Handle VIR_DRV_FEATURE_REMOTE_(CLOSE|EVENT)_CALLBACK virDriverFeatureIsGlobal: Handle VIR_DRV_FEATURE_TYPED_PARAM_STRING virDriverFeatureIsGlobal: Handle VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER virDriverFeatureIsGlobal: Handle VIR_DRV_FEATURE_FD_PASSING virDomainCreate(XML)WithFiles: Add check for VIR_DRV_FEATURE_FD_PASSING src/ch/ch_driver.c | 5 +++ src/driver.c | 65 +++++++++++++++++++++++++++++++++++++ src/driver.h | 3 ++ src/esx/esx_driver.c | 4 +++ src/libvirt-domain.c | 24 ++++++++++++++ src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 5 +++ src/lxc/lxc_driver.c | 5 +++ src/network/bridge_driver.c | 5 +++ src/openvz/openvz_driver.c | 5 +++ src/qemu/qemu_driver.c | 5 +++ src/test/test_driver.c | 5 +++ src/vz/vz_driver.c | 5 +++ 13 files changed, 137 insertions(+) -- 2.35.1

4 15

[libvirt PATCH] qemu: Fix crash at the end of migration
by Jiri Denemark 17 Feb '22

17 Feb '22

The destination daemon would crash in Finish phase due to NULL dereference which I missed in my review of commit v8.0.0-428-g0301db44e2. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fea5e71f4d..5aecdddff0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5855,7 +5855,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, if (jobData) { priv->job.completed = g_steal_pointer(&jobData); priv->job.completed->status = VIR_DOMAIN_JOB_STATUS_COMPLETED; - qemuDomainJobSetStatsType(jobData, + qemuDomainJobSetStatsType(priv->job.completed, QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION); } -- 2.35.1

2 1

[libvirt PATCH v2] util: drop support for obsolete systemd in RHEL-7
by Daniel P. Berrangé 16 Feb '22

16 Feb '22

The systemd version in RHEL-7 lacked support for the LISTEN_FDNAMES env variable with socket activation. Since we stopped targetting RHEL-7 we can drop some considerable amount of compatibility code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/daemons.rst | 26 ------- src/locking/lock_daemon.c | 8 +- src/logging/log_daemon.c | 8 +- src/remote/libvirtd-admin.socket.in | 2 - src/remote/libvirtd-ro.socket.in | 2 - src/remote/libvirtd-tcp.socket.in | 2 - src/remote/libvirtd-tls.socket.in | 2 - src/remote/libvirtd.conf.in | 6 +- src/remote/libvirtd.socket.in | 2 - src/remote/remote_daemon.c | 19 +---- src/util/virsystemd.c | 117 +++------------------------- src/util/virsystemd.h | 15 +--- tests/virsystemdtest.c | 38 +-------- 13 files changed, 21 insertions(+), 226 deletions(-) diff --git a/docs/daemons.rst b/docs/daemons.rst index c3970eb89c..383f0f64ff 100644 --- a/docs/daemons.rst +++ b/docs/daemons.rst @@ -209,13 +209,6 @@ controlled via the system unit files ``libvirtd.socket``, ``libvirtd-ro.socket`` and ``libvirtd-admin.socket`` unit files. -Systemd releases prior to version 227 lacked support for passing the activation -socket unit names into the service. When using these old versions, the -``tcp_port``, ``tls_port`` and ``unix_sock_dir`` settings in ``libvirtd.conf`` -must be changed in lock-step with the equivalent settings in the unit files to -ensure that ``libvirtd`` can identify the sockets. - - Modular driver daemons ====================== @@ -354,13 +347,6 @@ controlled via the system unit files: ``virt${DRIVER}d.socket``, ``virt${DRIVER}d-ro.socket`` and ``virt${DRIVER}d-admin.socket`` unit files. -Systemd releases prior to version 227 lacked support for passing the activation -socket unit names into the service. When using these old versions, the -``unix_sock_dir`` setting in ``virt${DRIVER}d.conf`` must be changed in -lock-step with the equivalent setting in the unit files to ensure that -``virt${DRIVER}d`` can identify the sockets. - - Switching to modular daemons ---------------------------- @@ -639,12 +625,6 @@ controlled via the system unit files: independently controlled via the ``ListenStream`` parameter in any of the ``virtlogd.socket`` and ``virtlogd-admin.socket`` unit files. -Systemd releases prior to version 227 lacked support for passing the activation -socket unit names into the service. When using these old versions, the -``unix_sock_dir`` setting in ``virtlogd.conf`` must be changed in -lock-step with the equivalent setting in the unit files to ensure that -``virtlogd`` can identify the sockets. - Locking daemon ============== @@ -733,12 +713,6 @@ controlled via the system unit files: independently controlled via the ``ListenStream`` parameter in any of the ``virtlockd.socket`` and ``virtlockd-admin.socket`` unit files. -Systemd releases prior to version 227 lacked support for passing the activation -socket unit names into the service. When using these old versions, the -``unix_sock_dir`` setting in ``virtlockd.conf`` must be changed in -lock-step with the equivalent setting in the unit files to ensure that -``virtlockd`` can identify the sockets. - Changing command line options for daemons ========================================= diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index b44649bfbe..178e8cf830 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -986,10 +986,6 @@ int main(int argc, char **argv) { * saved state is present, therefore initialize from scratch here. */ if (rv == 0) { g_autoptr(virSystemdActivation) act = NULL; - virSystemdActivationMap actmap[] = { - { .name = "virtlockd.socket", .family = AF_UNIX, .path = sock_file }, - { .name = "virtlockd-admin.socket", .family = AF_UNIX, .path = admin_sock_file }, - }; if (godaemon) { if (chdir("/") < 0) { @@ -1016,9 +1012,7 @@ int main(int argc, char **argv) { goto cleanup; } - if (virSystemdGetActivation(actmap, - G_N_ELEMENTS(actmap), - &act) < 0) { + if (virSystemdGetActivation(&act) < 0) { ret = VIR_DAEMON_ERR_NETWORK; goto cleanup; } diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 245df9dbbd..82f625142b 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -794,10 +794,6 @@ int main(int argc, char **argv) { */ if (rv == 0) { g_autoptr(virSystemdActivation) act = NULL; - virSystemdActivationMap actmap[] = { - { .name = "virtlogd.socket", .family = AF_UNIX, .path = sock_file }, - { .name = "virtlogd-admin.socket", .family = AF_UNIX, .path = admin_sock_file }, - }; if (godaemon) { if (chdir("/") < 0) { @@ -824,9 +820,7 @@ int main(int argc, char **argv) { goto cleanup; } - if (virSystemdGetActivation(actmap, - G_N_ELEMENTS(actmap), - &act) < 0) { + if (virSystemdGetActivation(&act) < 0) { ret = VIR_DAEMON_ERR_NETWORK; goto cleanup; } diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admin.socket.in index 4129abc1ab..01e1a08939 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -6,8 +6,6 @@ After=@service@.socket @deps@ [Socket] -# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_sock_dir setting -# when using systemd version < 227 ListenStream=@runstatedir@/libvirt/@sockprefix@-admin-sock Service=@service@.service SocketMode=0600 diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.socket.in index cb5e6bd60f..58ae1beb95 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -6,8 +6,6 @@ After=@service@.socket @deps@ [Socket] -# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_sock_dir setting -# when using systemd version < 227 ListenStream=@runstatedir@/libvirt/@sockprefix@-sock-ro Service=@service@.service SocketMode=0666 diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.socket.in index dd60317d47..6949df315e 100644 --- a/src/remote/libvirtd-tcp.socket.in +++ b/src/remote/libvirtd-tcp.socket.in @@ -6,8 +6,6 @@ After=@service@.socket @deps@ [Socket] -# This must match the @sysconfdir@/libvirt/@service@.conf tcp_port setting -# when using systemd version < 227 ListenStream=16509 Service=@service@.service diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.socket.in index 8b89737fff..ada2b871f0 100644 --- a/src/remote/libvirtd-tls.socket.in +++ b/src/remote/libvirtd-tls.socket.in @@ -6,8 +6,6 @@ After=@service@.socket @deps@ [Socket] -# This must match the @sysconfdir@/libvirt/@service@.conf tls_port setting -# when using systemd version < 227 ListenStream=16514 Service=@service@.service diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in index 2cd20aaa7f..defe6b83d0 100644 --- a/src/remote/libvirtd.conf.in +++ b/src/remote/libvirtd.conf.in @@ -40,7 +40,7 @@ # This can be a port number, or service name # # This setting is not required or honoured if using systemd socket -# activation with systemd version >= 227 +# activation. # #tls_port = "16514" @@ -48,7 +48,7 @@ # This can be a port number, or service name # # This setting is not required or honoured if using systemd socket -# activation with systemd version >= 227 +# activation. # #tcp_port = "16509" @@ -117,7 +117,7 @@ # Set the name of the directory in which sockets will be found/created. # # This setting is not required or honoured if using systemd socket -# activation with systemd version >= 227 +# activation. # #unix_sock_dir = "@runstatedir@/libvirt" diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index 0f349656f5..4842712648 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -4,8 +4,6 @@ Before=@service@.service @deps@ [Socket] -# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_sock_dir setting -# when using systemd version < 227 ListenStream=@runstatedir@/libvirt/@sockprefix@-sock Service=@service@.service SocketMode=@mode@ diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 1b8e982a2f..26469e0d9f 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -214,25 +214,8 @@ daemonSetupNetworking(virNetServer *srv, unsigned int tcp_min_ssf = 0; #endif /* !WITH_SASL */ g_autoptr(virSystemdActivation) act = NULL; - virSystemdActivationMap actmap[] = { - { .name = DAEMON_NAME ".socket", .family = AF_UNIX, .path = sock_path }, - { .name = DAEMON_NAME "-ro.socket", .family = AF_UNIX, .path = sock_path_ro }, - { .name = DAEMON_NAME "-admin.socket", .family = AF_UNIX, .path = sock_path_adm }, -#ifdef WITH_IP - { .name = DAEMON_NAME "-tcp.socket", .family = AF_INET }, - { .name = DAEMON_NAME "-tls.socket", .family = AF_INET }, -#endif /* ! WITH_IP */ - }; - -#ifdef WITH_IP - if ((actmap[3].port = virSocketAddrResolveService(config->tcp_port)) < 0) - return -1; - - if ((actmap[4].port = virSocketAddrResolveService(config->tls_port)) < 0) - return -1; -#endif /* ! WITH_IP */ - if (virSystemdGetActivation(actmap, G_N_ELEMENTS(actmap), &act) < 0) + if (virSystemdGetActivation(&act) < 0) return -1; #ifdef WITH_IP diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index a86d4c6bb9..c95b6c93d3 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -788,98 +788,6 @@ virSystemdActivationInitFromNames(virSystemdActivation *act, } -/* - * Back compat for systemd < v227 which lacks LISTEN_FDNAMES. - * Delete when min systemd is increased ie RHEL7 dropped - */ -static int -virSystemdActivationInitFromMap(virSystemdActivation *act, - int nfds, - virSystemdActivationMap *map, - size_t nmap) -{ - int nextfd = STDERR_FILENO + 1; - size_t i; - - while (nfds) { - virSocketAddr addr; - const char *name = NULL; - - memset(&addr, 0, sizeof(addr)); - - addr.len = sizeof(addr.data); - if (getsockname(nextfd, &addr.data.sa, &addr.len) < 0) { - virReportSystemError(errno, "%s", _("Unable to get local socket name")); - goto error; - } - - VIR_DEBUG("Got socket family %d for FD %d", - addr.data.sa.sa_family, nextfd); - - for (i = 0; i < nmap && !name; i++) { - if (map[i].name == NULL) - continue; - - if (addr.data.sa.sa_family == AF_INET) { - if (map[i].family == AF_INET) { - VIR_DEBUG("Expect %d got %d", - map[i].port, ntohs(addr.data.inet4.sin_port)); - if (addr.data.inet4.sin_port == htons(map[i].port)) - name = map[i].name; - } - } else if (addr.data.sa.sa_family == AF_INET6) { - /* NB use of AF_INET here is correct. The "map" struct - * only refers to AF_INET. The socket may be AF_INET - * or AF_INET6 - */ - if (map[i].family == AF_INET) { - VIR_DEBUG("Expect %d got %d", - map[i].port, ntohs(addr.data.inet6.sin6_port)); - if (addr.data.inet6.sin6_port == htons(map[i].port)) - name = map[i].name; - } -#ifndef WIN32 - } else if (addr.data.sa.sa_family == AF_UNIX) { - if (map[i].family == AF_UNIX) { - VIR_DEBUG("Expect %s got %s", map[i].path, addr.data.un.sun_path); - if (STREQLEN(map[i].path, - addr.data.un.sun_path, - sizeof(addr.data.un.sun_path))) - name = map[i].name; - } -#endif - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected socket family %d"), - addr.data.sa.sa_family); - goto error; - } - } - - if (!name) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find name for FD %d socket family %d"), - nextfd, addr.data.sa.sa_family); - goto error; - } - - if (virSystemdActivationAddFD(act, name, nextfd) < 0) - goto error; - - nfds--; - nextfd++; - } - - return 0; - - error: - for (i = 0; i < nfds; i++) { - int fd = nextfd + i; - VIR_FORCE_CLOSE(fd); - } - return -1; -} - #ifndef WIN32 /** @@ -954,9 +862,7 @@ virSystemdGetListenFDs(void) #endif /* WIN32 */ static virSystemdActivation * -virSystemdActivationNew(virSystemdActivationMap *map, - size_t nmap, - int nfds) +virSystemdActivationNew(int nfds) { g_autoptr(virSystemdActivation) act = g_new0(virSystemdActivation, 1); const char *fdnames; @@ -966,14 +872,15 @@ virSystemdActivationNew(virSystemdActivationMap *map, act->fds = virHashNew(virSystemdActivationEntryFree); fdnames = getenv("LISTEN_FDNAMES"); - if (fdnames) { - if (virSystemdActivationInitFromNames(act, nfds, fdnames) < 0) - return NULL; - } else { - if (virSystemdActivationInitFromMap(act, nfds, map, nmap) < 0) - return NULL; + if (!fdnames) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing LISTEN_FDNAMES env from systemd socket activation")); + return NULL; } + if (virSystemdActivationInitFromNames(act, nfds, fdnames) < 0) + return NULL; + VIR_DEBUG("Created activation object for %d FDs", nfds); return g_steal_pointer(&act); } @@ -981,8 +888,6 @@ virSystemdActivationNew(virSystemdActivationMap *map, /** * virSystemdGetActivation: - * @map: mapping of socket addresses to names - * @nmap: number of entries in @map * @act: filled with allocated activation object * * Acquire an object for handling systemd activation. @@ -995,9 +900,7 @@ virSystemdActivationNew(virSystemdActivationMap *map, * Returns: 0 on success, -1 on failure */ int -virSystemdGetActivation(virSystemdActivationMap *map, - size_t nmap, - virSystemdActivation **act) +virSystemdGetActivation(virSystemdActivation **act) { int nfds = 0; @@ -1010,7 +913,7 @@ virSystemdGetActivation(virSystemdActivationMap *map, return 0; } - *act = virSystemdActivationNew(map, nmap, nfds); + *act = virSystemdActivationNew(nfds); return 0; } diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 93320e40b9..19fb714132 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -25,17 +25,6 @@ typedef struct _virSystemdActivation virSystemdActivation; -/* - * Back compat for systemd < v227 which lacks LISTEN_FDNAMES. - * Delete when min systemd is increased ie RHEL7 dropped - */ -typedef struct _virSystemdActivationMap { - const char *name; - int family; - int port; /* if family == AF_INET/AF_INET6 */ - const char *path; /* if family == AF_UNIX */ -} virSystemdActivationMap; - char *virSystemdMakeScopeName(const char *name, const char *drivername, bool legacy_behaviour); @@ -70,9 +59,7 @@ char *virSystemdGetMachineNameByPID(pid_t pid); char *virSystemdGetMachineUnitByPID(pid_t pid); -int virSystemdGetActivation(virSystemdActivationMap *map, - size_t nmap, - virSystemdActivation **act); +int virSystemdGetActivation(virSystemdActivation **act); bool virSystemdActivationHasName(virSystemdActivation *act, const char *name); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 9a063dd1fc..9b513697e0 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -513,7 +513,7 @@ testActivationCreateFDs(virNetSocket **sockUNIX, static int -testActivation(bool useNames) +testActivationFDNames(const void *opaque G_GNUC_UNUSED) { virNetSocket *sockUNIX; virNetSocket **sockIP; @@ -522,7 +522,6 @@ testActivation(bool useNames) size_t i; char nfdstr[VIR_INT64_STR_BUFLEN]; char pidstr[VIR_INT64_STR_BUFLEN]; - virSystemdActivationMap map[2]; int *fds = NULL; size_t nfds = 0; g_autoptr(virSystemdActivation) act = NULL; @@ -544,21 +543,9 @@ testActivation(bool useNames) g_setenv("LISTEN_FDS", nfdstr, TRUE); g_setenv("LISTEN_PID", pidstr, TRUE); + g_setenv("LISTEN_FDNAMES", virBufferCurrentContent(&names), TRUE); - if (useNames) - g_setenv("LISTEN_FDNAMES", virBufferCurrentContent(&names), TRUE); - else - g_unsetenv("LISTEN_FDNAMES"); - - map[0].name = "demo-unix.socket"; - map[0].family = AF_UNIX; - map[0].path = demo_socket_path; - - map[1].name = "demo-ip.socket"; - map[1].family = AF_INET; - map[1].port = virNetSocketGetPort(sockIP[0]); - - if (virSystemdGetActivation(map, G_N_ELEMENTS(map), &act) < 0) + if (virSystemdGetActivation(&act) < 0) goto cleanup; if (act == NULL) { @@ -617,7 +604,7 @@ testActivationEmpty(const void *opaque G_GNUC_UNUSED) g_unsetenv("LISTEN_FDS"); - if (virSystemdGetActivation(NULL, 0, &act) < 0) + if (virSystemdGetActivation(&act) < 0) return -1; if (act != NULL) { @@ -629,21 +616,6 @@ testActivationEmpty(const void *opaque G_GNUC_UNUSED) return 0; } - -static int -testActivationFDNames(const void *opaque G_GNUC_UNUSED) -{ - return testActivation(true); -} - - -static int -testActivationFDAddrs(const void *opaque G_GNUC_UNUSED) -{ - return testActivation(false); -} - - static int mymain(void) { @@ -759,8 +731,6 @@ mymain(void) fcntl(STDERR_FILENO + 3, F_GETFL) == -1 && errno == EBADF) { if (virTestRun("Test activation names", testActivationFDNames, NULL) < 0) ret = -1; - if (virTestRun("Test activation addrs", testActivationFDAddrs, NULL) < 0) - ret = -1; } else { VIR_INFO("Skipping activation tests as FD 3/4/5 is open"); } -- 2.34.1

2 1

[libvirt PATCH] util: drop support for obsolete systemd in RHEL-7
by Daniel P. Berrangé 16 Feb '22

16 Feb '22

The systemd version in RHEL-7 lacked support for the LISTEN_FDNAMES env variable with socket activation. Since we stopped targetting RHEL-7 we can drop some considerable amount of compatibility code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/locking/lock_daemon.c | 8 +-- src/logging/log_daemon.c | 8 +-- src/remote/remote_daemon.c | 19 +----- src/util/virsystemd.c | 117 ++++--------------------------------- src/util/virsystemd.h | 15 +---- tests/virsystemdtest.c | 38 ++---------- 6 files changed, 18 insertions(+), 187 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index b44649bfbe..178e8cf830 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -986,10 +986,6 @@ int main(int argc, char **argv) { * saved state is present, therefore initialize from scratch here. */ if (rv == 0) { g_autoptr(virSystemdActivation) act = NULL; - virSystemdActivationMap actmap[] = { - { .name = "virtlockd.socket", .family = AF_UNIX, .path = sock_file }, - { .name = "virtlockd-admin.socket", .family = AF_UNIX, .path = admin_sock_file }, - }; if (godaemon) { if (chdir("/") < 0) { @@ -1016,9 +1012,7 @@ int main(int argc, char **argv) { goto cleanup; } - if (virSystemdGetActivation(actmap, - G_N_ELEMENTS(actmap), - &act) < 0) { + if (virSystemdGetActivation(&act) < 0) { ret = VIR_DAEMON_ERR_NETWORK; goto cleanup; } diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 245df9dbbd..82f625142b 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -794,10 +794,6 @@ int main(int argc, char **argv) { */ if (rv == 0) { g_autoptr(virSystemdActivation) act = NULL; - virSystemdActivationMap actmap[] = { - { .name = "virtlogd.socket", .family = AF_UNIX, .path = sock_file }, - { .name = "virtlogd-admin.socket", .family = AF_UNIX, .path = admin_sock_file }, - }; if (godaemon) { if (chdir("/") < 0) { @@ -824,9 +820,7 @@ int main(int argc, char **argv) { goto cleanup; } - if (virSystemdGetActivation(actmap, - G_N_ELEMENTS(actmap), - &act) < 0) { + if (virSystemdGetActivation(&act) < 0) { ret = VIR_DAEMON_ERR_NETWORK; goto cleanup; } diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 1b8e982a2f..26469e0d9f 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -214,25 +214,8 @@ daemonSetupNetworking(virNetServer *srv, unsigned int tcp_min_ssf = 0; #endif /* !WITH_SASL */ g_autoptr(virSystemdActivation) act = NULL; - virSystemdActivationMap actmap[] = { - { .name = DAEMON_NAME ".socket", .family = AF_UNIX, .path = sock_path }, - { .name = DAEMON_NAME "-ro.socket", .family = AF_UNIX, .path = sock_path_ro }, - { .name = DAEMON_NAME "-admin.socket", .family = AF_UNIX, .path = sock_path_adm }, -#ifdef WITH_IP - { .name = DAEMON_NAME "-tcp.socket", .family = AF_INET }, - { .name = DAEMON_NAME "-tls.socket", .family = AF_INET }, -#endif /* ! WITH_IP */ - }; - -#ifdef WITH_IP - if ((actmap[3].port = virSocketAddrResolveService(config->tcp_port)) < 0) - return -1; - - if ((actmap[4].port = virSocketAddrResolveService(config->tls_port)) < 0) - return -1; -#endif /* ! WITH_IP */ - if (virSystemdGetActivation(actmap, G_N_ELEMENTS(actmap), &act) < 0) + if (virSystemdGetActivation(&act) < 0) return -1; #ifdef WITH_IP diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index a86d4c6bb9..c95b6c93d3 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -788,98 +788,6 @@ virSystemdActivationInitFromNames(virSystemdActivation *act, } -/* - * Back compat for systemd < v227 which lacks LISTEN_FDNAMES. - * Delete when min systemd is increased ie RHEL7 dropped - */ -static int -virSystemdActivationInitFromMap(virSystemdActivation *act, - int nfds, - virSystemdActivationMap *map, - size_t nmap) -{ - int nextfd = STDERR_FILENO + 1; - size_t i; - - while (nfds) { - virSocketAddr addr; - const char *name = NULL; - - memset(&addr, 0, sizeof(addr)); - - addr.len = sizeof(addr.data); - if (getsockname(nextfd, &addr.data.sa, &addr.len) < 0) { - virReportSystemError(errno, "%s", _("Unable to get local socket name")); - goto error; - } - - VIR_DEBUG("Got socket family %d for FD %d", - addr.data.sa.sa_family, nextfd); - - for (i = 0; i < nmap && !name; i++) { - if (map[i].name == NULL) - continue; - - if (addr.data.sa.sa_family == AF_INET) { - if (map[i].family == AF_INET) { - VIR_DEBUG("Expect %d got %d", - map[i].port, ntohs(addr.data.inet4.sin_port)); - if (addr.data.inet4.sin_port == htons(map[i].port)) - name = map[i].name; - } - } else if (addr.data.sa.sa_family == AF_INET6) { - /* NB use of AF_INET here is correct. The "map" struct - * only refers to AF_INET. The socket may be AF_INET - * or AF_INET6 - */ - if (map[i].family == AF_INET) { - VIR_DEBUG("Expect %d got %d", - map[i].port, ntohs(addr.data.inet6.sin6_port)); - if (addr.data.inet6.sin6_port == htons(map[i].port)) - name = map[i].name; - } -#ifndef WIN32 - } else if (addr.data.sa.sa_family == AF_UNIX) { - if (map[i].family == AF_UNIX) { - VIR_DEBUG("Expect %s got %s", map[i].path, addr.data.un.sun_path); - if (STREQLEN(map[i].path, - addr.data.un.sun_path, - sizeof(addr.data.un.sun_path))) - name = map[i].name; - } -#endif - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected socket family %d"), - addr.data.sa.sa_family); - goto error; - } - } - - if (!name) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find name for FD %d socket family %d"), - nextfd, addr.data.sa.sa_family); - goto error; - } - - if (virSystemdActivationAddFD(act, name, nextfd) < 0) - goto error; - - nfds--; - nextfd++; - } - - return 0; - - error: - for (i = 0; i < nfds; i++) { - int fd = nextfd + i; - VIR_FORCE_CLOSE(fd); - } - return -1; -} - #ifndef WIN32 /** @@ -954,9 +862,7 @@ virSystemdGetListenFDs(void) #endif /* WIN32 */ static virSystemdActivation * -virSystemdActivationNew(virSystemdActivationMap *map, - size_t nmap, - int nfds) +virSystemdActivationNew(int nfds) { g_autoptr(virSystemdActivation) act = g_new0(virSystemdActivation, 1); const char *fdnames; @@ -966,14 +872,15 @@ virSystemdActivationNew(virSystemdActivationMap *map, act->fds = virHashNew(virSystemdActivationEntryFree); fdnames = getenv("LISTEN_FDNAMES"); - if (fdnames) { - if (virSystemdActivationInitFromNames(act, nfds, fdnames) < 0) - return NULL; - } else { - if (virSystemdActivationInitFromMap(act, nfds, map, nmap) < 0) - return NULL; + if (!fdnames) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing LISTEN_FDNAMES env from systemd socket activation")); + return NULL; } + if (virSystemdActivationInitFromNames(act, nfds, fdnames) < 0) + return NULL; + VIR_DEBUG("Created activation object for %d FDs", nfds); return g_steal_pointer(&act); } @@ -981,8 +888,6 @@ virSystemdActivationNew(virSystemdActivationMap *map, /** * virSystemdGetActivation: - * @map: mapping of socket addresses to names - * @nmap: number of entries in @map * @act: filled with allocated activation object * * Acquire an object for handling systemd activation. @@ -995,9 +900,7 @@ virSystemdActivationNew(virSystemdActivationMap *map, * Returns: 0 on success, -1 on failure */ int -virSystemdGetActivation(virSystemdActivationMap *map, - size_t nmap, - virSystemdActivation **act) +virSystemdGetActivation(virSystemdActivation **act) { int nfds = 0; @@ -1010,7 +913,7 @@ virSystemdGetActivation(virSystemdActivationMap *map, return 0; } - *act = virSystemdActivationNew(map, nmap, nfds); + *act = virSystemdActivationNew(nfds); return 0; } diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 93320e40b9..19fb714132 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -25,17 +25,6 @@ typedef struct _virSystemdActivation virSystemdActivation; -/* - * Back compat for systemd < v227 which lacks LISTEN_FDNAMES. - * Delete when min systemd is increased ie RHEL7 dropped - */ -typedef struct _virSystemdActivationMap { - const char *name; - int family; - int port; /* if family == AF_INET/AF_INET6 */ - const char *path; /* if family == AF_UNIX */ -} virSystemdActivationMap; - char *virSystemdMakeScopeName(const char *name, const char *drivername, bool legacy_behaviour); @@ -70,9 +59,7 @@ char *virSystemdGetMachineNameByPID(pid_t pid); char *virSystemdGetMachineUnitByPID(pid_t pid); -int virSystemdGetActivation(virSystemdActivationMap *map, - size_t nmap, - virSystemdActivation **act); +int virSystemdGetActivation(virSystemdActivation **act); bool virSystemdActivationHasName(virSystemdActivation *act, const char *name); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 9a063dd1fc..9b513697e0 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -513,7 +513,7 @@ testActivationCreateFDs(virNetSocket **sockUNIX, static int -testActivation(bool useNames) +testActivationFDNames(const void *opaque G_GNUC_UNUSED) { virNetSocket *sockUNIX; virNetSocket **sockIP; @@ -522,7 +522,6 @@ testActivation(bool useNames) size_t i; char nfdstr[VIR_INT64_STR_BUFLEN]; char pidstr[VIR_INT64_STR_BUFLEN]; - virSystemdActivationMap map[2]; int *fds = NULL; size_t nfds = 0; g_autoptr(virSystemdActivation) act = NULL; @@ -544,21 +543,9 @@ testActivation(bool useNames) g_setenv("LISTEN_FDS", nfdstr, TRUE); g_setenv("LISTEN_PID", pidstr, TRUE); + g_setenv("LISTEN_FDNAMES", virBufferCurrentContent(&names), TRUE); - if (useNames) - g_setenv("LISTEN_FDNAMES", virBufferCurrentContent(&names), TRUE); - else - g_unsetenv("LISTEN_FDNAMES"); - - map[0].name = "demo-unix.socket"; - map[0].family = AF_UNIX; - map[0].path = demo_socket_path; - - map[1].name = "demo-ip.socket"; - map[1].family = AF_INET; - map[1].port = virNetSocketGetPort(sockIP[0]); - - if (virSystemdGetActivation(map, G_N_ELEMENTS(map), &act) < 0) + if (virSystemdGetActivation(&act) < 0) goto cleanup; if (act == NULL) { @@ -617,7 +604,7 @@ testActivationEmpty(const void *opaque G_GNUC_UNUSED) g_unsetenv("LISTEN_FDS"); - if (virSystemdGetActivation(NULL, 0, &act) < 0) + if (virSystemdGetActivation(&act) < 0) return -1; if (act != NULL) { @@ -629,21 +616,6 @@ testActivationEmpty(const void *opaque G_GNUC_UNUSED) return 0; } - -static int -testActivationFDNames(const void *opaque G_GNUC_UNUSED) -{ - return testActivation(true); -} - - -static int -testActivationFDAddrs(const void *opaque G_GNUC_UNUSED) -{ - return testActivation(false); -} - - static int mymain(void) { @@ -759,8 +731,6 @@ mymain(void) fcntl(STDERR_FILENO + 3, F_GETFL) == -1 && errno == EBADF) { if (virTestRun("Test activation names", testActivationFDNames, NULL) < 0) ret = -1; - if (virTestRun("Test activation addrs", testActivationFDAddrs, NULL) < 0) - ret = -1; } else { VIR_INFO("Skipping activation tests as FD 3/4/5 is open"); } -- 2.34.1

2 3

[PATCH] qemu: fix excluding disk from internal inactive snapshot
by Nikolay Shirokovskiy 16 Feb '22

16 Feb '22

Currently taking an internal inactive snapshot with a disk excluded from snapshot using snapshot="no" will fail with error "Disk device '%s' does not support snapshotting". Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/qemu/qemu_domain.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 469942d201..6a70b72760 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6860,11 +6860,12 @@ qemuDomainSnapshotWriteMetadata(virDomainObj *vm, static int qemuDomainSnapshotForEachQcow2Raw(virQEMUDriver *driver, virDomainDef *def, - const char *name, + virDomainMomentObj *snap, const char *op, bool try_all, int ndisks) { + virDomainSnapshotDef *snapdef = virDomainSnapshotObjGetDef(snap); const char *qemuimgbin; size_t i; bool skipped = false; @@ -6877,11 +6878,12 @@ qemuDomainSnapshotForEachQcow2Raw(virQEMUDriver *driver, for (i = 0; i < ndisks; i++) { g_autoptr(virCommand) cmd = virCommandNewArgList(qemuimgbin, "snapshot", - op, name, NULL); + op, snap->def->name, NULL); int format = virDomainDiskGetFormat(def->disks[i]); /* FIXME: we also need to handle LVM here */ - if (def->disks[i]->device != VIR_DOMAIN_DISK_DEVICE_DISK) + if (def->disks[i]->device != VIR_DOMAIN_DISK_DEVICE_DISK || + snapdef->disks[i].snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) continue; if (!virStorageSourceIsLocalStorage(def->disks[i]->src)) { @@ -6903,7 +6905,7 @@ qemuDomainSnapshotForEachQcow2Raw(virQEMUDriver *driver, } else if (STREQ(op, "-c") && i) { /* We must roll back partial creation by deleting * all earlier snapshots. */ - qemuDomainSnapshotForEachQcow2Raw(driver, def, name, + qemuDomainSnapshotForEachQcow2Raw(driver, def, snap, "-d", false, i); } virReportError(VIR_ERR_OPERATION_INVALID, @@ -6923,7 +6925,7 @@ qemuDomainSnapshotForEachQcow2Raw(virQEMUDriver *driver, } else if (STREQ(op, "-c") && i) { /* We must roll back partial creation by deleting * all earlier snapshots. */ - qemuDomainSnapshotForEachQcow2Raw(driver, def, name, + qemuDomainSnapshotForEachQcow2Raw(driver, def, snap, "-d", false, i); } return -1; @@ -6942,7 +6944,7 @@ qemuDomainSnapshotForEachQcow2(virQEMUDriver *driver, const char *op, bool try_all) { - return qemuDomainSnapshotForEachQcow2Raw(driver, def, snap->def->name, + return qemuDomainSnapshotForEachQcow2Raw(driver, def, snap, op, try_all, def->ndisks); } -- 2.31.1

2 4

Plans for the next release
by Jiri Denemark 16 Feb '22

16 Feb '22

We are getting close to the next release of libvirt. To aim for the release on Mar 01 I suggest entering the freeze on Wednesday Feb 23 and tagging RC2 on Friday Feb 25. I hope this works for everyone. Jirka

1 0

[PATCH v4 0/9] support mode option for dirtyrate calculation
by huangy81＠chinatelecom.cn 16 Feb '22

16 Feb '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> v4: - Rebase the master - [PATCH v4 1/9]: Refactor dirty page rate calculation status implementation, display calc_status as string when 'virsh domstats --dirtyrate' api return. - [PATCH v4 3/9]: Adjust the 'cap check' block before BeginJob(). - [PATCH v4 5/9]: Drop the virDomainDirtyRateCalcMode and introduce internal enum qemuMonitorDirtyRateCalcMode instead. - [PATCH v4 6/9]: Code clean. - [PATCH v4 7/9]: Split qemu_driver logic of domdirtyrate-calc virsh api into a separate commit. - [PATCH v4 8/9]: Change the 'mode' parameter usage as --mode=[xxx|yyy], code clean in qemuDomainStartDirtyRateCalc. - [PATCH v4 9/9]: Display calc_mode as string and do code clean in qemuMonitorJSONExtractDirtyRateInfo. Thanks Michal and Peter for reviewing the previous versions, please review. Regards Yong v3: - Rebase the master - [PATCH v2 2/6]: Fix the usage of virQEMUCapsGet - [PATCH v2 4/6]: Fix the cleanup missed in qemuDomainStartDirtyRateCalc - [PATCH v2 4/6]: Move all blocks below ACL check - [PATCH v2 4/6]: Make the qemuMonitorJSONStartDirtyRateCalc cleaner by merging the different case of qemuMonitorJSONMakeCommand - [PATCH v2 4/6]: Code clean, make the error message not be line-broken - [PATCH v2 5/6]: Abstract the enum definition into a standalone commit - [PATCH v2 5/6]: Move the validations code above calculating flags block - [PATCH v2 6/6]: Change the type of 'value' field to unsigned in struct qemuMonitorDirtyRateVcpu - [PATCH v2 6/6]: Rename the enum type qemuMonitorDirtyRateCalcMode to virDomainDirtyRateCalcMode - [PATCH v2 6/6]: Code clean, align the code in qemuDomainGetStatsDirtyRate Thanks Peter for quick and precise response, please review. Regards Yong v2: Rebase master and fix confilicts with commit "Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_PREALLOC" Thanks ! v1: This patchset introduce mode option as the supplement of qemuDomainStartDirtyRateCalc api, add calc_mode for dirtyrate statistics correspondingly. Qemu add mode parameter for calc-dirty-rate command since >= 6.2.0, either of these three mode "page-sampling, dirty-bitmap, dirty-ring" can be specified when calculating dirty page rate. Page sampling is the original mode and used as default mode. Dirty bitmap mode use kvm log sync api to fetch the dirty-bitmap and count the increased 1 bits number during measurement, thus, calculate the dirty page rate. Dirty ring mode use the dirty-ring mechanism implemented in Qemu which can count the increased dirty page on virtual cpu granularity, thus, calculate the per-vcpu dirty page rate. These three calculation mode can be used in different scenarios, and the dirty-bitmap, dirty-ring mode may be more accurate to a certain degree. So maybe it's time to support the mode option for dirtyrate calculation. This series make main modifications as the following: 1. introduce QEMU_CAPS_CALC_DIRTY_RATE capability to probe calc-dirty-rate command in case of failure since it just introduced since >= 5.2.0 2. introduce QEMU_CAPS_DIRTYRATE_MODE capability to probe mode option of calc-dirty-rate command in case of failure, same as 1. 3. implement mode option support for dirtyrate calculation. Please review, thanks ! Best Regards ! Hyman Huang(黄勇) (9): qemu: Refactor dirty page rate calculation status implementation qemu_capabilities: Introduce QEMU_CAPS_CALC_DIRTY_RATE capability qemu_driver: Probe capability before calculating dirty page rate qemu_capabilities: Introduce QEMU_CAPS_DIRTYRATE_MODE capability include: Introduce virDomainDirtyRateCalcFlags qemu_driver: Add mode parameter to qemuDomainStartDirtyRateCalc qemu_driver: Extend flags parameter of virDomainStartDirtyRateCalc virsh: Add mode option to domdirtyrate-calc virsh api qemu_driver: Add calc_mode for dirtyrate statistics docs/manpages/virsh.rst | 7 ++- include/libvirt/libvirt-domain.h | 21 +++---- src/libvirt-domain.c | 20 +++++-- src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 63 +++++++++++++++++--- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 45 +++++++++++++- src/qemu/qemu_monitor_json.c | 72 +++++++++++++++++++++-- src/qemu/qemu_monitor_json.h | 3 +- tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 2 + tools/virsh-completer-domain.c | 17 ++++++ tools/virsh-completer-domain.h | 4 ++ tools/virsh-domain.c | 42 ++++++++++++- tools/virsh-domain.h | 9 +++ 28 files changed, 294 insertions(+), 38 deletions(-) -- 1.8.3.1

1 9

[PULL 0/3] Block patches
by Stefan Hajnoczi 15 Feb '22

15 Feb '22

The following changes since commit cc5ce8b8b6be83e5fe3b668dbd061ad97c534e3f: Merge remote-tracking branch 'remotes/legoater/tags/pull-ppc-20220210' into staging (2022-02-13 20:33:28 +0000) are available in the Git repository at: https://gitlab.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 4c41c69e05fe28c0f95f8abd2ebf407e95a4f04b: util: adjust coroutine pool size to virtio block queue (2022-02-14 17:11:25 +0000) ---------------------------------------------------------------- Pull request This contains coroutine poll size scaling, virtiofsd rseq seccomp for new glibc versions, and the QEMU C virtiofsd deprecation notice. ---------------------------------------------------------------- Christian Ehrhardt (1): tools/virtiofsd: Add rseq syscall to the seccomp allowlist Dr. David Alan Gilbert (1): Deprecate C virtiofsd Hiroki Narukawa (1): util: adjust coroutine pool size to virtio block queue docs/about/deprecated.rst | 17 +++++++++++++++++ include/qemu/coroutine.h | 10 ++++++++++ hw/block/virtio-blk.c | 5 +++++ tools/virtiofsd/passthrough_seccomp.c | 3 +++ util/qemu-coroutine.c | 20 ++++++++++++++++---- 5 files changed, 51 insertions(+), 4 deletions(-) -- 2.34.1

2 1

[PATCH] openrc: Make init scripts executable on install
by Michal Privoznik 15 Feb '22

15 Feb '22

When installing openrc init scripts, we take whatever mode the generated files are in an copy them under /etc/init.d/. This is not ideal, because those files are not executable and they should be. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/250 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/meson.build b/src/meson.build index 3890df7124..b2d951d36c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -848,6 +848,7 @@ if conf.has('WITH_LIBVIRTD') install_data( init_file, install_dir: sysconfdir / 'init.d', + install_mode: 'rwxr-xr-x', rename: [ init['name'] ], ) -- 2.34.1

3 2

[PATCH] tests: Drop domcaps test data for qemu < 2.11
by Michal Privoznik 15 Feb '22

15 Feb '22

The minimal supported version of QEMU is 2.11. And after capabilities for older QEMUs were dropped in v7.3.0-17-g184de10c1d we have some domaincapsdata/ files that are never read. This is because domaincapstest uses testQemuCapsIterate() which iterates over qemucapabilitiesdata/caps_*.xml files. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 151 -------------- .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 147 -------------- tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 151 -------------- .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 151 -------------- .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 147 -------------- tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 151 -------------- .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 151 -------------- .../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 147 -------------- .../qemu_2.6.0-virt.aarch64.xml | 149 -------------- tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 143 ------------- tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 116 ----------- tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 151 -------------- .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 152 -------------- .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 148 -------------- tests/domaincapsdata/qemu_2.7.0.s390x.xml | 108 ---------- tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 152 -------------- .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 152 -------------- .../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 148 -------------- tests/domaincapsdata/qemu_2.8.0.s390x.xml | 189 ----------------- tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 152 -------------- .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 166 --------------- .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 185 ----------------- tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 116 ----------- tests/domaincapsdata/qemu_2.9.0.s390x.xml | 190 ------------------ tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 166 --------------- 25 files changed, 3779 deletions(-) delete mode 100644 tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.4.0.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.5.0.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml delete mode 100644 tests/domaincapsdata/qemu_2.6.0.aarch64.xml delete mode 100644 tests/domaincapsdata/qemu_2.6.0.ppc64.xml delete mode 100644 tests/domaincapsdata/qemu_2.6.0.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.7.0.s390x.xml delete mode 100644 tests/domaincapsdata/qemu_2.7.0.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.8.0.s390x.xml delete mode 100644 tests/domaincapsdata/qemu_2.8.0.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml delete mode 100644 tests/domaincapsdata/qemu_2.9.0.ppc64.xml delete mode 100644 tests/domaincapsdata/qemu_2.9.0.s390x.xml delete mode 100644 tests/domaincapsdata/qemu_2.9.0.x86_64.xml diff --git a/tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml deleted file mode 100644 index 3ae03de391..0000000000 diff --git a/tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml deleted file mode 100644 index 461cc4c102..0000000000 diff --git a/tests/domaincapsdata/qemu_2.4.0.x86_64.xml b/tests/domaincapsdata/qemu_2.4.0.x86_64.xml deleted file mode 100644 index e1af5b6622..0000000000 diff --git a/tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml deleted file mode 100644 index f46991ca27..0000000000 diff --git a/tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml deleted file mode 100644 index 82edcbfac6..0000000000 diff --git a/tests/domaincapsdata/qemu_2.5.0.x86_64.xml b/tests/domaincapsdata/qemu_2.5.0.x86_64.xml deleted file mode 100644 index 57f9f9b41b..0000000000 diff --git a/tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml deleted file mode 100644 index 8bcd8f92ab..0000000000 diff --git a/tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml deleted file mode 100644 index 2a7b46f775..0000000000 diff --git a/tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml deleted file mode 100644 index 14cab3f557..0000000000 diff --git a/tests/domaincapsdata/qemu_2.6.0.aarch64.xml b/tests/domaincapsdata/qemu_2.6.0.aarch64.xml deleted file mode 100644 index f84e648a15..0000000000 diff --git a/tests/domaincapsdata/qemu_2.6.0.ppc64.xml b/tests/domaincapsdata/qemu_2.6.0.ppc64.xml deleted file mode 100644 index 7f9372a359..0000000000 diff --git a/tests/domaincapsdata/qemu_2.6.0.x86_64.xml b/tests/domaincapsdata/qemu_2.6.0.x86_64.xml deleted file mode 100644 index 4eeec1a22b..0000000000 diff --git a/tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml deleted file mode 100644 index 537941561b..0000000000 diff --git a/tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml deleted file mode 100644 index 79f5fba212..0000000000 diff --git a/tests/domaincapsdata/qemu_2.7.0.s390x.xml b/tests/domaincapsdata/qemu_2.7.0.s390x.xml deleted file mode 100644 index f76564a9bc..0000000000 diff --git a/tests/domaincapsdata/qemu_2.7.0.x86_64.xml b/tests/domaincapsdata/qemu_2.7.0.x86_64.xml deleted file mode 100644 index 1dd19dfc37..0000000000 diff --git a/tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml deleted file mode 100644 index e0bb1b1eee..0000000000 diff --git a/tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml deleted file mode 100644 index 1829fbda60..0000000000 diff --git a/tests/domaincapsdata/qemu_2.8.0.s390x.xml b/tests/domaincapsdata/qemu_2.8.0.s390x.xml deleted file mode 100644 index 2c075d7cdb..0000000000 diff --git a/tests/domaincapsdata/qemu_2.8.0.x86_64.xml b/tests/domaincapsdata/qemu_2.8.0.x86_64.xml deleted file mode 100644 index 5f55b0730d..0000000000 diff --git a/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml deleted file mode 100644 index 797b970040..0000000000 diff --git a/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml deleted file mode 100644 index b47c426f1b..0000000000 diff --git a/tests/domaincapsdata/qemu_2.9.0.ppc64.xml b/tests/domaincapsdata/qemu_2.9.0.ppc64.xml deleted file mode 100644 index 2523d6ec6b..0000000000 diff --git a/tests/domaincapsdata/qemu_2.9.0.s390x.xml b/tests/domaincapsdata/qemu_2.9.0.s390x.xml deleted file mode 100644 index d5b58a786d..0000000000 diff --git a/tests/domaincapsdata/qemu_2.9.0.x86_64.xml b/tests/domaincapsdata/qemu_2.9.0.x86_64.xml deleted file mode 100644 index 7716e9d381..0000000000 -- 2.34.1

2 1

[libvirt PATCH] Make systemd unit ordering more robust
by Martin Kletzander 15 Feb '22

15 Feb '22

Since libvirt-guests script/service can operate on various URIs and we do support both socket activation and traditional services, the ordering should be specified for all the possible sockets and services. Also remove the Wants= dependency since do not want to start any service. We cannot know which one libvirt-guests is configured, so we'd have to start all the daemons which would break if unused colliding services are not masked (libvirtd.service in the modular case and all the modular daemon service units in the monolithic scenario). Fortunately we can assume that the system is configured properly to start services/sockets that are of interest to the user. That also works with the setup described in https://libvirt.org/daemons.html . To make it even more robust we add the daemon service into the machine units created for individual domains as it was missing there. https://bugzilla.redhat.com/show_bug.cgi?id=1868537 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virsystemd.c | 4 ++++ tools/libvirt-guests.service.in | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index a86d4c6bb905..2d9711ad41b6 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -441,7 +441,9 @@ int virSystemdCreateMachine(const char *name, nicindexes, nnicindexes, sizeof(int)); gprops = g_variant_new_parsed("[('Slice', <%s>)," " ('After', <['libvirtd.service']>)," + " ('After', <['virt%sd.service']>)," " ('Before', <['virt-guest-shutdown.target']>)]", + drivername, slicename); message = g_variant_new("(s@ayssus@ai@a(sv))", name, @@ -489,7 +491,9 @@ int virSystemdCreateMachine(const char *name, uuid, 16, sizeof(unsigned char)); gprops = g_variant_new_parsed("[('Slice', <%s>)," " ('After', <['libvirtd.service']>)," + " ('After', <['virt%sd.service']>)," " ('Before', <['virt-guest-shutdown.target']>)]", + drivername, slicename); message = g_variant_new("(s@ayssus@a(sv))", name, diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index 1a9b233e1177..3cf647619612 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -1,10 +1,20 @@ [Unit] Description=Suspend/Resume Running libvirt Guests -Wants=libvirtd.service Requires=virt-guest-shutdown.target After=network.target After=time-sync.target +After=libvirtd.socket +After=virtqemud.socket +After=virtlxcd.socket +After=virtvboxd.socket +After=virtvzd.socket +After=virtxend.socket After=libvirtd.service +After=virtqemud.service +After=virtlxcd.service +After=virtvboxd.service +After=virtvzd.service +After=virtxend.service After=virt-guest-shutdown.target Documentation=man:libvirt-guests(8) Documentation=https://libvirt.org -- 2.35.1

2 1

[PATCH 0/5] Introduce 'virDomainQemuMonitorCommandWithFiles'
by Peter Krempa 15 Feb '22

15 Feb '22

I needed to do some tests where I wanted to pass FDs to qemu to see how 'add-fd' and 'getfd' behave. It may be useful for others who wish for any reason to pass FDs to QMP commands. Peter Krempa (5): lib: Introduce 'virDomainQemuMonitorCommandWithFiles' cmdStartGetFDs: Modernize virsh-domain: Move and rename cmdStartGetFDs to virshFetchPassFdsList virsh: Implement support for virDomainQemuMonitorCommandWithFiles qemu: Implement qemuDomainQemuMonitorCommandWithFiles docs/manpages/virsh.rst | 6 +- include/libvirt/libvirt-qemu.h | 6 ++ src/driver-hypervisor.h | 8 +++ src/libvirt-qemu.c | 71 ++++++++++++++++++ src/libvirt_qemu.syms | 5 ++ src/qemu/qemu_driver.c | 34 +++++++-- src/qemu/qemu_monitor.c | 7 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 6 +- src/qemu/qemu_monitor_json.h | 2 + src/qemu/qemu_monitor_text.c | 8 +-- src/qemu_protocol-structs | 9 +++ src/remote/qemu_protocol.x | 20 +++++- src/remote/remote_daemon_dispatch.c | 42 +++++++++++ src/remote/remote_driver.c | 40 +++++++++++ tools/virsh-domain.c | 108 ++++++++++++++++------------ 16 files changed, 313 insertions(+), 60 deletions(-) -- 2.34.1

3 10

[PATCH v2 0/3] src: use virDomainJobData
by Kristina Hanicova 15 Feb '22

15 Feb '22

v1 is here: https://listman.redhat.com/archives/libvir-list/2022-January/msg00958.html diff to v1: * rebase onto the current master (bellow are the ones suggested by Jirka, thanks) * removed check if callbacks exists when cb struct exists * renamed functions from qemuDomainJobInfoX to qemuDomainJobDataX * moved qemuDomainJobSetStatsType to qemu_domainjob.c, dropped "Private" from the name and changed the prototype to take virDomainJobData* I did not move qemuDomainJobDataUpdateTime to domain_job.c as Jirka suggested, because I plan to move more functions to domain_job.c in the next series. Stay tuned. Kristina Hanicova (3): qemu: use generalized virDomainJobData instead of qemuDomainJobInfo qemu: make separate function for setting statsType of privateData libxl: use virDomainJobData instead of virDomainJobInfo src/hypervisor/domain_job.c | 78 ++++++++++ src/hypervisor/domain_job.h | 72 ++++++++++ src/hypervisor/meson.build | 1 + src/libvirt_private.syms | 7 + src/libxl/libxl_domain.c | 10 +- src/libxl/libxl_domain.h | 3 +- src/libxl/libxl_driver.c | 14 +- src/qemu/qemu_backup.c | 42 +++--- src/qemu/qemu_backup.h | 4 +- src/qemu/qemu_domainjob.c | 237 ++++++++++++++++--------------- src/qemu/qemu_domainjob.h | 57 ++------ src/qemu/qemu_driver.c | 111 ++++++++------- src/qemu/qemu_migration.c | 189 ++++++++++++------------ src/qemu/qemu_migration.h | 4 +- src/qemu/qemu_migration_cookie.c | 60 ++++---- src/qemu/qemu_migration_cookie.h | 2 +- src/qemu/qemu_process.c | 23 +-- src/qemu/qemu_snapshot.c | 3 +- 18 files changed, 544 insertions(+), 373 deletions(-) create mode 100644 src/hypervisor/domain_job.c create mode 100644 src/hypervisor/domain_job.h -- 2.34.1

2 4

[libvirt PATCH 00/11] virnetclient: Cleanups and improvement
by Andrea Bolognani 14 Feb '22

14 Feb '22

I initially started looking into this because of https://gitlab.com/libvirt/libvirt/-/issues/273 I have now convinced myself that we don't need to change the way we quote things, but in the process I have accumulated several improvements and one bug fix. Andrea Bolognani (11): virbuftest: Increase coverage virbuffer: Simplify virBufferEscapeShell() virnetsockettest: Drop unnecessary backslash virnetsockettest: Move opening quote virnetsockettest: Improve indentation virnetclient: Improve spacing of ssh script virnetclient: Use 'if' consistently virnetsockettest: Tweak input for test 7 virnetsockettest: Allow changing the proxy parameter virnetsockettest: Increase coverage virnetclient: Escape socket path src/rpc/virnetclient.c | 20 +++--- src/util/virbuffer.c | 17 ++--- tests/virbuftest.c | 9 ++- tests/virnetsockettest.c | 149 ++++++++++++++++++++++++++++----------- 4 files changed, 133 insertions(+), 62 deletions(-) -- 2.34.1

3 21

[PATCH 0/3] ci: regenerate wit new lcitool and replace centos 8
by Peter Krempa 14 Feb '22

14 Feb '22

Centos-8 was killed off, so lcitool suggests using AlmaLinux 8 as a replacement. Re-generate the manifests with new lcitool. Pipeline with these patches: https://gitlab.com/pipo.sk/libvirt/-/pipelines/470699381 Peter Krempa (3): ci: Regenerate with new lcitool ci: Move from 'centos-8' to 'almalinux-8' ci: Regenerate with new lcitool .gitlab-ci.yml | 6 +- ...os-8.Dockerfile => almalinux-8.Dockerfile} | 2 +- ci/containers/centos-stream-9.Dockerfile | 3 + .../debian-10-cross-aarch64.Dockerfile | 3 +- .../debian-10-cross-armv6l.Dockerfile | 3 +- .../debian-10-cross-armv7l.Dockerfile | 3 +- ci/containers/debian-10-cross-i686.Dockerfile | 3 +- ci/containers/debian-10-cross-mips.Dockerfile | 3 +- .../debian-10-cross-mips64el.Dockerfile | 3 +- .../debian-10-cross-mipsel.Dockerfile | 3 +- .../debian-10-cross-ppc64le.Dockerfile | 3 +- .../debian-10-cross-s390x.Dockerfile | 3 +- ci/containers/debian-10.Dockerfile | 3 +- ci/containers/opensuse-leap-152.Dockerfile | 3 +- ci/containers/ubuntu-1804.Dockerfile | 3 +- ci/containers/ubuntu-2004.Dockerfile | 3 +- ci/gitlab.yml | 74 ++++++++++--------- ci/manifest.yml | 2 +- 18 files changed, 59 insertions(+), 67 deletions(-) rename ci/containers/{centos-8.Dockerfile => almalinux-8.Dockerfile} (98%) -- 2.34.1

2 6

[libvirt PATCH v2 0/6] virnetclient: Cleanups and improvements
by Andrea Bolognani 14 Feb '22

14 Feb '22

Changes from [v1]: * most patches have been pushed; * reduce quoting for most users by only using it when it's actually necessary to do so. [v1] https://listman.redhat.com/archives/libvir-list/2022-February/msg00477.html Andrea Bolognani (6): virnetclient: Improve spacing of ssh script virnetclient: Use 'if' consistently virnetclient: Handle netcatPath presence all at once virnetclient: Don't unnecessarily quote user-provided values virnetsockettest: Test more socket paths virnetclient: Escape socket path src/rpc/virnetclient.c | 78 +++++++++++++++++++------------ tests/virnetsockettest.c | 99 ++++++++++++++++++++-------------------- 2 files changed, 99 insertions(+), 78 deletions(-) -- 2.35.1

2 7

[PATCH 0/6] qemu: Clean up monitor structs and assume QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE in the hotplug test
by Peter Krempa 14 Feb '22

14 Feb '22

qemu-2.11 is the last one which couldn't do FD passing of unix listening sockets. Since it's approaching time to remove the support for such old version we need to make sure that some tests don't break. Peter Krempa (6): qemu: monitor: Drop old monitor fields from 'struct _qemuMonitorMessage' qemu: Privatize 'struct _qemuMonitorMessage' qemu: monitor: Move declaration of struct _qemuMonitor to qemu_monitor_priv.h syntax-check: sc_avoid_write: Don't use blanket file exceptions qemuhotplugmock: Mock fd passing to qemu via 'SCM_RIGHTS' qemuhotplugtest: Assume QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE build-aux/syntax-check.mk | 6 +-- src/locking/lock_daemon.c | 4 +- src/logging/log_daemon.c | 4 +- src/lxc/lxc_controller.c | 2 +- src/qemu/qemu_monitor.c | 54 +----------------------- src/qemu/qemu_monitor.h | 19 --------- src/qemu/qemu_monitor_json.c | 3 ++ src/qemu/qemu_monitor_priv.h | 77 ++++++++++++++++++++++++++++++++++ src/remote/remote_ssh_helper.c | 2 +- src/rpc/virnetsocket.c | 4 +- src/util/vircommand.c | 4 +- src/util/virfdstream.c | 2 +- src/util/virfile.c | 10 ++--- tests/qemucapsprobemock.c | 3 ++ tests/qemuhotplugmock.c | 14 +++++++ tests/qemuhotplugtest.c | 3 ++ tests/shunloadtest.c | 2 +- tests/vircgroupmock.c | 2 +- tests/virnettlssessiontest.c | 2 +- tools/virsh-console.c | 2 +- 20 files changed, 124 insertions(+), 95 deletions(-) -- 2.34.1

2 9