- Devel - libvirt List Archives

[PATCH] NEWS: Add new launch security type s390-pv
by Boris Fiuczynski 28 Jul '21

28 Jul '21

Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Reviewed-by: Viktor Mihajlovski <mihajlov(a)linux.ibm.com> --- NEWS.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 618f478b81..134444b287 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -28,6 +28,14 @@ v7.6.0 (unreleased) block tracking features (block-dirty-bitmaps) to be able to do incremental backups and management of the checkpoint states via the appropriate APIs. + * qemu: Add support for launch security type s390-pv + + Specifying s390-pv as launch security type in an s390 domain prepares for + running the guest in protected virtualization secure mode, also known as + IBM Secure Execution. This simplifies the definition and reduces the risk + of an incorrect definition, e.g. by forgetting to specify iommu=on on all + virtio devices. + * **Improvements** * **Bug fixes** -- 2.31.1

2 1

[libvirt][PATCH v4 0/4] Support query and use SGX
by Haibin Huang 28 Jul '21

28 Jul '21

This patch series provides support for enabling Intel's Software Guard Extensions (SGX) feature in guest VM. Giving the SGX support in QEMU is still pending for reviewing, this patch series is not submmited for code review, but only describe the SGX enabling solution design that contains changes to virConnectGetDomainCapabilities API response and domain definition. All comments/suggestions would be highly appreciated. Intel Software Guard Extensions (Intel® SGX) is a set of instructions that increases the security of application code and data, giving them more protection from disclosure or modification. Developers can partition sensitive information into enclaves, which are areas of execution in memory with more security protection. The typical flow looks below at very high level: 1. Calls virConnectGetDomainCapabilities API to domain capabilities that includes the following SGX information. <feature> ... <sgx supported='yes'> <epc_size unit=’KiB’>N</epc_size> </sgx> </feature> 2. User requests to start a guest calling virCreateXML() with SGX requirement. It should contain <launchSecurity type='sgx'> <epc_size unit='KiB'>N</epc_size> </launchSecurity> Haibin Huang (1): Support to query SGX capability Lin Yang (3): conf: Introduce SGX related element into domain xml qemu: Add command-line to generate SGX EPC memory backend qemu: Add command-line to enable SGX src/conf/domain_capabilities.c | 29 ++++ src/conf/domain_capabilities.h | 13 ++ src/conf/domain_conf.c | 106 +++++++++---- src/conf/domain_conf.h | 10 ++ src/conf/virconftypes.h | 3 + src/libvirt_private.syms | 2 +- src/qemu/qemu_capabilities.c | 146 ++++++++++++++++++ src/qemu/qemu_capabilities.h | 6 + src/qemu/qemu_command.c | 30 ++++ src/qemu/qemu_monitor.c | 10 ++ src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 91 +++++++++++ src/qemu/qemu_monitor_json.h | 3 + tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsdata/empty.xml | 1 + tests/domaincapsdata/libxl-xenfv.xml | 1 + tests/domaincapsdata/libxl-xenpv.xml | 1 + .../domaincapsdata/qemu_1.5.3-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.5.3-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.5.3.x86_64.xml | 1 + .../domaincapsdata/qemu_1.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.6.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_1.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.1.1-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.1.1-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.1.1.x86_64.xml | 1 + .../domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 1 + .../qemu_2.10.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 + .../qemu_4.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + 109 files changed, 519 insertions(+), 29 deletions(-) -- 2.17.1

5 25

Turning off -Werror
by Richard W.M. Jones 28 Jul '21

28 Jul '21

commit 3c3c55be66e230ef09ad927eda038dc32f01a166 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Thu Apr 8 11:50:30 2021 +0100 meson: don't probe for -Werror if --werror is enabled Builds are failing in Fedora Rawhide at the moment because of a warning being turned into an error. Fedora's spec file has this which is supposed to turn off -Werror, but it no longer works after the above commit was added. https://src.fedoraproject.org/rpms/libvirt/blob/rawhide/f/libvirt.spec#_189 I'm trying to understand how you're supposed to turn off -Werror. According to meson documentation omitting --werror should work. According to some different docs, use --werror=false. Neither are working for me. I'm actually wondering if the commit above is wrong. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top

2 2

[PATCH 0/2] qemu: block: Pass discard requests through the copy-on-read block filter (for 7.6?)
by Peter Krempa 28 Jul '21

28 Jul '21

See 1/2 Peter Krempa (2): qemu: block: Pass discard requests through the copy-on-read block filter NEWS: Mention fix for 'copy_on_read' disks with trimming enabled NEWS.rst | 6 ++++++ src/qemu/qemu_block.c | 1 + tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) -- 2.31.1

4 6

[RFC PATCH v2 0/8] LIBVIRT: X86: TDX support
by Zhenzhong Duan 28 Jul '21

28 Jul '21

Thanks Peter, Pavel and Daniel's comments on v1 version, now the v2 comes. * What's TDX? TDX stands for Trust Domain Extensions which isolates VMs from the virtual-machine manager (VMM)/hypervisor and any other software on the platform. To support TDX, multiple software components, not only KVM but also QEMU, guest Linux and virtual bios, need to be updated. For more details, please check link[1], there are TDX spec links and public repository link at github for each software component. This patchset is another software component to extend libvirt to support TDX, with which one can start a VM from high level rather than running qemu directly. * The goal of this RFC patch The purpose of this post is to get feedback early on high level design issue of libvirt enhancement for TDX. Referenced much on AMD SEV and S390 PV implemention at link[2][3]. This 2nd version is rebased on upstream + s390 v4 version as shown in [3] to utilize the common launchsecurity framework code. * Patch organization - patch 1-3: Support query of TDX capabilities. - patch 4-6: Add TDX type to launchsecurity framework. - patch 7: Add general loader support for TDX. - patch 8: Add firmware descriptor support for TDX. * Misc Just let you know we have released v2 version of TDX qemu in [1], and the API for libvirt is keeping stable. Using these patches we have succesfully booted and tested a guest both with and without TDX enabled. * Diff to v1: - give up using qmp cmd and check TDX directly on host for TDX capabilities. - use launchsecurity framework to support TDX - use <os>.<loader> for general loader - add auto firmware match feature for TDX A example TDVF fimware description file 70-edk2-x86_64-tdx.json: { "description": "UEFI firmware for x86_64, supporting Intel TDX", "interface-types": [ "uefi" ], "mapping": { "device": "generic", "filename": "/usr/share/OVMF/OVMF_CODE-tdx.fd" }, "targets": [ { "architecture": "x86_64", "machines": [ "pc-q35-*" ] } ], "features": [ "intel-tdx", "verbose-dynamic" ], "tags": [ ] } Links: [1] https://lists.nongnu.org/archive/html/qemu-devel/2021-07/msg01682.html [2] https://github.com/codomania/libvirt/commits/v9 [3] https://www.mail-archive.com/libvir-list@redhat.com/msg219144.html Zhenzhong Duan (8): qemu: Check if INTEL Trust Domain Extention support is enabled qemu: Add TDX capability conf: expose TDX feature in domain capabilities conf: add tdx as launch security type qemu: Add command line and validation for TDX type qemu: force special parameters enabled for TDX guest qemu: Add general loader support qemu: Add firmware descriptor support for TDX docs/formatdomaincaps.html.in | 17 ++++++ docs/schemas/domaincaps.rng | 9 +++ docs/schemas/domaincommon.rng | 18 ++++++ src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 49 ++++++++++++++++ src/conf/domain_conf.h | 11 ++++ src/conf/virconftypes.h | 2 + src/qemu/qemu_capabilities.c | 44 ++++++++++++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 38 +++++++++++++ src/qemu/qemu_firmware.c | 100 ++++++++++++++++++++++++++++++++- src/qemu/qemu_namespace.c | 2 + src/qemu/qemu_process.c | 1 + src/qemu/qemu_validate.c | 28 +++++++++ 15 files changed, 319 insertions(+), 3 deletions(-) -- 2.25.1

3 12

[PATCH v4 0/3] domstats:add haltpolling time statistic interface
by Yang Fei 27 Jul '21

27 Jul '21

This series add the ability to statistic the halt polling time when VM execute HLT(arm is WFI). v1: https://listman.redhat.com/archives/libvir-list/2021-July/msg00029.html v2: https://listman.redhat.com/archives/libvir-list/2021-July/msg00339.html v3: https://listman.redhat.com/archives/libvir-list/2021-July/msg00445.html changes from v1: - Move virGetCgroupValueRaw to utils.c and rename it virGetValueRaw. So that we can call it to obtain halt polling time. - Helper function virGetCpuHaltPollTime and virGetDebugFsKvmValue are added in a separate patch - Use STRPREFIX to match the path prefix. - Fix the logic that domstats will break when platform is non-linux, debugfs isn't mounted and so on. change from v2: - Drop patch 1, use virFileReadValueUllong() to get halt polling data. - Delete unnecessary error report in logs. - Remove the qemuDomainGetStatsCpuHaltPollTime function conditionally compiled on linux. - Document the new parameters in src/libvirt-domain.c. change from v3: - Add function virFileReadValueUllongQuiet without error report. - Move virGetCpuHaltPollTime to src/util/virhostcpu.c and change the name to virHostCPUGetHaltPollTime. - Replace the function which will report errors: virDirOpenIfExists -> virDirOpenQuiet virFileReadValueUllong -> virFileReadValueUllongQuiet Yang Fei (3): util: Add virFileReadValueUllongQuiet util: Add virHostCPUGetHaltPollTime qemu: Introduce qemuDomainGetStatsCpuHaltPollTime docs/manpages/virsh.rst | 4 ++++ src/libvirt-domain.c | 7 +++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 20 ++++++++++++++++++++ src/util/virfile.c | 24 ++++++++++++++++++++++++ src/util/virfile.h | 2 ++ src/util/virhostcpu.c | 39 +++++++++++++++++++++++++++++++++++++++ src/util/virhostcpu.h | 4 ++++ 8 files changed, 102 insertions(+) -- 2.23.0

2 9

[PATCH 0/3] NEWS updates for 7.6
by Peter Krempa 27 Jul '21

27 Jul '21

Peter Krempa (3): NEWS: Use 'code' style for constant names in entry for recent migration fix NEWS: Mention security bug in storage pool object lookup (CVE-2021-3667) NEWS: Mention change to VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD NEWS.rst | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) -- 2.31.1

2 4

[PATCH] storage_driver: Unlock object on ACL fail in storagePoolLookupByTargetPath
by Peter Krempa 27 Jul '21

27 Jul '21

'virStoragePoolObjListSearch' returns a locked and refed object, thus we must release it on ACL permission failure. Fixes: 7aa0e8c0cb8 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984318 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Technically a security issue since it DoS-es the objects a user doesn't have access to for users which do have access. Posting to standard devel list since the bugzilla above is public. src/storage/storage_driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index c2ff4b8d06..6aa10d89f6 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1738,8 +1738,10 @@ storagePoolLookupByTargetPath(virConnectPtr conn, storagePoolLookupByTargetPathCallback, cleanpath))) { def = virStoragePoolObjGetDef(obj); - if (virStoragePoolLookupByTargetPathEnsureACL(conn, def) < 0) + if (virStoragePoolLookupByTargetPathEnsureACL(conn, def) < 0) { + virStoragePoolObjEndAPI(&obj); return NULL; + } pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); virStoragePoolObjEndAPI(&obj); -- 2.31.1

3 4

[libvirt PATCH] schema: make target mandatory for filesystems
by Ján Tomko 27 Jul '21

27 Jul '21

Commit 12967c3e13 incorrectly made the target optional. The validation was re-introduced by commit e8863b91f (which put it into FSDefValidate instead of the parser), but it did not amend the schema to make it mandatory again. https://bugzilla.redhat.com/show_bug.cgi?id=1969232 Fixes: e8863b91fb98f077d4c44a11bd7ea84c5e6b29ef Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/schemas/domaincommon.rng | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 14c5d4ee68..2442078969 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2859,12 +2859,10 @@ </group> </choice> <interleave> - <optional> - <element name="target"> - <attribute name="dir"/> - <empty/> - </element> - </optional> + <element name="target"> + <attribute name="dir"/> + <empty/> + </element> <optional> <attribute name="accessmode"> <choice> -- 2.31.1

2 1

[libvirt RFC PATCH 0/2] domxml-to-native: lower users' expectations
by Ján Tomko 27 Jul '21

27 Jul '21

We do not support some configs that assume fd passing. Add a disclaimer to the API and the virsh command, and a bit frendlier error message to the vsock command line generator. (Alternatively, we could fill in some random values for the file descriptor numbers, just to give the user an idea what the command line would look like. But this still won't give them a functional equivalent of the command line. Which is not possible in all cases anyway) Ján Tomko (2): domxml-to-native: add disclaimer about fd passing qemu: error out if vsock does not have a pre-opened file descriptor docs/manpages/virsh.rst | 2 ++ src/libvirt-domain.c | 3 +++ src/qemu/qemu_command.c | 6 ++++++ 3 files changed, 11 insertions(+) -- 2.31.1

2 3

[libvirt PATCH 0/4] RFC: tests: introduce lavocado
by Beraldo Leal 27 Jul '21

27 Jul '21

lavocado aims to be an alternative test framework for the libvirt project using Python, python-libvirt and Avocado. This can be used to write unit, functional and integration tests and it is inspired by the libvirt-tck framework. This series introduces the basic framework along with some basic test examples that I got from libvirt-tck. I would appreciate your comments on this RFC, to see if this fits this project's needs. Also, names and locations are just a proposal and can be changed. For now, this framework assumes that you are going to run the tests in a fresh clean environment, i.e. a VM. If you decide to use your local system, beware that execution of the tests may affect your system. One of the future goals of this framework is to utilize nested virtualization technologies and hence make sure an L1 guest is provisioned automatically for the tests to be executed in this environment and not tamper with your main system. I'm adding more information with some details inside the README file. Beraldo Leal (4): tests: introduce lavocado: initial code structure tests.lavocado: adding basic transient domain tests tests.lavocado: adding a .gitignore tests.lavocado: adding a README and Makefile for convenience tests/lavocado/.gitignore | 3 + tests/lavocado/Makefile | 2 + tests/lavocado/README.md | 124 +++++++++++++++++ tests/lavocado/lavocado/__init__.py | 0 tests/lavocado/lavocado/defaults.py | 11 ++ tests/lavocado/lavocado/exceptions.py | 20 +++ tests/lavocado/lavocado/helpers/__init__.py | 0 tests/lavocado/lavocado/helpers/domains.py | 75 ++++++++++ tests/lavocado/lavocado/test.py | 144 ++++++++++++++++++++ tests/lavocado/requirements.txt | 3 + tests/lavocado/templates/domain.xml.jinja | 20 +++ tests/lavocado/tests/domain/transient.py | 102 ++++++++++++++ 12 files changed, 504 insertions(+) create mode 100644 tests/lavocado/.gitignore create mode 100644 tests/lavocado/Makefile create mode 100644 tests/lavocado/README.md create mode 100644 tests/lavocado/lavocado/__init__.py create mode 100644 tests/lavocado/lavocado/defaults.py create mode 100644 tests/lavocado/lavocado/exceptions.py create mode 100644 tests/lavocado/lavocado/helpers/__init__.py create mode 100644 tests/lavocado/lavocado/helpers/domains.py create mode 100644 tests/lavocado/lavocado/test.py create mode 100644 tests/lavocado/requirements.txt create mode 100644 tests/lavocado/templates/domain.xml.jinja create mode 100644 tests/lavocado/tests/domain/transient.py -- 2.26.3

4 25

[libvirt PATCH 0/3] qemu: Allow pcie-expander-bus for aarch64/virt guests
by Andrea Bolognani 27 Jul '21

27 Jul '21

Andrea Bolognani (3): tests: Add capabilities for QEMU 6.0 on aarch64 qemu: Allow pcie-expander-bus for aarch64/virt guests tests: Test pcie-expander-bus for aarch64/virt guests src/qemu/qemu_domain.c | 6 +- .../qemu_6.0.0-virt.aarch64.xml | 182 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 176 + .../caps_6.0.0.aarch64.replies | 27539 ++++++++++++++++ .../caps_6.0.0.aarch64.xml | 532 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 4 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 4 +- .../aarch64-features-sve.aarch64-latest.args | 4 +- ...arch64-os-firmware-efi.aarch64-latest.args | 4 +- .../aarch64-tpm.aarch64-latest.args | 4 +- .../aarch64-virt-graphics.aarch64-latest.args | 6 +- .../aarch64-virt-headless.aarch64-latest.args | 6 +- .../clock-timer-armvtimer.aarch64-latest.args | 4 +- ...ult-video-type-aarch64.aarch64-latest.args | 4 +- .../disk-arm-virtio-sd.aarch64-latest.args | 4 +- .../iommu-smmuv3.aarch64-latest.args | 4 +- ...e-expander-bus-aarch64.aarch64-latest.args | 32 + .../pcie-expander-bus-aarch64.xml | 15 + .../pcie-expander-bus-bad-machine.err | 2 +- tests/qemuxml2argvtest.c | 1 + ...ie-expander-bus-aarch64.aarch64-latest.xml | 32 + tests/qemuxml2xmltest.c | 1 + 22 files changed, 28538 insertions(+), 28 deletions(-) create mode 100644 tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_6.0.0.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus-aarch64.xml create mode 100644 tests/qemuxml2xmloutdata/pcie-expander-bus-aarch64.aarch64-latest.xml -- 2.31.1

2 4

[libvirt PATCH] qemu: monitor: remove destroy callback
by Ján Tomko 26 Jul '21

26 Jul '21

It was added by commit c2121602 and later removed by 5a4c2374a Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_monitor.c | 2 -- src/qemu/qemu_monitor.h | 1 - 2 files changed, 3 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6e2d8010c5..5d7b686136 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -233,8 +233,6 @@ qemuMonitorDispose(void *obj) VIR_DEBUG("mon=%p", mon); qemuMonitorDisposed = true; - if (mon->cb && mon->cb->destroy) - (mon->cb->destroy)(mon, mon->vm, mon->callbackOpaque); virObjectUnref(mon->vm); g_main_context_unref(mon->context); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 1491c1297c..05ec228800 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -363,7 +363,6 @@ typedef void (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitor *mon, typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks; struct _qemuMonitorCallbacks { - qemuMonitorDestroyCallback destroy; qemuMonitorEofNotifyCallback eofNotify; qemuMonitorErrorNotifyCallback errorNotify; qemuMonitorDomainEventCallback domainEvent; -- 2.31.1

2 1

[PATCH 0/6] qemu: Add detection of 'blockdev-reopen'
by Peter Krempa 26 Jul '21

26 Jul '21

Note that the capability update patch is waiting for a series of fixes as current qemu master breaks with libvirt. Full version can be fetched from: git fetch https://gitlab.com/pipo.sk/libvirt.git blockdev-reopen Peter Krempa (6): tests: qemucapabilities: Update capabilities for qemu-6.1.0-rc0 on x86_64 qemuBlockReopenFormat: Extract @src handling and monitor invocation qemuBlockReopenFormatMon: Adapt to new argument format of 'blockdev-reopen' qemumonitorjsontest: Add test case for 'blockdev-reopen' qemu: capabilities: Enable detection of QEMU_CAPS_BLOCKDEV_REOPEN NEWS: Mention enablement of incremental backups NEWS.rst | 6 + src/qemu/qemu_block.c | 32 +- src/qemu/qemu_block.h | 5 + src/qemu/qemu_capabilities.c | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 2 +- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 2 +- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 2 +- .../caps_6.1.0.x86_64.replies | 4245 +++++++++-------- .../caps_6.1.0.x86_64.xml | 8 +- tests/qemumonitorjsontest.c | 28 + 10 files changed, 2312 insertions(+), 2019 deletions(-) -- 2.31.1

2 8

[PATCH] securityselinuxlabeltest: Add debug statements for testUserXattrEnabled return value
by Peter Krempa 26 Jul '21

26 Jul '21

I've noticed the test being skipped in my build scenario (tmpfs) and the output doesn't make it clear why it's happening. Add debug statements for the various return values of testUserXattrEnabled. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/securityselinuxlabeltest.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index b1a6735d33..f7dd3c866a 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -325,10 +325,15 @@ mymain(void) int rc = testUserXattrEnabled(); g_autoptr(virQEMUCaps) qemuCaps = NULL; - if (rc < 0) + if (rc < 0) { + VIR_TEST_VERBOSE("failed to determine xattr support"); return EXIT_FAILURE; - if (!rc) + } + + if (rc == 0) { + VIR_TEST_VERBOSE("xattr unsupported"); return EXIT_AM_SKIP; + } if (!(mgr = virSecurityManagerNew("selinux", "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED | -- 2.31.1

2 1

[PATCH] gitlab: let rawhide container builds fail
by Daniel P. Berrangé 26 Jul '21

26 Jul '21

The nature of Fedora rawhide means that it will inevitably have failures periodically. Currently it is failing to even update packages due to glibc switching to use of clone3 syscall, which is mistakenly blocked by seccomp in container runtimes using EPERM instead of ENOSYS. When we fail to build the rawhide containers, it is quite likely that we still have the previous build available in the gitlab registry, so it is reasonable to allow the container job to fail and try the build job anyway. Ideally we would ignore the container build failure if-and-only-if the previous container was build with the same list of packages. We don't record the original dependency package list though, so that's not currently possible. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4757139fa9..344ecdf3ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,7 +186,7 @@ x64-fedora-34-container: NAME: fedora-34 x64-fedora-rawhide-container: - extends: .container_job + extends: .container_optional_job variables: NAME: fedora-rawhide @@ -299,12 +299,12 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x mingw32-fedora-rawhide-container: - extends: .container_job + extends: .container_optional_job variables: NAME: fedora-rawhide-cross-mingw32 mingw64-fedora-rawhide-container: - extends: .container_job + extends: .container_optional_job variables: NAME: fedora-rawhide-cross-mingw64 -- 2.31.1

2 1

[libvirt PATCH] docs: Fix two spelling mistakes
by Tim Wiederhake 26 Jul '21

26 Jul '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- docs/kbase/qemu-core-dump.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/kbase/qemu-core-dump.rst b/docs/kbase/qemu-core-dump.rst index 44fd40fc52..5c3781cf90 100644 --- a/docs/kbase/qemu-core-dump.rst +++ b/docs/kbase/qemu-core-dump.rst @@ -11,7 +11,7 @@ QEMU driver configuration There is a global setting in the QEMU driver configuration file that controls whether core dumps are permitted, and their maximum size. Enabling core dumps -is simply a matter of setting the maximum size to a non-zero value by editting +is simply a matter of setting the maximum size to a non-zero value by editing the ``/etc/libvirt/qemu.conf`` file: :: @@ -65,7 +65,7 @@ machine basis in the XML configuration: <memory dumpCore="on">...</memory> -Note, it is still neccessary to at least set ``max_core`` to a non-zero +Note, it is still necessary to at least set ``max_core`` to a non-zero value in the global configuration file. Some management applications may not offer the ability to customimze the -- 2.31.1

2 1

[PATCH] qemu_vhost_user: don't raise error for unknown features
by Cole Robinson 26 Jul '21

26 Jul '21

Similar to what was done for qemu_firmware.c in 61d95a1073, don't report an error for unknown vhost-user features, just log it and correctly continue on Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_vhost_user.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index bc8e7ad898..75cc718c09 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -280,6 +280,7 @@ qemuVhostUserGPUFillCapabilities(qemuVhostUser *vu, qemuVhostUserGPU *gpu = &vu->capabilities.gpu; virJSONValue *featuresJSON; size_t nfeatures; + size_t nparsed = 0; size_t i; g_autoptr(qemuVhostUserGPUFeature) features = NULL; @@ -299,17 +300,16 @@ qemuVhostUserGPUFillCapabilities(qemuVhostUser *vu, int tmp; if ((tmp = qemuVhostUserGPUFeatureTypeFromString(tmpStr)) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown feature %s"), - tmpStr); + VIR_DEBUG("ignoring unknown QEMU vhost-user feature '%s'", tmpStr); continue; } - features[i] = tmp; + features[nparsed] = tmp; + nparsed++; } gpu->features = g_steal_pointer(&features); - gpu->nfeatures = nfeatures; + gpu->nfeatures = nparsed; return 0; } -- 2.31.1

2 1

[PATCH] qemu: process: Ignore 'RESET' event during startup
by Peter Krempa 26 Jul '21

26 Jul '21

In cases when we are adding a <transient/> disk with sharing backend (and thus hotplugging it) we need to re-initialize ACPI tables so that the VM boots from the correct device. This has a side-effect of emitting the RESET event and handling it which in case when the 'on_reset' policy is set to 'destroy' can even kill the VM. Fix this by ignoring RESET events during startup of the VM. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_process.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 521fda57da..d6ed4a3943 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -429,12 +429,20 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, void *opaque) { virQEMUDriver *driver = opaque; - virObjectEvent *event; + virObjectEvent *event = NULL; qemuDomainObjPrivate *priv; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); virObjectLock(vm); + /* ignore reset events on VM startup. Libvirt in certain instances does a + * reset during startup so that the ACPI tables are re-generated */ + if (vm->state.state == VIR_DOMAIN_PAUSED && + vm->state.reason == VIR_DOMAIN_PAUSED_STARTING_UP) { + VIR_DEBUG("ignoring reset event during startup"); + goto cleanup; + } + event = virDomainEventRebootNewFromObj(vm); priv = vm->privateData; if (priv->agent) -- 2.31.1

1 1

[PATCH 0/2] Another round of capng_apply() fixes
by Michal Privoznik 26 Jul '21

26 Jul '21

See 2/2 for explanation. Michal Prívozník (2): virSetUIDGIDWithCaps: Check for capng_apply() retval properly virSetUIDGIDWithCaps: Set bounding capabilities only with CAP_SETPCAP src/util/virutil.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.31.1

2 4

[libvirt PATCH v2] src: workaround warning triggered in glib 2.69
by Daniel P. Berrangé 23 Jul '21

23 Jul '21

Libvirt is using the G_GNUC_FALLTHROUGH macro provided by glib since version 2.60. Since we need to support older glib, we also have some compatibility code to define it if missing. We set the GLIB_VERSION_MAX_ALLOWED macro to ensure we get warnings when we use an API that dates from a glib version newer than our minimum benchmark. Historically this didn't get enforced for (most) macros, but GLib 2.69 has addressed that gap. This causes our usage of G_GNUC_FALLTHROUGH to trigger warnings. GLib is right to warn, because it does not know that we have added our own fallback for older versions. The only way to squelch this warning though, is to fully undefine the GLib provided G_GNUC_FALLTHROUGH and use our own in its place. We'll be able to remove all this compat burden when we finally update the min glib version to be >= 2.60 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/internal.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/internal.h b/src/internal.h index 0a03dfc46f..e1250a59fe 100644 --- a/src/internal.h +++ b/src/internal.h @@ -147,8 +147,17 @@ * * silence the compiler warning when falling through a switch case * - * TODO: Remove after upgrading to GLib >= 2.60 + * Note: GLib 2.69.0 introduced version checks on the + * macro usage. Thus an app setting GLIB_VERSION_MAX_ALLOWED + * to less than 2.60 will trigger a warning using G_GNUC_FALLTHROUGH + * Normally the warning is a good thing, but we want to use our + * fallback impl, so we have to temporarily cull the GLib macro. + * + * All this should be removed once updating to min GLib >= 2.60 */ +#if GLIB_CHECK_VERSION(2, 69, 0) +# undef G_GNUC_FALLTHROUGH +#endif #ifndef G_GNUC_FALLTHROUGH # if __GNUC_PREREQ (7, 0) # define G_GNUC_FALLTHROUGH __attribute__((fallthrough)) -- 2.31.1

2 1

[PATCH] storage: create logical volume with --yes option
by Kristina Hanicova 23 Jul '21

23 Jul '21

If lvcreate found an existing signature when trying to create a new logical volume (E.g. left after some deleted volume), the action failed due to inability to answer interactive question to wiping it (lvcreate assumed 'no' was the answer). With added option --yes to the command line, the answer to any interactive question is assumed to be yes. Therefore, lvcreate wipes the signature and the new volume is created successfully. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1940413 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/storage/storage_backend_logical.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ed8e47d880..02ede74aeb 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -863,6 +863,8 @@ virStorageBackendLogicalLVCreate(virStorageVolDef *vol, else virCommandAddArg(cmd, def->source.name); + virCommandAddArg(cmd, "--yes"); + return virCommandRun(cmd, NULL); } -- 2.31.1

2 1

[PATCH] conf: Add grabToggle to evdev input
by Justin Gatzen 23 Jul '21

23 Jul '21

Add support for customizable grabToggle key combinations with <input type='evdev'>. Signed-off-by: Justin Gatzen <justin.gatzen(a)gmail.com> --- docs/formatdomain.rst | 12 +++++++----- docs/schemas/domaincommon.rng | 12 ++++++++++++ src/conf/domain_conf.c | 19 +++++++++++++++++++ src/conf/domain_conf.h | 14 ++++++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_command.c | 5 +++++ .../input-linux.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/input-linux.xml | 2 +- 8 files changed, 61 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index b621591515..61ccd8895a 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5747,7 +5747,7 @@ to provide a graphics tablet for absolute cursor movement. <source evdev='/dev/input/event1'/> </input> <input type='evdev'> - <source dev='/dev/input/event1234' grab='all' repeat='on'/> + <source dev='/dev/input/event1234' grab='all' repeat='on' grabToggle='ctrl-ctrl'/> </input> </devices> ... @@ -5768,10 +5768,12 @@ On S390, ``address`` can be used to provide a CCW address for an input device ( sub-element ``source`` must have an ``evdev`` (for ``passthrough``) or ``dev`` (for ``evdev``) attribute containing the absolute path to the event device passed through to guests. -For type ``evdev``, ``source`` can have two optional attributes ``grab`` with -value 'all' which when enabled grabs all input devices instead of just one and -``repeat`` with value 'on'/'off' to enable/disable auto-repeat events ( -:since:`Since 7.4.0`). +For type ``evdev``, ``source`` has three optional attributes ``grab`` with +value 'all' which when enabled grabs all input devices instead of just one, +``repeat`` with value 'on'/'off' to enable/disable auto-repeat events and +``grabToggle`` (:since:`since 7.6.0`) with values ``ctrl-ctrl``, ``alt-alt``, +``shift-shift``, ``meta-meta``, ``scrolllock`` or ``ctrl-scrolllock`` to +change the grab key combination. ``input`` type ``evdev`` is currently supported only on linux devices. (KVM only) :since:`Since 5.2.0` , the ``input`` element accepts a ``model`` attribute which has the values 'virtio', 'virtio-transitional' and diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 538581360d..14c5d4ee68 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5484,6 +5484,18 @@ <value>all</value> </attribute> </optional> + <optional> + <attribute name="grabToggle"> + <choice> + <value>ctrl-ctrl</value> + <value>alt-alt</value> + <value>shift-shift</value> + <value>meta-meta</value> + <value>scrolllock</value> + <value>ctrl-scrolllock</value> + </choice> + </attribute> + </optional> <optional> <attribute name="repeat"> <ref name="virOnOff"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e05ea9ba88..44d55ede5b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -891,6 +891,17 @@ VIR_ENUM_IMPL(virDomainInputSourceGrab, "all", ); +VIR_ENUM_IMPL(virDomainInputSourceGrabToggle, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_LAST, + "default", + "ctrl-ctrl", + "alt-alt", + "shift-shift", + "meta-meta", + "scrolllock", + "ctrl-scrolllock", +); + VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "sdl", @@ -12011,6 +12022,11 @@ virDomainInputDefParseXML(virDomainXMLOption *xmlopt, VIR_XML_PROP_NONZERO, &def->source.grab) < 0) goto error; + if (virXMLPropEnum(source, "grabToggle", + virDomainInputSourceGrabToggleTypeFromString, + VIR_XML_PROP_NONZERO, &def->source.grabToggle) < 0) + goto error; + if (virXMLPropTristateSwitch(source, "repeat", VIR_XML_PROP_NONE, &def->source.repeat) < 0) goto error; @@ -25998,6 +26014,7 @@ virDomainInputDefFormat(virBuffer *buf, const char *type = virDomainInputTypeToString(def->type); const char *bus = virDomainInputBusTypeToString(def->bus); const char *grab = virDomainInputSourceGrabTypeToString(def->source.grab); + const char *grabToggle = virDomainInputSourceGrabToggleTypeToString(def->source.grabToggle); const char *repeat = virTristateSwitchTypeToString(def->source.repeat); g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); @@ -26049,6 +26066,8 @@ virDomainInputDefFormat(virBuffer *buf, if (def->source.grab) virBufferAsprintf(&sourceAttrBuf, " grab='%s'", grab); + if (def->source.grabToggle) + virBufferAsprintf(&sourceAttrBuf, " grabToggle='%s'", grabToggle); if (def->source.repeat) virBufferAsprintf(&sourceAttrBuf, " repeat='%s'", repeat); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5c22f252d0..ca21082624 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1420,6 +1420,18 @@ typedef enum { VIR_DOMAIN_INPUT_SOURCE_GRAB_LAST } virDomainInputSourceGrab; +typedef enum { + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_DEFAULT, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_CTRL_CTRL, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_ALT_ALT, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_SHIFT_SHIFT, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_META_META, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_SCROLLLOCK, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_CTRL_SCROLLLOCK, + + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_LAST +} virDomainInputSourceGrabToggle; + struct _virDomainInputDef { int type; int bus; @@ -1427,6 +1439,7 @@ struct _virDomainInputDef { struct { char *evdev; virDomainInputSourceGrab grab; + virDomainInputSourceGrabToggle grabToggle; virTristateSwitch repeat; } source; virDomainDeviceInfo info; @@ -3871,6 +3884,7 @@ VIR_ENUM_DECL(virDomainInput); VIR_ENUM_DECL(virDomainInputBus); VIR_ENUM_DECL(virDomainInputModel); VIR_ENUM_DECL(virDomainInputSourceGrab); +VIR_ENUM_DECL(virDomainInputSourceGrabToggle); VIR_ENUM_DECL(virDomainGraphics); VIR_ENUM_DECL(virDomainGraphicsListen); VIR_ENUM_DECL(virDomainGraphicsAuthConnected); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4bc2974e7f..6bbf551f48 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -476,6 +476,8 @@ virDomainInputBusTypeToString; virDomainInputDefFind; virDomainInputDefFree; virDomainInputDefGetPath; +virDomainInputSourceGrabToggleTypeFromString; +virDomainInputSourceGrabToggleTypeToString; virDomainInputSourceGrabTypeFromString; virDomainInputSourceGrabTypeToString; virDomainInputTypeToString; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3c3ecd63e3..156af4caee 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3947,6 +3947,11 @@ qemuBuildObjectInputDevStr(virDomainInputDef *dev, if (dev->source.grab == VIR_DOMAIN_INPUT_SOURCE_GRAB_ALL) virJSONValueObjectAdd(props, "b:grab_all", true, NULL); + if (dev->source.grabToggle != VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_DEFAULT) + virJSONValueObjectAdd(props, "s:grab-toggle", + virDomainInputSourceGrabToggleTypeToString(dev->source.grabToggle), + NULL); + if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0) return NULL; diff --git a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args index 688cf02873..3c7e65a7f0 100644 --- a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args +++ b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --object '{"qom-type":"input-linux","id":"input0","evdev":"/dev/input/event1234","repeat":true,"grab_all":true}' \ +-object '{"qom-type":"input-linux","id":"input0","evdev":"/dev/input/event1234","repeat":true,"grab_all":true,"grab-toggle":"alt-alt"}' \ -audiodev id=audio1,driver=none \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/input-linux.xml b/tests/qemuxml2argvdata/input-linux.xml index c0702676c1..389ba789a6 100644 --- a/tests/qemuxml2argvdata/input-linux.xml +++ b/tests/qemuxml2argvdata/input-linux.xml @@ -22,7 +22,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <input type='evdev'> - <source dev='/dev/input/event1234' grab='all' repeat='on'/> + <source dev='/dev/input/event1234' grab='all' grabToggle='alt-alt' repeat='on'/> </input> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> -- 2.32.0

2 1

[PATCH 0/7] Various fixes
by Peter Krempa 23 Jul '21

23 Jul '21

Fixes for stuff I've noticed when reviewing Tim's hash table cleanups. This obviously applies on top of his series. Peter Krempa (7): virHashNew: Ensure return value is used hypervCreateEmbeddedParam: Don't count elements needlessly qemuBlockNodeNameGetBackingChain: Shuffle around variable initialization virDomainDefValidateAliases: Refactor to avoid cleanup section virNetworkObjNew: Remove impossible error handling qemu: domain: Move qemuDomainObjPrivateAlloc after qemuDomainObjPrivateFree qemuDomainObjPrivateAlloc: Fix unlikely memory leak src/conf/domain_validate.c | 15 ++++------ src/conf/virnetworkobj.c | 13 +++------ src/hyperv/hyperv_wmi.c | 5 ---- src/qemu/qemu_block.c | 8 ++---- src/qemu/qemu_domain.c | 57 ++++++++++++++++++-------------------- src/util/virhash.h | 2 +- 6 files changed, 39 insertions(+), 61 deletions(-) -- 2.31.1

2 8

[PATCH] qemu: save status xml after generating taint message
by Kristina Hanicova 23 Jul '21

23 Jul '21

We didn't always save status xml after generating new taint message, which resulted in it being deleted in case of a libvirtd restart. Some taint messages were preserved thanks to saving status xml separately at the end of the calling functions (which makes sense, because qemuDomainObjTaint was usually called there multiple times). But for special cases (e.g. When only few taint messages are generated) we need a separate function for generating them and saving status xml explicitly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1965589 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_domain.c | 11 +++++++++++ src/qemu/qemu_domain.h | 5 +++++ src/qemu/qemu_driver.c | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ac1d8ef151..4b9e717c16 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6468,6 +6468,17 @@ void qemuDomainObjTaint(virQEMUDriver *driver, qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL); } +void qemuDomainObjTaintAndSave(virQEMUDriver *driver, + virDomainObj *obj, + virDomainTaintFlags taint, + qemuDomainLogContext *logCtxt) +{ + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + + qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL); + ignore_value(virDomainObjSave(obj, driver->xmlopt, cfg->stateDir)); +} + void qemuDomainObjTaintMsg(virQEMUDriver *driver, virDomainObj *obj, virDomainTaintFlags taint, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index acf6ca5ab6..9bd711cbd4 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -568,6 +568,11 @@ void qemuDomainObjTaint(virQEMUDriver *driver, virDomainTaintFlags taint, qemuDomainLogContext *logCtxt); +void qemuDomainObjTaintAndSave(virQEMUDriver *driver, + virDomainObj *obj, + virDomainTaintFlags taint, + qemuDomainLogContext *logCtxt); + void qemuDomainObjTaintMsg(virQEMUDriver *driver, virDomainObj *obj, virDomainTaintFlags taint, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 521063d438..8652bdc3d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14010,7 +14010,7 @@ static int qemuDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, priv = vm->privateData; - qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_MONITOR, NULL); + qemuDomainObjTaintAndSave(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_MONITOR, NULL); hmp = !!(flags & VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP); @@ -16877,7 +16877,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; - qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_GA_COMMAND, NULL); + qemuDomainObjTaintAndSave(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_GA_COMMAND, NULL); agent = qemuDomainObjEnterAgent(vm); ret = qemuAgentArbitraryCommand(agent, cmd, &result, timeout); -- 2.31.1

5 7

[libvirt PATCH 00/38] virHashNew refactorings - part VII
by Tim Wiederhake 23 Jul '21

23 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. See https://listman.redhat.com/archives/libvir-list/2021-July/msg00074.html. Not split up further as per https://listman.redhat.com/archives/libvir-list/2021-July/msg00575.html Tim Wiederhake (38): virSystemdActivationNew: `virHashNew` cannot return NULL virSystemdActivationNew: Use automatic memory management virSystemdActivationNew: Remove superfluous `goto`s virNWFilterCreateVarsFrom: `virHashNew` cannot return NULL virNWFilterCreateVarsFrom: Use automatic memory management virNWFilterCreateVarsFrom: Remove superfluous `goto`s virNWFilterRuleDefToRuleInst: `virHashNew` cannot return NULL ebiptablesApplyNewRules: `virHashNew` cannot return NULL hypervCreateEmbeddedParam: `virHashNew` cannot return NULL qemusecuritymock: init_hash: `virHashNew` cannot return NULL libxlLoggerNew: `virHashNew` cannot return NULL qemuBlockNodeNamesDetect: `virHashNew` cannot return NULL qemuBlockNodeNameGetBackingChain: `virHashNew` cannot return NULL qemuDomainObjPrivateAlloc: `virHashNew` cannot return NULL qemuInteropFetchConfigs: `virHashNew` cannot return NULL virChrdevAlloc: `virHashNew` cannot return NULL virCloseCallbacksNew: `virHashNew` cannot return NULL virDomainCCWAddressSetCreate: `virHashNew` cannot return NULL virDomainDefBootOrderPostParse: `virHashNew` cannot return NULL virDomainDefValidateAliases: `virHashNew` cannot return NULL virDomainMomentObjListNew: `virHashNew` cannot return NULL virDomainObjListNew: `virHashNew` cannot return NULL virFileCacheNew: `virHashNew` cannot return NULL virHashAtomicNew: `virHashNew` cannot return NULL virInterfaceObjListNew: `virHashNew` cannot return NULL virLockDaemonNew: `virHashNew` cannot return NULL virLockDaemonNewPostExecRestart: `virHashNew` cannot return NULL virLockSpaceNew: `virHashNew` cannot return NULL virLockSpaceNewPostExecRestart: `virHashNew` cannot return NULL virNetDaemonNew: `virHashNew` cannot return NULL virNetworkObjListNew: `virHashNew` cannot return NULL virNetworkObjNew: `virHashNew` cannot return NULL virNodeDeviceObjListNew: `virHashNew` cannot return NULL virQEMUCapsProbeQMPHostCPU: `virHashNew` cannot return NULL virSecuritySELinuxLXCInitialize: `virHashNew` cannot return NULL virSecuritySELinuxQEMUInitialize: `virHashNew` cannot return NULL virStoragePoolObjListNew: `virHashNew` cannot return NULL virStorageVolObjListNew: `virHashNew` cannot return NULL src/conf/domain_addr.c | 7 +------ src/conf/domain_conf.c | 5 +---- src/conf/domain_validate.c | 3 +-- src/conf/virchrdev.c | 6 +----- src/conf/virdomainmomentobjlist.c | 4 ---- src/conf/virdomainobjlist.c | 8 ++------ src/conf/virinterfaceobj.c | 5 +---- src/conf/virnetworkobj.c | 8 ++------ src/conf/virnodedeviceobj.c | 5 +---- src/conf/virstorageobj.c | 17 +++++------------ src/hyperv/hyperv_wmi.c | 6 +----- src/hypervisor/virclosecallbacks.c | 4 ---- src/libxl/libxl_logger.c | 4 +--- src/locking/lock_daemon.c | 6 ++---- src/nwfilter/nwfilter_ebiptables_driver.c | 3 --- src/nwfilter/nwfilter_gentech_driver.c | 18 ++++++------------ src/qemu/qemu_block.c | 15 +++------------ src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_interop_config.c | 5 +---- src/rpc/virnetdaemon.c | 3 +-- src/security/security_selinux.c | 6 ++---- src/util/virfilecache.c | 7 +------ src/util/virhash.c | 5 +---- src/util/virlockspace.c | 6 ++---- src/util/virsystemd.c | 16 +++++----------- tests/qemusecuritymock.c | 17 +++-------------- 27 files changed, 46 insertions(+), 149 deletions(-) -- 2.31.1

2 41

[libvirt PATCH] virsh: fix setmem flags logic
by Pavel Hrdina 23 Jul '21

23 Jul '21

When we dropped virDomainSetMemory usage it got kind of tricky to figure out the flags correctly. Originally the logic was following: no option | --current | --live | --config | --live --config ----------+-----------+--------+----------+---------------- LIVE | CURRENT | LIVE | CONFIG | LIVE & CONFIG But after the commit removing virDomainSetMemory usage it changed to: no option | --current | --live | --config | --live --config ----------+-----------+--------+-----------------+---------------- LIVE | CURRENT | LIVE | LIVE & CONFIG | LIVE & CONFIG This commit fixes the logic back to the original behavior except for ESX, HyperV and Virtuozzo drivers where virDomainSetMemory() default behavior was CURRENT instead of LIVE. Fixes: ce8138564bba0def7d7195814fba4555915d60d5 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1980199 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tools/virsh-domain.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6fb057736b..f9962f0515 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9005,10 +9005,15 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); - if (current) + if (config || live || current) { flags = VIR_DOMAIN_AFFECT_CURRENT; - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + } if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 2.31.1

2 1

Re: [PULL 37/48] usb: build usb-host as module
by Peter Krempa 23 Jul '21

23 Jul '21

adding libvirt-list On Thu, Jul 08, 2021 at 17:17:37 +0200, Paolo Bonzini wrote: > From: Gerd Hoffmann <kraxel(a)redhat.com> > > Drop one more shared library dependency (libusb) from core qemu. > > Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> > Reviewed-by: Jose R. Ziviani <jziviani(a)suse.de> > Message-Id: <20210624103836.2382472-34-kraxel(a)redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> > --- > hw/usb/host-libusb.c | 1 + > hw/usb/meson.build | 8 ++++++-- > 2 files changed, 7 insertions(+), 2 deletions(-) After this commit libvirt is no longer detecting the 'hostdevice' property of 'usb-host'. In fact 'device-list-properties' is returning: "desc": "Device 'usb-host' not found" > diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c > index 2b7f87872c..c0f314462a 100644 > --- a/hw/usb/host-libusb.c > +++ b/hw/usb/host-libusb.c > @@ -1777,6 +1777,7 @@ static TypeInfo usb_host_dev_info = { > .class_init = usb_host_class_initfn, > .instance_init = usb_host_instance_init, > }; > +module_obj(TYPE_USB_HOST_DEVICE); > > static void usb_host_register_types(void) > { > diff --git a/hw/usb/meson.build b/hw/usb/meson.build > index 817f3e027a..3ca6127937 100644 > --- a/hw/usb/meson.build > +++ b/hw/usb/meson.build > @@ -72,8 +72,12 @@ if usbredir.found() > endif > > # usb pass-through > -softmmu_ss.add(when: ['CONFIG_USB', libusb], > - if_true: files('host-libusb.c')) > +if config_host.has_key('CONFIG_USB_LIBUSB') The problem is in this condition as it's evaluated as false. When I replace it with libusb.found(), everything works as it used to. Unfortunately I don't know what the real goa behind using CONFIG_USB_LIBUSB here was to see whether my approach is good. > + usbhost_ss = ss.source_set() > + usbhost_ss.add(when: ['CONFIG_USB', libusb], > + if_true: files('host-libusb.c')) > + hw_usb_modules += {'host': usbhost_ss} > +endif > > softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN', libusb], if_true: files('xen-usb.c')) > > -- > 2.31.1 > > >

2 1

[libvirt PATCH] nodedev: Handle inactive mdevs with the same UUID
by Jonathon Jongsma 22 Jul '21

22 Jul '21

Unfortunately, mdevctl supports defining more than one mdev with the same UUID as long as they have different parent devices. So we can't use the UUID alone as a way to uniquely identify these node devices. Append the parent name to ensure uniqueness. For example: Before: mdev_88a6b868_46bd_4015_8e5b_26107f82da38 After: mdev_88a6b868_46bd_4015_8e5b_26107f82da38_0000_00_02_0 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1979440 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- QUESTION: Is there any expectation of stability in these device names? I'm not sure to what extent these changes might affect users. Given that support for persistent mdevs is fairly new, there are likely not many users yet. src/node_device/node_device_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index b4dd57e5f4..89dc704162 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1038,7 +1038,7 @@ nodeDeviceGetMdevctlListCommand(bool defined, static void mdevGenerateDeviceName(virNodeDeviceDef *dev) { - nodeDeviceGenerateName(dev, "mdev", dev->caps->data.mdev.uuid, NULL); + nodeDeviceGenerateName(dev, "mdev", dev->caps->data.mdev.uuid, dev->parent); } -- 2.31.1

2 3

[libvirt PATCH] ci: Adapt to lcitool command line changes
by Andrea Bolognani 22 Jul '21

22 Jul '21

lcitool now uses the term "target" instead of "host" to refer to the various operating systems it supports, and we need to adapt our helper script so that it works with the new command line interface. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Getting this ready for when https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/92 is merged. ci/helper | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/ci/helper b/ci/helper index 2c3a9f8db4..441258f511 100755 --- a/ci/helper +++ b/ci/helper @@ -190,18 +190,18 @@ class Application: output = subprocess.check_output([self._args.lcitool] + args) return output.decode("utf-8") - def _lcitool_get_hosts(self): - output = self._lcitool_run(["hosts"]) + def _lcitool_get_targets(self): + output = self._lcitool_run(["targets"]) return output.splitlines() - def _generate_dockerfile(self, host, cross=None): - args = ["dockerfile", host, "libvirt"] + def _generate_dockerfile(self, target, cross=None): + args = ["dockerfile", target, "libvirt"] outdir = self._basedir.joinpath("containers") - outfile = f"{host}.Dockerfile" + outfile = f"{target}.Dockerfile" if cross: args.extend(["--cross", cross]) - outfile = f"{host}-cross-{cross}.Dockerfile" + outfile = f"{target}-cross-{cross}.Dockerfile" outpath = outdir.joinpath(outfile) if not self._args.quiet: @@ -211,10 +211,10 @@ class Application: with open(outpath, "w") as f: f.write(output) - def _generate_vars(self, host): - args = ["variables", host, "libvirt"] + def _generate_vars(self, target): + args = ["variables", target, "libvirt"] outdir = self._basedir.joinpath("cirrus") - outfile = f"{host}.vars" + outfile = f"{target}.vars" outpath = outdir.joinpath(outfile) if not self._args.quiet: @@ -241,37 +241,37 @@ class Application: "mingw64", ] - for host in self._lcitool_get_hosts(): - if host.startswith("freebsd-") or host.startswith("macos-"): + for target in self._lcitool_get_targets(): + if target.startswith("freebsd-") or target.startswith("macos-"): continue - self._generate_dockerfile(host) + self._generate_dockerfile(target) - if host == "fedora-rawhide": + if target == "fedora-rawhide": for cross in fedora_cross: - self._generate_dockerfile(host, cross) + self._generate_dockerfile(target, cross) - if host.startswith("debian-"): + if target.startswith("debian-"): for cross in debian_cross: - if host == "debian-sid" and cross == "mips": + if target == "debian-sid" and cross == "mips": continue - self._generate_dockerfile(host, cross) + self._generate_dockerfile(target, cross) def _refresh_cirrus(self): - for host in self._lcitool_get_hosts(): - if not (host.startswith("freebsd-") or host.startswith("macos-")): + for target in self._lcitool_get_targets(): + if not (target.startswith("freebsd-") or target.startswith("macos-")): continue - self._generate_vars(host) + self._generate_vars(target) def _check_stale_images(self): namespace = self._args.namespace gitlab_uri = self._args.gitlab_uri registry_uri = util.get_registry_uri(namespace, gitlab_uri) - lcitool_hosts = self._lcitool_get_hosts() + lcitool_targets = self._lcitool_get_targets() stale_images = util.get_registry_stale_images(registry_uri, - lcitool_hosts) + lcitool_targets) if stale_images: spacing = "\n" + 4 * " " stale_fmt = [f"{k} (ID: {v})" for k, v in stale_images.items()] -- 2.31.1

2 1

[PATCH v3] nodedev: fix internal error when no defined mdevs exist
by Boris Fiuczynski 22 Jul '21

22 Jul '21

Commit e9b534905f4 introduced an error when parsing an empty list returned from mdevctl. This occurs e.g. if nodedev-undefine is used to undefine the last defined mdev which causes the following error messages libvirtd[33143]: internal error: Unexpected format for mdevctl response libvirtd[33143]: internal error: failed to query mdevs from mdevctl: libvirtd[33143]: mdevctl failed to updated mediated devices Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Reviewed-by: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> Reviewed-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/node_device/node_device_driver.c | 6 ++++++ tests/nodedevmdevctldata/mdevctl-list-empty.json | 1 + tests/nodedevmdevctldata/mdevctl-list-empty.out.xml | 0 tests/nodedevmdevctltest.c | 1 + 4 files changed, 8 insertions(+) create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty.out.xml diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 17a7aea2bb..6f8968f1f0 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1139,6 +1139,12 @@ nodeDeviceParseMdevctlJSON(const char *jsonstring, goto error; } + if (virJSONValueArraySize(json_devicelist) == 0) { + VIR_DEBUG("mdevctl has no defined mediated devices"); + *devs = NULL; + return 0; + } + /* mdevctl list --dumpjson produces an output that is an array that * contains only a single object which contains a property for each parent * device */ diff --git a/tests/nodedevmdevctldata/mdevctl-list-empty.json b/tests/nodedevmdevctldata/mdevctl-list-empty.json new file mode 100644 index 0000000000..fe51488c70 --- /dev/null +++ b/tests/nodedevmdevctldata/mdevctl-list-empty.json @@ -0,0 +1 @@ +[] diff --git a/tests/nodedevmdevctldata/mdevctl-list-empty.out.xml b/tests/nodedevmdevctldata/mdevctl-list-empty.out.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index 8ba1d2da70..e246de4d87 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -360,6 +360,7 @@ mymain(void) DO_TEST_LIST_DEFINED(); + DO_TEST_PARSE_JSON("mdevctl-list-empty"); DO_TEST_PARSE_JSON("mdevctl-list-multiple"); DO_TEST_DEFINE("mdev_d069d019_36ea_4111_8f0a_8c9a70e21366"); -- 2.31.1

2 1

Re: [PULL 36/40] vl: switch -M parsing to keyval
by Peter Krempa 22 Jul '21

22 Jul '21

CC libvir-list On Tue, Jul 06, 2021 at 12:01:37 +0200, Paolo Bonzini wrote: > Switch from QemuOpts to keyval. This enables the introduction > of non-scalar machine properties, and JSON syntax in the future. > > For JSON syntax to be supported right now, we would have to > consider what would happen if string-based dictionaries (produced by > -M key=val) were to be merged with strongly-typed dictionaries > (produced by -M {'key': 123}). > > The simplest way out is to never enter the situation, and only allow one > -M option when JSON syntax is in use. However, we want options such as > -smp to become syntactic sugar for -M, and this is a problem; as soon > as -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' > together with -smp. Therefore, allowing JSON syntax right now for -M > would be a forward-compatibility nightmare and it would be impossible > anyway to introduce -M incrementally in tools. > > Instead, support for JSON syntax is delayed until after the main > options are converted to QOM compound properties. These include -boot, > -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON > syntax is introduced, these options will _also_ be forbidden together > with -M '{...}'. > > Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> > --- > softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- > 1 file changed, 146 insertions(+), 169 deletions(-) This patch breaks detection of certain machine options features in libvirt which were being detected from 'query-command-line-options'. I presume the change simply removed this from the output of query-command-line-options due to the historical cruft how the aforementioned command works. Unfortunately I didn't find any suitable replacement from what we are querying. The entries which we now lack detection are: { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP }, { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP }, { "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP }, { "machine", "loadparm", QEMU_CAPS_LOADPARM }, Note that the oldest supported qemu version in libvirt is 2.11 at this point and all the above flags are included in 2.11 and later. This means we can theoretically remove the detection and always assume the flags in case when they are unlikely to be removed in the future. Alternatively if you can suggest an option how to detect this it will be welcome. Thanks Peter

2 2

[PATCH] qemuxml2argvmock: Deduplicate some code
by Michal Privoznik 22 Jul '21

22 Jul '21

A stub implementation for virQEMUCapsGetKVMSupportsSecureGuest() was added recently. However, the very same implementation was added to domaincapsmock.c which is also loaded by qemuxml2argvtest and thus one occurrence of the stub can be dropped. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemuxml2argvmock.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index d7f77eabf7..9235c785b2 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -302,18 +302,3 @@ virIdentityEnsureSystemToken(void) { return g_strdup("3de80bcbf22d4833897f1638e01be9b2"); } - -static bool (*real_virQEMUCapsGetKVMSupportsSecureGuest)(virQEMUCaps *qemuCaps); - -bool -virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) -{ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_S390_PV_GUEST)) - return true; - - if (!real_virQEMUCapsGetKVMSupportsSecureGuest) - VIR_MOCK_REAL_INIT(virQEMUCapsGetKVMSupportsSecureGuest); - - return real_virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps); -} -- 2.31.1

2 1

[libvirt PATCH] qemuxml2argvmock: drop virQEMUCapsGetKVMSupportsSecureGuest
by Pavel Hrdina 22 Jul '21

22 Jul '21

It is actually not needed because in qemuxml2argvtest we preload domaincapsmock as well. Reported-by: Michal Privoznik <mprivozn(a)redhat.com> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tests/qemuxml2argvmock.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index d7f77eabf7..2265492f1e 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -41,7 +41,6 @@ #include "virutil.h" #include "qemu/qemu_interface.h" #include "qemu/qemu_command.h" -#include "qemu/qemu_capabilities.h" #include <time.h> #include <unistd.h> #include <fcntl.h> @@ -302,18 +301,3 @@ virIdentityEnsureSystemToken(void) { return g_strdup("3de80bcbf22d4833897f1638e01be9b2"); } - -static bool (*real_virQEMUCapsGetKVMSupportsSecureGuest)(virQEMUCaps *qemuCaps); - -bool -virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) -{ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_S390_PV_GUEST)) - return true; - - if (!real_virQEMUCapsGetKVMSupportsSecureGuest) - VIR_MOCK_REAL_INIT(virQEMUCapsGetKVMSupportsSecureGuest); - - return real_virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps); -} -- 2.31.1

2 1

[PATCH v2 0/3] remove sysconfig files
by Olaf Hering 22 Jul '21

22 Jul '21

based on 94944e38d7. Olaf Hering (3): libvirt.spec: relocate pre script of daemon-driver-qemu remove sysconfig files NEWS: mention removal of sysconfig NEWS.rst | 10 +++ docs/daemons.rst | 20 +++++ docs/remote.html.in | 2 +- libvirt.spec.in | 100 ++++++++++++++++-------- src/ch/meson.build | 5 -- src/ch/virtchd.service.in | 1 + src/ch/virtchd.sysconf | 3 - src/interface/meson.build | 5 -- src/interface/virtinterfaced.service.in | 1 + src/interface/virtinterfaced.sysconf | 3 - src/libxl/meson.build | 5 -- src/libxl/virtxend.service.in | 1 + src/libxl/virtxend.sysconf | 3 - src/locking/meson.build | 5 -- src/locking/virtlockd.service.in | 1 + src/locking/virtlockd.sysconf | 3 - src/logging/meson.build | 5 -- src/logging/virtlogd.sysconf | 3 - src/lxc/meson.build | 5 -- src/lxc/virtlxcd.service.in | 1 + src/lxc/virtlxcd.sysconf | 3 - src/meson.build | 16 ---- src/network/meson.build | 5 -- src/network/virtnetworkd.service.in | 1 + src/network/virtnetworkd.sysconf | 3 - src/node_device/meson.build | 5 -- src/node_device/virtnodedevd.service.in | 1 + src/node_device/virtnodedevd.sysconf | 3 - src/nwfilter/meson.build | 5 -- src/nwfilter/virtnwfilterd.service.in | 1 + src/nwfilter/virtnwfilterd.sysconf | 3 - src/qemu/meson.build | 5 -- src/qemu/virtqemud.service.in | 7 ++ src/qemu/virtqemud.sysconf | 12 --- src/remote/libvirtd.service.in | 7 ++ src/remote/libvirtd.sysconf | 21 ----- src/remote/meson.build | 10 --- src/remote/virtproxyd.service.in | 1 + src/remote/virtproxyd.sysconf | 3 - src/secret/meson.build | 5 -- src/secret/virtsecretd.service.in | 1 + src/secret/virtsecretd.sysconf | 3 - src/storage/meson.build | 5 -- src/storage/virtstoraged.service.in | 1 + src/storage/virtstoraged.sysconf | 3 - src/vbox/meson.build | 5 -- src/vbox/virtvboxd.service.in | 1 + src/vbox/virtvboxd.sysconf | 3 - src/vz/meson.build | 5 -- src/vz/virtvzd.service.in | 1 + src/vz/virtvzd.sysconf | 3 - tools/libvirt-guests.sh.in | 40 ++++++++++ tools/libvirt-guests.sysconf | 50 ------------ tools/meson.build | 6 -- 54 files changed, 166 insertions(+), 260 deletions(-) delete mode 100644 src/ch/virtchd.sysconf delete mode 100644 src/interface/virtinterfaced.sysconf delete mode 100644 src/libxl/virtxend.sysconf delete mode 100644 src/locking/virtlockd.sysconf delete mode 100644 src/logging/virtlogd.sysconf delete mode 100644 src/lxc/virtlxcd.sysconf delete mode 100644 src/network/virtnetworkd.sysconf delete mode 100644 src/node_device/virtnodedevd.sysconf delete mode 100644 src/nwfilter/virtnwfilterd.sysconf delete mode 100644 src/qemu/virtqemud.sysconf delete mode 100644 src/remote/libvirtd.sysconf delete mode 100644 src/remote/virtproxyd.sysconf delete mode 100644 src/secret/virtsecretd.sysconf delete mode 100644 src/storage/virtstoraged.sysconf delete mode 100644 src/vbox/virtvboxd.sysconf delete mode 100644 src/vz/virtvzd.sysconf delete mode 100644 tools/libvirt-guests.sysconf

1 3

[libvirt PATCH] tests: fix compiling tests with minGW
by Pavel Hrdina 22 Jul '21

22 Jul '21

We need to mock virQEMUCapsGetKVMSupportsSecureGuest only if compiling with QEMU otherwise compilation will fail with error: /usr/lib/gcc/i686-w64-mingw32/11.1.1/../../../../i686-w64-mingw32/bin/ld: tests/libdomaincapsmock.dll.p/domaincapsmock.c.obj: in function `virQEMUCapsGetKVMSupportsSecureGuest': /builds/libvirt/libvirt/build/../tests/domaincapsmock.c:40: undefined reference to `virQEMUCapsGet' /usr/lib/gcc/i686-w64-mingw32/11.1.1/../../../../i686-w64-mingw32/bin/ld: /builds/libvirt/libvirt/build/../tests/domaincapsmock.c:41: undefined reference to `virQEMUCapsGet' Fixes: 248a30c0c0ec2610e8fa2bbbc98da6d06978ad2e Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tests/domaincapsmock.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c index 7b02c0e890..0a6c541f77 100644 --- a/tests/domaincapsmock.c +++ b/tests/domaincapsmock.c @@ -17,8 +17,11 @@ #include <config.h> #include "virhostcpu.h" -#include "virmock.h" -#include "qemu/qemu_capabilities.h" + +#if WITH_QEMU +# include "virmock.h" +# include "qemu/qemu_capabilities.h" +#endif int virHostCPUGetKVMMaxVCPUs(void) @@ -32,6 +35,7 @@ virHostCPUGetMicrocodeVersion(virArch hostArch G_GNUC_UNUSED) return 0; } +#if WITH_QEMU static bool (*real_virQEMUCapsGetKVMSupportsSecureGuest)(virQEMUCaps *qemuCaps); bool @@ -46,3 +50,4 @@ virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) return real_virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps); } +#endif -- 2.31.1

2 2

[libvirt PATCH 00/10] virHashNew refactorings - part V
by Tim Wiederhake 22 Jul '21

22 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. See https://listman.redhat.com/archives/libvir-list/2021-July/msg00074.html. Tim Wiederhake (10): conf: Add AUTOPTR_CLEANUP_FUNC for virNWFilterVarValue virNWFilterParseParamAttributes: `virHashNew` cannot return NULL virNWFilterParseParamAttributes: Iterate over "element" children virNWFilterParseParamAttributes: Remove tautological `if` virNWFilterParseParamAttributes: Use automatic memory management virNWFilterParseParamAttributes: Simplify loop body virNWFilterParseParamAttributes: Remove superfluous `goto`s virNWFilterDoInstantiate: `virHashNew` cannot return NULL virNWFilterIPAddrMapInit: `virHashNew` cannot return NULL virNWFilterLearnInit: `virHashNew` cannot return NULL src/conf/nwfilter_ipaddrmap.c | 3 -- src/conf/nwfilter_params.c | 70 +++++++++----------------- src/conf/nwfilter_params.h | 2 + src/nwfilter/nwfilter_gentech_driver.c | 5 -- src/nwfilter/nwfilter_learnipaddr.c | 8 --- 5 files changed, 26 insertions(+), 62 deletions(-) -- 2.31.1

2 13

[PATCH v1] remove sysconfig files
by Olaf Hering 22 Jul '21

22 Jul '21

sysconfig files are owned by the admin of the host. He has the liberty to put anything he wants into these files. This makes it difficult to provide different built-in defaults. Remove the sysconfig file and place the current desired default into the service file. Local customizations can now go either into /etc/sysconfig/name or /etc/systemd/system/name.service.d/my-knobs.conf Attempt to handle upgrades in libvirt.spec. Dirty files which are marked as %config will be renamed to file.rpmsave. To restore them automatically, move stale .rpmsave files away, and catch any new rpmsave files in %posttrans. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- NEWS.rst | 10 ++ docs/remote.html.in | 2 +- libvirt.spec.in | 134 +++++++++++++++--------- src/ch/meson.build | 5 - src/ch/virtchd.service.in | 1 + src/ch/virtchd.sysconf | 3 - src/interface/meson.build | 5 - src/interface/virtinterfaced.service.in | 1 + src/interface/virtinterfaced.sysconf | 3 - src/libxl/meson.build | 5 - src/libxl/virtxend.service.in | 1 + src/libxl/virtxend.sysconf | 3 - src/locking/meson.build | 5 - src/locking/virtlockd.sysconf | 3 - src/logging/meson.build | 5 - src/logging/virtlogd.sysconf | 3 - src/lxc/meson.build | 5 - src/lxc/virtlxcd.service.in | 1 + src/lxc/virtlxcd.sysconf | 3 - src/meson.build | 16 --- src/network/meson.build | 5 - src/network/virtnetworkd.service.in | 1 + src/network/virtnetworkd.sysconf | 3 - src/node_device/meson.build | 5 - src/node_device/virtnodedevd.service.in | 1 + src/node_device/virtnodedevd.sysconf | 3 - src/nwfilter/meson.build | 5 - src/nwfilter/virtnwfilterd.service.in | 1 + src/nwfilter/virtnwfilterd.sysconf | 3 - src/qemu/meson.build | 5 - src/qemu/virtqemud.service.in | 7 ++ src/qemu/virtqemud.sysconf | 12 --- src/remote/libvirtd.service.in | 7 ++ src/remote/libvirtd.sysconf | 21 ---- src/remote/meson.build | 10 -- src/remote/virtproxyd.service.in | 1 + src/remote/virtproxyd.sysconf | 3 - src/secret/meson.build | 5 - src/secret/virtsecretd.service.in | 1 + src/secret/virtsecretd.sysconf | 3 - src/storage/meson.build | 5 - src/storage/virtstoraged.service.in | 1 + src/storage/virtstoraged.sysconf | 3 - src/vbox/meson.build | 5 - src/vbox/virtvboxd.service.in | 1 + src/vbox/virtvboxd.sysconf | 3 - src/vz/meson.build | 5 - src/vz/virtvzd.service.in | 1 + src/vz/virtvzd.sysconf | 3 - tools/libvirt-guests.sh.in | 40 +++++++ tools/libvirt-guests.sysconf | 50 --------- tools/meson.build | 6 -- 52 files changed, 163 insertions(+), 276 deletions(-) delete mode 100644 src/ch/virtchd.sysconf delete mode 100644 src/interface/virtinterfaced.sysconf delete mode 100644 src/libxl/virtxend.sysconf delete mode 100644 src/locking/virtlockd.sysconf delete mode 100644 src/logging/virtlogd.sysconf delete mode 100644 src/lxc/virtlxcd.sysconf delete mode 100644 src/network/virtnetworkd.sysconf delete mode 100644 src/node_device/virtnodedevd.sysconf delete mode 100644 src/nwfilter/virtnwfilterd.sysconf delete mode 100644 src/qemu/virtqemud.sysconf delete mode 100644 src/remote/libvirtd.sysconf delete mode 100644 src/remote/virtproxyd.sysconf delete mode 100644 src/secret/virtsecretd.sysconf delete mode 100644 src/storage/virtstoraged.sysconf delete mode 100644 src/vbox/virtvboxd.sysconf delete mode 100644 src/vz/virtvzd.sysconf delete mode 100644 tools/libvirt-guests.sysconf diff --git a/NEWS.rst b/NEWS.rst index d95750e776..3e5b790e03 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -15,6 +15,16 @@ v7.6.0 (unreleased) * **Improvements** + * packaging: sysconfig files no longer installed + + libvirt used to provide defaults in various /etc/sysconfig/ files, such + as /etc/sysconfig/libvirt. Since these files are owned by the admin, this + made it difficult to change built-in defaults in case such file was + modified by the admin. The built-in defaults are now part of the provided + systemd unit files, such as libvirtd.service. These unit files continue + to parse sysconfig files, in case they are created by the admin and filled + with the desired key=value pairs. + * **Bug fixes** * qemu: Fix migration with VIR_MIGRATE_NON_SHARED_INC diff --git a/docs/remote.html.in b/docs/remote.html.in index cc8db80c95..1e31af0e60 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -139,7 +139,7 @@ Blank lines and comments beginning with <code>#</code> are ignored. <td> Listen for secure TLS connections on the public TCP/IP port. Note: it is also necessary to start the server in listening mode by - running it with --listen or editing /etc/sysconfig/libvirtd by uncommenting the LIBVIRTD_ARGS="--listen" line + running it with --listen or editing /etc/sysconfig/libvirtd by adding a LIBVIRTD_ARGS="--listen" line to cause the server to come up in listening mode whenever it is started. </td> </tr> diff --git a/libvirt.spec.in b/libvirt.spec.in index cb48dd0be0..0d44629d08 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -197,6 +197,18 @@ %define tls_priority "@LIBVIRT,SYSTEM" +%define libvirt_sc_pre() \ + for sc in %{?*} ; do \ + test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ;\ + mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sysconfig/${sc}.rpmsave.old" ;\ + done \ + %{nil} +%define libvirt_sc_posttrans() \ + for sc in %{?*} ; do \ + test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ;\ + mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sysconfig/${sc}" ;\ + done \ + %{nil} Summary: Library providing a simple virtualization API Name: libvirt @@ -1249,6 +1261,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10 %pre daemon +%libvirt_sc_pre libvirtd virtproxyd virtlogd virtlockd libvirt-guests # 'libvirt' group is just to allow password-less polkit access to # libvirtd. The uid number is irrelevant, so we use dynamic allocation # described at the above link. @@ -1256,21 +1269,6 @@ getent group libvirt >/dev/null || groupadd -r libvirt exit 0 -%post daemon -%global post_units \\\ - virtlockd.socket virtlockd-admin.socket \\\ - virtlogd.socket virtlogd-admin.socket \\\ - libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket \\\ - libvirtd-tcp.socket libvirtd-tls.socket \\\ - libvirtd.service \\\ - libvirt-guests.service - -%systemd_post %post_units - -# request daemon restart in posttrans -mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : -touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : - %preun daemon %global preun_units \\\ libvirtd.service \\\ @@ -1302,10 +1300,28 @@ if [ $1 -ge 1 ] ; then fi %posttrans daemon +%libvirt_sc_posttrans libvirtd virtproxyd virtlogd virtlockd libvirt-guests +%global post_units \\\ + virtlockd.socket virtlockd-admin.socket \\\ + virtlogd.socket virtlogd-admin.socket \\\ + libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket \\\ + libvirtd-tcp.socket libvirtd-tls.socket \\\ + libvirtd.service \\\ + libvirt-guests.service + +%systemd_post %post_units + +# request daemon restart in posttrans +mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : +touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : + if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then # See if user has previously modified their install to # tell libvirtd to use --listen - grep -E '^LIBVIRTD_ARGS=.*--listen' /etc/sysconfig/libvirtd 1>/dev/null 2>&1 + if test -f /etc/sysconfig/libvirtd + then + grep -E '^LIBVIRTD_ARGS=.*--listen' /etc/sysconfig/libvirtd 1>/dev/null 2>&1 + fi if test $? = 0 then # Then lets keep honouring --listen and *not* use @@ -1417,23 +1433,6 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : -%if %{with_qemu} -%pre daemon-driver-qemu -# We want soft static allocation of well-known ids, as disk images -# are commonly shared across NFS mounts by id rather than name; see -# https://fedoraproject.org/wiki/Packaging:UsersAndGroups -getent group kvm >/dev/null || groupadd -f -g 36 -r kvm -getent group qemu >/dev/null || groupadd -f -g 107 -r qemu -if ! getent passwd qemu >/dev/null; then - if ! getent passwd 107 >/dev/null; then - useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu - else - useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu - fi -fi -exit 0 -%endif - %if %{with_lxc} %pre login-shell getent group virtlogin >/dev/null || groupadd -r virtlogin @@ -1470,16 +1469,11 @@ exit 0 %{_unitdir}/virtlockd.socket %{_unitdir}/virtlockd-admin.socket %{_unitdir}/libvirt-guests.service -%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd -%config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd -%config(noreplace) %{_sysconfdir}/sysconfig/virtlogd -%config(noreplace) %{_sysconfdir}/sysconfig/virtlockd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf -%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd @@ -1550,8 +1544,11 @@ exit 0 %{_datadir}/libvirt/nwfilter/*.xml %ghost %{_sysconfdir}/libvirt/nwfilter/*.xml +%pre daemon-driver-interface +%libvirt_sc_posttrans virtinterfaced +%posttrans daemon-driver-interface +%libvirt_sc_posttrans virtinterfaced %files daemon-driver-interface -%config(noreplace) %{_sysconfdir}/sysconfig/virtinterfaced %config(noreplace) %{_sysconfdir}/libvirt/virtinterfaced.conf %{_datadir}/augeas/lenses/virtinterfaced.aug %{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug @@ -1563,8 +1560,11 @@ exit 0 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so %{_mandir}/man8/virtinterfaced.8* +%pre daemon-driver-network +%libvirt_sc_posttrans virtnetworkd +%posttrans daemon-driver-network +%libvirt_sc_posttrans virtnetworkd %files daemon-driver-network -%config(noreplace) %{_sysconfdir}/sysconfig/virtnetworkd %config(noreplace) %{_sysconfdir}/libvirt/virtnetworkd.conf %{_datadir}/augeas/lenses/virtnetworkd.aug %{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug @@ -1587,8 +1587,11 @@ exit 0 %{_prefix}/lib/firewalld/zones/libvirt.xml %endif +%pre daemon-driver-nodedev +%libvirt_sc_posttrans virtnodedevd +%posttrans daemon-driver-nodedev +%libvirt_sc_posttrans virtnodedevd %files daemon-driver-nodedev -%config(noreplace) %{_sysconfdir}/sysconfig/virtnodedevd %config(noreplace) %{_sysconfdir}/libvirt/virtnodedevd.conf %{_datadir}/augeas/lenses/virtnodedevd.aug %{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug @@ -1600,8 +1603,11 @@ exit 0 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so %{_mandir}/man8/virtnodedevd.8* +%pre daemon-driver-nwfilter +%libvirt_sc_posttrans virtnwfilterd +%posttrans daemon-driver-nwfilter +%libvirt_sc_posttrans virtnwfilterd %files daemon-driver-nwfilter -%config(noreplace) %{_sysconfdir}/sysconfig/virtnwfilterd %config(noreplace) %{_sysconfdir}/libvirt/virtnwfilterd.conf %{_datadir}/augeas/lenses/virtnwfilterd.aug %{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug @@ -1615,8 +1621,11 @@ exit 0 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %{_mandir}/man8/virtnwfilterd.8* +%pre daemon-driver-secret +%libvirt_sc_posttrans virtsecretd +%posttrans daemon-driver-secret +%libvirt_sc_posttrans virtsecretd %files daemon-driver-secret -%config(noreplace) %{_sysconfdir}/sysconfig/virtsecretd %config(noreplace) %{_sysconfdir}/libvirt/virtsecretd.conf %{_datadir}/augeas/lenses/virtsecretd.aug %{_datadir}/augeas/lenses/tests/test_virtsecretd.aug @@ -1630,8 +1639,11 @@ exit 0 %files daemon-driver-storage +%pre daemon-driver-storage-core +%libvirt_sc_posttrans virtstoraged +%posttrans daemon-driver-storage-core +%libvirt_sc_posttrans virtstoraged %files daemon-driver-storage-core -%config(noreplace) %{_sysconfdir}/sysconfig/virtstoraged %config(noreplace) %{_sysconfdir}/libvirt/virtstoraged.conf %{_datadir}/augeas/lenses/virtstoraged.aug %{_datadir}/augeas/lenses/tests/test_virtstoraged.aug @@ -1688,8 +1700,25 @@ exit 0 %endif %if %{with_qemu} +%pre daemon-driver-qemu +%libvirt_sc_pre virtqemud +# We want soft static allocation of well-known ids, as disk images +# are commonly shared across NFS mounts by id rather than name; see +# https://fedoraproject.org/wiki/Packaging:UsersAndGroups +getent group kvm >/dev/null || groupadd -f -g 36 -r kvm +getent group qemu >/dev/null || groupadd -f -g 107 -r qemu +if ! getent passwd qemu >/dev/null; then + if ! getent passwd 107 >/dev/null; then + useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu + else + useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu + fi +fi +exit 0 + +%posttrans daemon-driver-qemu +%libvirt_sc_posttrans virtqemud %files daemon-driver-qemu -%config(noreplace) %{_sysconfdir}/sysconfig/virtqemud %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf %{_datadir}/augeas/lenses/virtqemud.aug %{_datadir}/augeas/lenses/tests/test_virtqemud.aug @@ -1717,8 +1746,11 @@ exit 0 %endif %if %{with_lxc} +%pre daemon-driver-lxc +%libvirt_sc_pre virtlxcd +%posttrans daemon-driver-lxc +%libvirt_sc_posttrans virtlxcd %files daemon-driver-lxc -%config(noreplace) %{_sysconfdir}/sysconfig/virtlxcd %config(noreplace) %{_sysconfdir}/libvirt/virtlxcd.conf %{_datadir}/augeas/lenses/virtlxcd.aug %{_datadir}/augeas/lenses/tests/test_virtlxcd.aug @@ -1740,8 +1772,11 @@ exit 0 %endif %if %{with_libxl} +%pre daemon-driver-libxl +%libvirt_sc_pre virtxend +%posttrans daemon-driver-libxl +%libvirt_sc_posttrans virtxend %files daemon-driver-libxl -%config(noreplace) %{_sysconfdir}/sysconfig/virtxend %config(noreplace) %{_sysconfdir}/libvirt/virtxend.conf %{_datadir}/augeas/lenses/virtxend.aug %{_datadir}/augeas/lenses/tests/test_virtxend.aug @@ -1763,8 +1798,11 @@ exit 0 %endif %if %{with_vbox} +%pre daemon-driver-vbox +%libvirt_sc_pre virtvboxd +%posttrans daemon-driver-vbox +%libvirt_sc_posttrans virtvboxd %files daemon-driver-vbox -%config(noreplace) %{_sysconfdir}/sysconfig/virtvboxd %config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf %{_datadir}/augeas/lenses/virtvboxd.aug %{_datadir}/augeas/lenses/tests/test_virtvboxd.aug diff --git a/src/ch/meson.build b/src/ch/meson.build index e34974d56c..22d4366a21 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -62,11 +62,6 @@ if conf.has('WITH_CH') 'sockets': [ 'main', 'ro', 'admin' ], } - sysconf_files += { - 'name': 'virtchd', - 'file': files('virtchd.sysconf'), - } - virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'ch', runstatedir / 'libvirt' / 'ch', diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in index cc1e85d1df..f08339f211 100644 --- a/src/ch/virtchd.service.in +++ b/src/ch/virtchd.service.in @@ -18,6 +18,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTCHD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtchd ExecStart=@sbindir@/virtchd $VIRTCHD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/ch/virtchd.sysconf b/src/ch/virtchd.sysconf deleted file mode 100644 index 5ee44be5cf..0000000000 --- a/src/ch/virtchd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtchd.service systemd unit - -VIRTCHD_ARGS="--timeout 120" diff --git a/src/interface/meson.build b/src/interface/meson.build index 46076921ba..360f2ed8a3 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -55,9 +55,4 @@ if conf.has('WITH_INTERFACE') 'name': 'virtinterfaced', 'in_file': files('virtinterfaced.init.in') } - - sysconf_files += { - 'name': 'virtinterfaced', - 'file': files('virtinterfaced.sysconf'), - } endif diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in index 73d409b81b..3d944e17a9 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -13,6 +13,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTINTERFACED_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/interface/virtinterfaced.sysconf b/src/interface/virtinterfaced.sysconf deleted file mode 100644 index 0685da31b8..0000000000 --- a/src/interface/virtinterfaced.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtinterfaced.service systemd unit - -VIRTINTERFACED_ARGS="--timeout 120" diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 9793899106..8347a3c966 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -78,11 +78,6 @@ if conf.has('WITH_LIBXL') 'in_file': files('virtxend.init.in'), } - sysconf_files += { - 'name': 'virtxend', - 'file': files('virtxend.sysconf'), - } - virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'libxl', runstatedir / 'libvirt' / 'libxl', diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index a863917467..7175feff1c 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -17,6 +17,7 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=notify +Environment=VIRTXEND_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtxend ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/libxl/virtxend.sysconf b/src/libxl/virtxend.sysconf deleted file mode 100644 index 301da47e8d..0000000000 --- a/src/libxl/virtxend.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtxend.service systemd unit - -VIRTXEND_ARGS="--timeout 120" diff --git a/src/locking/meson.build b/src/locking/meson.build index 184d3c3f56..72f7780438 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -156,11 +156,6 @@ if conf.has('WITH_LIBVIRTD') 'in_file': files('virtlockd.init.in'), } - sysconf_files += { - 'name': 'virtlockd', - 'file': files('virtlockd.sysconf'), - } - if conf.has('WITH_SANLOCK') virt_helpers += { 'name': 'libvirt_sanlock_helper', diff --git a/src/locking/virtlockd.sysconf b/src/locking/virtlockd.sysconf deleted file mode 100644 index 03aea9e1bc..0000000000 --- a/src/locking/virtlockd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtlockd.service systemd unit - -VIRTLOCKD_ARGS="" diff --git a/src/logging/meson.build b/src/logging/meson.build index 996d4265fc..f06be6050d 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -96,11 +96,6 @@ if conf.has('WITH_LIBVIRTD') 'name': 'virtlogd', 'in_file': files('virtlogd.init.in'), } - - sysconf_files += { - 'name': 'virtlogd', - 'file': files('virtlogd.sysconf'), - } endif log_inc_dir = include_directories('.') diff --git a/src/logging/virtlogd.sysconf b/src/logging/virtlogd.sysconf deleted file mode 100644 index 67993e83ce..0000000000 --- a/src/logging/virtlogd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtlogd.service systemd unit - -VIRTLOGD_ARGS="" diff --git a/src/lxc/meson.build b/src/lxc/meson.build index ad5c659dba..c1f71b43e1 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -175,11 +175,6 @@ if conf.has('WITH_LXC') 'in_file': files('virtlxcd.init.in'), } - sysconf_files += { - 'name': 'virtlxcd', - 'file': files('virtlxcd.sysconf'), - } - virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'lxc', runstatedir / 'libvirt' / 'lxc', diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index 3af7c1a52d..d58bde9f5d 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -18,6 +18,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTLXCD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/lxc/virtlxcd.sysconf b/src/lxc/virtlxcd.sysconf deleted file mode 100644 index 119a4a23f3..0000000000 --- a/src/lxc/virtlxcd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtlxcd.service systemd unit - -VIRTLXCD_ARGS="--timeout 120" diff --git a/src/meson.build b/src/meson.build index 2bd88e6699..9ee8b987ae 100644 --- a/src/meson.build +++ b/src/meson.build @@ -208,12 +208,6 @@ virt_daemon_units = [] # * in_file - source init file (required) openrc_init_files = [] -# sysconf_files -# install libvirt daemon sysconf files -# * name - daemon name (required) -# * file - source sysconf file (required) -sysconf_files = [] - # virt_install_dirs: # list of directories to create during installation virt_install_dirs = [] @@ -868,16 +862,6 @@ if conf.has('WITH_LIBVIRTD') endif endif -if init_script != 'none' - foreach sysconf : sysconf_files - install_data( - sysconf['file'], - install_dir: sysconfdir / 'sysconfig', - rename: [ sysconf['name'] ], - ) - endforeach -endif - if conf.has('WITH_DTRACE_PROBES') custom_target( 'libvirt_functions.stp', diff --git a/src/network/meson.build b/src/network/meson.build index d6fb624bb7..e7c43bc4c4 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -72,11 +72,6 @@ if conf.has('WITH_NETWORK') 'in_file': files('virtnetworkd.init.in'), } - sysconf_files += { - 'name': 'virtnetworkd', - 'file': files('virtnetworkd.sysconf'), - } - virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'network', localstatedir / 'lib' / 'libvirt' / 'dnsmasq', diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in index 4c39d2a5d7..3decfbbf1d 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -16,6 +16,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTNETWORKD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/network/virtnetworkd.sysconf b/src/network/virtnetworkd.sysconf deleted file mode 100644 index 93f3a7a327..0000000000 --- a/src/network/virtnetworkd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtnetworkd.service systemd unit - -VIRTNETWORKD_ARGS="--timeout 120" diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 15f9c3ad29..5013d825b3 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -62,9 +62,4 @@ if conf.has('WITH_NODE_DEVICES') 'name': 'virtnodedevd', 'in_file': files('virtnodedevd.init.in'), } - - sysconf_files += { - 'name': 'virtnodedevd', - 'file': files('virtnodedevd.sysconf'), - } endif diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in index d2453dd620..688cf89822 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -13,6 +13,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTNODEDEVD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/node_device/virtnodedevd.sysconf b/src/node_device/virtnodedevd.sysconf deleted file mode 100644 index fa7faa3a79..0000000000 --- a/src/node_device/virtnodedevd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtnodedevd.service systemd unit - -VIRTNODEDEVD_ARGS="--timeout 120" diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index a21e575925..ebbe712906 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -61,10 +61,5 @@ if conf.has('WITH_NWFILTER') 'in_file': files('virtnwfilterd.init.in'), } - sysconf_files += { - 'name': 'virtnwfilterd', - 'file': files('virtnwfilterd.sysconf'), - } - subdir('xml') endif diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in index dda7c01a3d..36d00b58f0 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -13,6 +13,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTNWFILTERD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/nwfilter/virtnwfilterd.sysconf b/src/nwfilter/virtnwfilterd.sysconf deleted file mode 100644 index 80cc645ba5..0000000000 --- a/src/nwfilter/virtnwfilterd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtnwfilterd.service systemd unit - -VIRTNWFILTERD_ARGS="--timeout 120" diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 3898d23877..6b4dd58309 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -165,11 +165,6 @@ if conf.has('WITH_QEMU') 'in_file': files('virtqemud.init.in'), } - sysconf_files += { - 'name': 'virtqemud', - 'file': files('virtqemud.sysconf'), - } - virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'qemu', runstatedir / 'libvirt' / 'qemu', diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 8abc9d3a7f..de5e311b2f 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -18,6 +18,13 @@ Documentation=https://libvirt.org [Service] Type=notify +# Override the QEMU/SDL default audio driver probing when +# starting virtual machines using SDL graphics +# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio +# is enabled in /etc/libvirt/qemu.conf +#Environment=QEMU_AUDIO_DRV=sdl +#Environment=SDL_AUDIODRIVER=pulse +Environment=VIRTQEMUD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf deleted file mode 100644 index 87b626e3ed..0000000000 --- a/src/qemu/virtqemud.sysconf +++ /dev/null @@ -1,12 +0,0 @@ -# Customizations for the virtqemud.service systemd unit - -VIRTQEMUD_ARGS="--timeout 120" - -# Override the QEMU/SDL default audio driver probing when -# starting virtual machines using SDL graphics -# -# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio -# is enabled in /etc/libvirt/qemu.conf -#QEMU_AUDIO_DRV=sdl -# -#SDL_AUDIODRIVER=pulse diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index cc0d4e3693..4d6b0510ae 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -28,6 +28,13 @@ Documentation=https://libvirt.org [Service] Type=notify +# Override the QEMU/SDL default audio driver probing when +# starting virtual machines using SDL graphics +# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio +# is enabled in /etc/libvirt/qemu.conf +#Environment=QEMU_AUDIO_DRV=sdl +#Environment=SDL_AUDIODRIVER=pulse +Environment=LIBVIRTD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/remote/libvirtd.sysconf b/src/remote/libvirtd.sysconf deleted file mode 100644 index 18aec1ba67..0000000000 --- a/src/remote/libvirtd.sysconf +++ /dev/null @@ -1,21 +0,0 @@ -# Customizations for the libvirtd.service systemd unit - -# Default behaviour is for libvirtd.service to start on boot -# so that VM autostart can be performed. We then want it to -# shutdown again if nothing was started and rely on systemd -# socket activation to start it again when some client app -# connects. -LIBVIRTD_ARGS="--timeout 120" - -# If systemd socket activation is disabled, then the following -# can be used to listen on TCP/TLS sockets -#LIBVIRTD_ARGS="--listen" - -# Override the QEMU/SDL default audio driver probing when -# starting virtual machines using SDL graphics -# -# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio -# is enabled in /etc/libvirt/qemu.conf -#QEMU_AUDIO_DRV=sdl -# -#SDL_AUDIODRIVER=pulse diff --git a/src/remote/meson.build b/src/remote/meson.build index 0a188268b5..fc98d0e5be 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -204,11 +204,6 @@ if conf.has('WITH_REMOTE') 'confd': files('libvirtd.confd'), } - sysconf_files += { - 'name': 'libvirtd', - 'file': files('libvirtd.sysconf'), - } - virt_daemons += { 'name': 'virtproxyd', 'c_args': [ @@ -239,11 +234,6 @@ if conf.has('WITH_REMOTE') 'confd': files('virtproxyd.confd'), } - sysconf_files += { - 'name': 'virtproxyd', - 'file': files('virtproxyd.sysconf'), - } - virt_install_dirs += [ localstatedir / 'log' / 'libvirt', ] diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in index f43ce9ee6e..10e8cf7263 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -13,6 +13,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTPROXYD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/remote/virtproxyd.sysconf b/src/remote/virtproxyd.sysconf deleted file mode 100644 index 0fc5c61096..0000000000 --- a/src/remote/virtproxyd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtproxyd.service systemd unit - -VIRTPROXYD_ARGS="--timeout 120" diff --git a/src/secret/meson.build b/src/secret/meson.build index a487055cde..efc0ebb1e6 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -43,9 +43,4 @@ if conf.has('WITH_SECRETS') 'name': 'virtsecretd', 'in_file': files('virtsecretd.init.in'), } - - sysconf_files += { - 'name': 'virtsecretd', - 'file': files('virtsecretd.sysconf'), - } endif diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in index 8444142a3a..cbd63fe0b2 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -13,6 +13,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTSECRETD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/secret/virtsecretd.sysconf b/src/secret/virtsecretd.sysconf deleted file mode 100644 index 2247d05964..0000000000 --- a/src/secret/virtsecretd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtsecretd.service systemd unit - -VIRTSECRETD_ARGS="--timeout 120" diff --git a/src/storage/meson.build b/src/storage/meson.build index 915ae46f61..db687784ab 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -125,11 +125,6 @@ if conf.has('WITH_STORAGE') 'name': 'virtstoraged', 'in_file': files('virtstoraged.init.in'), } - - sysconf_files += { - 'name': 'virtstoraged', - 'file': files('virtstoraged.sysconf'), - } endif if conf.has('WITH_STORAGE_DISK') diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in index fc3e9a1b69..f72f8426fd 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -15,6 +15,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTSTORAGED_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/storage/virtstoraged.sysconf b/src/storage/virtstoraged.sysconf deleted file mode 100644 index 122373eb7c..0000000000 --- a/src/storage/virtstoraged.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtstoraged.service systemd unit - -VIRTSTORAGED_ARGS="--timeout 120" diff --git a/src/vbox/meson.build b/src/vbox/meson.build index df0cfb40e8..240f2389a9 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -68,9 +68,4 @@ if conf.has('WITH_VBOX') 'name': 'virtvboxd', 'in_file': files('virtvboxd.init.in'), } - - sysconf_files += { - 'name': 'virtvboxd', - 'file': files('virtvboxd.sysconf'), - } endif diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index ebb31dde07..cfdafc39d2 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -14,6 +14,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTVBOXD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/vbox/virtvboxd.sysconf b/src/vbox/virtvboxd.sysconf deleted file mode 100644 index 37ad353d54..0000000000 --- a/src/vbox/virtvboxd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtvboxd.service systemd unit - -VIRTVBOXD_ARGS="--timeout 120" diff --git a/src/vz/meson.build b/src/vz/meson.build index 14f7280f66..d102696943 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -58,9 +58,4 @@ if conf.has('WITH_VZ') 'name': 'virtvzd', 'in_file': files('virtvzd.init.in'), } - - sysconf_files += { - 'name': 'virtvzd', - 'file': files('virtvzd.sysconf'), - } endif diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in index f551cb8fbf..7636bf2b9e 100644 --- a/src/vz/virtvzd.service.in +++ b/src/vz/virtvzd.service.in @@ -14,6 +14,7 @@ Documentation=https://libvirt.org [Service] Type=notify +Environment=VIRTVZD_ARGS="--timeout 120" EnvironmentFile=-@sysconfdir@/sysconfig/virtvzd ExecStart=@sbindir@/virtvzd $VIRTVZD_ARGS ExecReload=/bin/kill -HUP $MAINPID diff --git a/src/vz/virtvzd.sysconf b/src/vz/virtvzd.sysconf deleted file mode 100644 index a86b9dfb6c..0000000000 --- a/src/vz/virtvzd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtvzd.service systemd unit - -VIRTVZD_ARGS="--timeout 120" diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 87f96af14d..74ca969468 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -30,13 +30,53 @@ test ! -r "$sysconfdir"/rc.d/init.d/functions || export TEXTDOMAIN="@PACKAGE@" TEXTDOMAINDIR="@localedir@" +# URIs to check for running guests +# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' URIS="default" + +# action taken on host boot +# - start all guests which were running on shutdown are started on boot +# regardless on their autostart settings +# - ignore libvirt-guests init script won't start any guest on boot, however, +# guests marked as autostart will still be automatically started by +# libvirtd ON_BOOT="start" + +# action taken on host shutdown +# - suspend all running guests are suspended using virsh managedsave +# - shutdown all running guests are asked to shutdown. Please be careful with +# this settings since there is no way to distinguish between a +# guest which is stuck or ignores shutdown requests and a guest +# which just needs a long time to shutdown. When setting +# ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a +# value suitable for your guests. ON_SHUTDOWN="suspend" + +# Number of seconds we're willing to wait for a guest to shut down. If parallel +# shutdown is enabled, this timeout applies as a timeout for shutting down all +# guests on a single URI defined in the variable URIS. If this is 0, then there +# is no time out (use with caution, as guests might not respond to a shutdown +# request). The default value is 300 seconds (5 minutes). SHUTDOWN_TIMEOUT=300 + +# Number of guests will be shutdown concurrently, taking effect when +# "ON_SHUTDOWN" is set to "shutdown". If Set to 0, guests will be shutdown one +# after another. Number of guests on shutdown at any time will not exceed number +# set in this variable. PARALLEL_SHUTDOWN=0 + +# Number of seconds to wait between each guest start. Set to 0 to allow +# parallel startup. START_DELAY=0 + +# If non-zero, try to bypass the file system cache when saving and +# restoring guests, even though this may give slower operation for +# some file systems. BYPASS_CACHE=0 + +# If non-zero, try to sync guest time on domain resume. Be aware, that +# this requires guest agent with support for time synchronization +# running in the guest. By default, this functionality is turned off. SYNC_TIME=0 test -f "$sysconfdir"/sysconfig/libvirt-guests && diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf deleted file mode 100644 index 4f83edab90..0000000000 --- a/tools/libvirt-guests.sysconf +++ /dev/null @@ -1,50 +0,0 @@ -# Customizations for the libvirt-guests.service systemd unit - -# URIs to check for running guests -# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' -#URIS=default - -# action taken on host boot -# - start all guests which were running on shutdown are started on boot -# regardless on their autostart settings -# - ignore libvirt-guests init script won't start any guest on boot, however, -# guests marked as autostart will still be automatically started by -# libvirtd -#ON_BOOT=start - -# Number of seconds to wait between each guest start. Set to 0 to allow -# parallel startup. -#START_DELAY=0 - -# action taken on host shutdown -# - suspend all running guests are suspended using virsh managedsave -# - shutdown all running guests are asked to shutdown. Please be careful with -# this settings since there is no way to distinguish between a -# guest which is stuck or ignores shutdown requests and a guest -# which just needs a long time to shutdown. When setting -# ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a -# value suitable for your guests. -#ON_SHUTDOWN=suspend - -# Number of guests will be shutdown concurrently, taking effect when -# "ON_SHUTDOWN" is set to "shutdown". If Set to 0, guests will be shutdown one -# after another. Number of guests on shutdown at any time will not exceed number -# set in this variable. -#PARALLEL_SHUTDOWN=0 - -# Number of seconds we're willing to wait for a guest to shut down. If parallel -# shutdown is enabled, this timeout applies as a timeout for shutting down all -# guests on a single URI defined in the variable URIS. If this is 0, then there -# is no time out (use with caution, as guests might not respond to a shutdown -# request). The default value is 300 seconds (5 minutes). -#SHUTDOWN_TIMEOUT=300 - -# If non-zero, try to bypass the file system cache when saving and -# restoring guests, even though this may give slower operation for -# some file systems. -#BYPASS_CACHE=0 - -# If non-zero, try to sync guest time on domain resume. Be aware, that -# this requires guest agent with support for time synchronization -# running in the guest. By default, this functionality is turned off. -#SYNC_TIME=1 diff --git a/tools/meson.build b/tools/meson.build index 2acf7b0aaf..ab1067017b 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -273,12 +273,6 @@ configure_file( ) if init_script == 'systemd' - install_data( - 'libvirt-guests.sysconf', - install_dir: sysconfdir / 'sysconfig', - rename: 'libvirt-guests', - ) - configure_file( input: 'libvirt-guests.service.in', output: '@BASENAME@',

3 14

[PATCH] conf: remove unnecessary restore in virDomainSEVDefParseXML
by Boris Fiuczynski 22 Jul '21

22 Jul '21

Since commit d399a728f4 placed the restore in the right scope the restore can get removed in virDomainSEVDefParseXML. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/conf/domain_conf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 13b7741eb8..ac3f5ff4a3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14727,7 +14727,6 @@ static int virDomainSEVDefParseXML(virDomainSEVDef *def, xmlXPathContextPtr ctxt) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned long policy; int rc; -- 2.31.1

2 1

[libvirt PATCH v2 0/2] Fail tests on UBSAN findings
by Tim Wiederhake 22 Jul '21

22 Jul '21

V1: https://listman.redhat.com/archives/libvir-list/2021-July/msg00592.html Changes since V1: Simplified series by using the approach mentioned in https://listman.redhat.com/archives/libvir-list/2021-June/msg00358.html Tim Wiederhake (2): virFileReadLimFD: Cast maxlen to size_t before adding ci: Halt on sanitizer errors .gitlab-ci.yml | 2 ++ src/util/virfile.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.31.1

2 4

[libvirt PATCH 0/4] CI: Fail tests on UBSAN findings
by Tim Wiederhake 22 Jul '21

22 Jul '21

The undefined behaviour sanitizer (UBSAN) defaults to merely printing an error message if it detects undefined behaviour. These error messages often end up in captured output and do not fail the tests, effectively hiding the warning. This series fixes all previously hidden issues and makes UBSAN fail the tests in the CI, if it detects undefined behaviour. See https://listman.redhat.com/archives/libvir-list/2021-June/msg00341.html for background on the change to virFileReadLimFD usage. Tim Wiederhake (4): virfile: Move max file size macro virfile: Use VIR_MAX_FILE_LEN instead of INT_MAX to limit file size virFileReadLimFD: Limit maximum file size to INT_MAX - 1 ci: Halt on sanitizer errors .gitlab-ci.yml | 2 ++ src/security/security_apparmor.c | 4 ++-- src/security/security_apparmor.h | 1 - src/security/virt-aa-helper.c | 10 +++++----- src/util/virfile.c | 2 +- src/util/virfile.h | 3 +++ tests/networkxml2firewalltest.c | 2 +- tests/testutils.c | 5 +++-- 8 files changed, 17 insertions(+), 12 deletions(-) -- 2.31.1

5 13

[PATCH] conf: Restore ctxt's node in right scope
by Zhenzhong Duan 22 Jul '21

22 Jul '21

We just found <qemu:commandline> is ignored in our xml. Further debug shows that ctxt's node pointer isn't restored in virDomainSecDefParseXML(), which leads to parsing of remaining elements failed. Signed-off-by: Zhenzhong Duan <zhenzhong.duan(a)intel.com> --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e05ea9ba88..13b7741eb8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14772,6 +14772,7 @@ static virDomainSecDef * virDomainSecDefParseXML(xmlNodePtr lsecNode, xmlXPathContextPtr ctxt) { + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autoptr(virDomainSecDef) sec = g_new0(virDomainSecDef, 1); ctxt->node = lsecNode; -- 2.25.1

2 1

[PATCH v3 13/13] docs/deprecated: deprecate passing plugin args through `arg=`
by Mahmoud Mandour 22 Jul '21

22 Jul '21

Signed-off-by: Mahmoud Mandour <ma.mandourr(a)gmail.com> --- docs/system/deprecated.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index e2e0090878..7ae6f1f727 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -126,6 +126,13 @@ other options have been processed. This will either have no effect (if if they were not given. The property is therefore useless and should not be specified. +Plugin argument passing through ``arg=<string>`` (since 6.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Passing TCG plugins arguments through ``arg=`` is redundant is makes the +command-line less readable, especially when the argument itself consist of a +name and a value, e.g. ``-plugin plugin_name,arg="arg_name=arg_value"``. +Therefore, the usage of ``arg`` is redundant. QEMU Machine Protocol (QMP) commands ------------------------------------ -- 2.25.1

1 0

[PATCH 0/2] genericxml2xmltest: Refactor test calls
by Kristina Hanicova 21 Jul '21

21 Jul '21

Kristina Hanicova (2): genericxml2xmltest: Substitute 'inactive' variable with 'active' genericxml2xmltest: Refactor DO_TEST_FULL() calls tests/genericxml2xmltest.c | 71 ++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 42 deletions(-) -- 2.31.1

2 4

[PATCH 00/33] qemu: monitor: Clean up qemu monitor event callbacks
by Peter Krempa 21 Jul '21

21 Jul '21

Peter Krempa (33): qemu: monitor: Remove handlers for the 'POWERDOWN' event qemu: monitor: Remove return value from qemuMonitorEmit* functions qemu: Remove return value from qemuMonitorDomainEventCallback qemu: Remove return value from qemuMonitorDomainShutdownCallback qemu: Remove return value from qemuMonitorDomainResetCallback qemu: Remove return value from qemuMonitorDomainStopCallback qemu: Remove return value from qemuMonitorDomainResumeCallback qemu: Remove return value from qemuMonitorDomainRTCChangeCallback qemu: Remove return value from qemuMonitorDomainWatchdogCallback qemu: Remove return value from qemuMonitorDomainIOErrorCallback qemu: Remove return value from qemuMonitorDomainGraphicsCallback qemu: Remove return value from qemuMonitorDomainBlockJobCallback qemu: Remove return value from qemuMonitorDomainJobStatusChangeCallback qemu: Remove return value from qemuMonitorDomainTrayChangeCallback qemu: Remove return value from qemuMonitorDomainPMWakeupCallback qemu: Remove return value from qemuMonitorDomainPMSuspendCallback qemu: Remove return value from qemuMonitorDomainBalloonChangeCallback qemu: Remove return value from qemuMonitorDomainPMSuspendDiskCallback qemu: Remove return value from qemuMonitorDomainGuestPanicCallback qemu: Remove return value from qemuMonitorDomainDeviceDeletedCallback qemu: Remove return value from qemuMonitorDomainNicRxFilterChangedCallback qemu: Remove return value from qemuMonitorDomainSerialChangeCallback qemu: Remove return value from qemuMonitorDomainSpiceMigratedCallback qemu: Remove return value from qemuMonitorDomainMigrationStatusCallback qemu: Remove return value from qemuMonitorDomainMigrationPassCallback qemu: Remove return value from qemuMonitorDomainAcpiOstInfoCallback qemu: Remove return value from qemuMonitorDomainBlockThresholdCallback qemu: Remove return value from qemuMonitorDomainDumpCompletedCallback qemu: Remove return value from qemuMonitorDomainPRManagerStatusChangedCallback qemu: Remove return value from qemuMonitorDomainRdmaGidStatusChangedCallback qemu: Remove return value from qemuMonitorDomainGuestCrashloadedCallback qemu: Remove return value from qemuMonitorDomainMemoryFailureCallback qemu: process: Extract code for submitting event handling to separate thread src/qemu/qemu_monitor.c | 215 +++++------------ src/qemu/qemu_monitor.h | 443 +++++++++++++++++------------------ src/qemu/qemu_monitor_json.c | 7 - src/qemu/qemu_process.c | 236 ++++++------------- src/qemu/qemu_processpriv.h | 8 +- 5 files changed, 363 insertions(+), 546 deletions(-) -- 2.31.1

2 36

[libvirt PATCH] ci: maximize cirrus CI ram/cpu allocation
by Daniel P. Berrangé 21 Jul '21

21 Jul '21

For macOS you always get the maximum configuration by default (12 CPUs, 24 GB RAM), but for FreeBSD you get 2 CPUs, 4 GBs by default. This change increases the allocation to 8 CPUs, 8 GBs for FreeBSD. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- In theory this could make builds quicker. In practice I've not been able to measure a difference due to large variance between runs. .gitlab-ci.yml | 8 ++++++++ ci/cirrus/build.yml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3cb6ff5e6b..24588628f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,6 +114,8 @@ stages: -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" + -e "s|[@]CIRRUS_VM_CPUS@|$CIRRUS_VM_CPUS|g" + -e "s|[@]CIRRUS_VM_RAM@|$CIRRUS_VM_RAM|g" -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" -e "s|[@]UPGRADE_COMMAND@|$UPGRADE_COMMAND|g" -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" @@ -423,6 +425,8 @@ x64-freebsd-12-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-12-2 + CIRRUS_VM_CPUS: 8 + CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y INSTALL_COMMAND: pkg install -y @@ -434,6 +438,8 @@ x64-freebsd-13-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-13-0 + CIRRUS_VM_CPUS: 8 + CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y INSTALL_COMMAND: pkg install -y @@ -445,6 +451,8 @@ x64-macos-11-build: CIRRUS_VM_INSTANCE_TYPE: osx_instance CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_IMAGE_NAME: big-sur-base + CIRRUS_VM_CPUS: 12 + CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update UPGRADE_COMMAND: brew upgrade INSTALL_COMMAND: brew install diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 867d5f297b..e9ad427765 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -1,5 +1,7 @@ @CIRRUS_VM_INSTANCE_TYPE@: @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@ + cpu: @CIRRUS_VM_CPUS@ + memory: @CIRRUS_VM_RAM@ env: CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@" -- 2.31.1

3 6

[libvirt PATCH 00/10] virHashNew refactorings - part VI
by Tim Wiederhake 21 Jul '21

21 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. See https://listman.redhat.com/archives/libvir-list/2021-July/msg00074.html. Tim Wiederhake (10): qemuStateInitialize: `virHashNew` cannot return NULL qemuMonitorGetPRManagerInfo: `virHashNew` cannot return NULL qemuMonitorGetPRManagerInfo: Use automatic memory management qemuMonitorGetPRManagerInfo: Remove superfluous `goto`s qemuMonitorJSONGetAllBlockJobInfo: `virHashNew` cannot return NULL qemuMonitorJSONGetAllBlockJobInfo: Use automatic memory management qemuMonitorJSONGetAllBlockJobInfo: Remove superfluous `goto`s testQemuGetLatestCaps: `virHashNew` cannot return NULL testQemuGetLatestCaps: Use automatic memory management testQemuGetLatestCaps: Remove superfluous `goto`s src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_monitor.c | 13 +++---------- src/qemu/qemu_monitor_json.c | 26 ++++++++------------------ tests/testutilsqemu.c | 13 +++---------- 4 files changed, 15 insertions(+), 40 deletions(-) -- 2.31.1

2 13

[PATCH v5 00/11] Support for launchSecurity type s390-pv
by Boris Fiuczynski 21 Jul '21

21 Jul '21

This patch series introduces the launch security type s390-pv. Specifying s390-pv as launch security type in an s390 domain prepares for running the guest in protected virtualization secure mode, also known as IBM Secure Execution. diff to v4: - changed rng to do the verification for every launchSecurity type - removed previously added XML fail tests - added domain capability documentation diff to v3: - rebased to current master - moved virDomainSEVDef into a union - improved XML formating for launchSecurity - use a shared id on the qemu cmd line for confidential-guest-support - added check for s390-pv host support into XML validation - changed from ignoring to failing if launchSecuroty child elements are provided for s390-pv - reduced test to a single failing test - add availability of s390-pv in domain capabilities diff to v2: - broke up previous patch one into three patches diff to v1: - rebased to current master - added verification check for confidential-guest-support capability Boris Fiuczynski (11): schemas: Refactor launch security conf: Rework SEV XML parse and format methods qemu: Make KVMSupportsSecureGuest capability available conf: Refactor launch security to allow more types qemu: Add s390-pv-guest capability conf: Add s390-pv as launch security type docs: Add s390-pv documentation conf: Add availability of s390-pv in domain capabilities docs: Add s390-pv in domain capabilities documentation qemu: Use common id lsec0 for launchSecurity qemu: Fix error code for SEV launchSecurity unsupported docs/formatdomain.rst | 7 + docs/formatdomaincaps.html.in | 10 ++ docs/kbase/s390_protected_virt.rst | 55 ++++++-- docs/schemas/domaincaps.rng | 9 ++ docs/schemas/domaincommon.rng | 79 ++++++----- src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 130 ++++++++++++------ src/conf/domain_conf.h | 17 ++- src/conf/virconftypes.h | 2 + src/qemu/qemu_capabilities.c | 24 ++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 75 ++++++++-- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_firmware.c | 33 +++-- src/qemu/qemu_namespace.c | 21 ++- src/qemu/qemu_process.c | 35 ++++- src/qemu/qemu_validate.c | 32 ++++- src/security/security_dac.c | 6 +- tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsmock.c | 17 +++ .../launch-security-s390-pv.xml | 18 +++ tests/genericxml2xmltest.c | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../launch-security-s390-pv.s390x-latest.args | 35 +++++ .../launch-security-s390-pv.xml | 30 ++++ ...v-missing-platform-info.x86_64-2.12.0.args | 4 +- .../launch-security-sev.x86_64-2.12.0.args | 4 +- .../launch-security-sev.x86_64-6.0.0.args | 4 +- tests/qemuxml2argvmock.c | 16 +++ tests/qemuxml2argvtest.c | 2 + 38 files changed, 552 insertions(+), 135 deletions(-) create mode 100644 tests/genericxml2xmlindata/launch-security-s390-pv.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.xml -- 2.31.1

2 17

[PATCH] qemu_migration: Unregister close callback only if connection still exists
by Michal Privoznik 21 Jul '21

21 Jul '21

When doing a peer-to-peer migration it may happen that the connection to the destination disappears. If that happens, there's no point in trying to unregister the close callback because the connection is closed already. It results only in polluting logs with this message: error : virNetSocketReadWire:1814 : End of file while reading data: : Input/output error and the reason for that is unregistering a connection callback results in RPC (among other things). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1918211 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_migration.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a4f44b465d..4d651aeb1a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5214,9 +5214,11 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *driver, cleanup: virErrorPreserveLast(&orig_err); - qemuDomainObjEnterRemote(vm); - virConnectUnregisterCloseCallback(dconn, qemuMigrationSrcConnectionClosed); - ignore_value(qemuDomainObjExitRemote(vm, false)); + if (dconn && virConnectIsAlive(dconn) == 1) { + qemuDomainObjEnterRemote(vm); + virConnectUnregisterCloseCallback(dconn, qemuMigrationSrcConnectionClosed); + ignore_value(qemuDomainObjExitRemote(vm, false)); + } virErrorRestore(&orig_err); return ret; } -- 2.31.1

2 1

[libvirt PATCH] virIdentityEnsureSystemToken: Fix error message
by Tim Wiederhake 20 Jul '21

20 Jul '21

This appears to be a copy-paste mistake from the check directly above. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/util/viridentity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/viridentity.c b/src/util/viridentity.c index eb77f69e2e..c18326c8cb 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -284,7 +284,7 @@ virIdentityEnsureSystemToken(void) } else { if (virFileReadLimFD(fd, TOKEN_STRLEN, &token) < 0) { virReportSystemError(errno, - _("Failed to write system token '%s'"), + _("Failed to read system token '%s'"), tokenfile); return NULL; } -- 2.31.1

3 2