- Devel - libvirt List Archives

[PATCH] virDomainDeviceInfoParseXML: Reject '0' value for ACPI index
by Peter Krempa 18 Jan '22

18 Jan '22

Value of '0' is treated equivalently to when it's not provided by the user. Reject an explicit '0' provided by the user as it would get ignored. In this rare case we can make the XML parser more strict, as libvirt would never format the '<acpi/>' element if the index is '0' thus there are no libvirt-generated XMLs we'd not load back, as of such this is identical to rejecting it in the validation phase. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2037146 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a805f7f6a3..393f9d9478 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6786,7 +6786,7 @@ virDomainDeviceInfoParseXML(virDomainXMLOption *xmlopt, } if ((acpi = virXPathNode("./acpi", ctxt))) { - if (virXMLPropUInt(acpi, "index", 10, VIR_XML_PROP_NONE, + if (virXMLPropUInt(acpi, "index", 10, VIR_XML_PROP_NONZERO, &info->acpiIndex) < 0) goto cleanup; } -- 2.34.1

2 1

[PATCH v4 00/13] virdnsmasq: Lookup DNSMASQ in PATH
by Michal Privoznik 18 Jan '22

18 Jan '22

v4 of: https://listman.redhat.com/archives/libvir-list/2022-January/msg00498.html diff to v3: - Removed even more code - Switched from virCommandDryRun to a python script, per Andrea's request - Reordered patches so that the mock doesn't need to redirect stat() - Renamed mock - Removed exec() of 'dnsmasq --help' Michal Prívozník (13): virdnsmasq: Drop @binaryPath argument from dnsmasqCapsNewEmpty() lib: Prefer g_autoptr(dnsmasqCaps) instead of explicit unref virdnsmasq: Drop @force argument of dnsmasqCapsRefreshInternal() virdnsmasq: Drop mtime member from struct _dnsmasqCaps virdnsmasq: Drop noRefresh member from from struct _dnsmasqCaps virdnsmasq: Drop !caps check from dnsmasqCapsRefreshInternal() virdnsmasq: Don't run 'dnsmasq --help' virdnsmasq: Lookup DNSMASQ in PATH virdnsmasq: Require non NULL @caps in dnsmasqCapsGetBinaryPath() networkxml2conftest: Use dnsmasqCapsNewFromBinary() to construct caps networkxml2conftest: Check if capabilities were created successfully virdnsmasq: Drop dnsmasqCapsNewFromBuffer() virdnsmasq: Join dnsmasqCapsNewEmpty() and dnsmasqCapsNewFromBinary() meson.build | 1 - src/libvirt_private.syms | 1 - src/util/virdnsmasq.c | 84 ++++++------------------------------- src/util/virdnsmasq.h | 1 - tests/dnsmasqmock.py | 13 ++++++ tests/meson.build | 1 + tests/networkxml2conftest.c | 13 +++--- tests/virdnsmasqmock.c | 19 +++++++++ 8 files changed, 54 insertions(+), 79 deletions(-) create mode 100755 tests/dnsmasqmock.py create mode 100644 tests/virdnsmasqmock.c -- 2.34.1

3 21

[libvirt PATCH] qemu: Log which API is trying to acquire a job
by Jiri Denemark 18 Jan '22

18 Jan '22

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domainjob.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index c8fe8ad555..1ecde5af86 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -827,9 +827,11 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, unsigned long long duration = 0; unsigned long long agentDuration = 0; unsigned long long asyncDuration = 0; + const char *currentAPI = virThreadJobGet(); - VIR_DEBUG("Starting job: job=%s agentJob=%s asyncJob=%s " + VIR_DEBUG("Starting job: API=%s job=%s agentJob=%s asyncJob=%s " "(vm=%p name=%s, current job=%s agentJob=%s async=%s)", + NULLSTR(currentAPI), qemuDomainJobTypeToString(job), qemuDomainAgentJobTypeToString(agentJob), qemuDomainAsyncJobTypeToString(asyncJob), @@ -931,13 +933,14 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, if (priv->job.asyncJob && priv->job.asyncStarted) asyncDuration = now - priv->job.asyncStarted; - VIR_WARN("Cannot start job (%s, %s, %s) for domain %s; " + VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; " "current job is (%s, %s, %s) " "owned by (%llu %s, %llu %s, %llu %s (flags=0x%lx)) " "for (%llus, %llus, %llus)", qemuDomainJobTypeToString(job), qemuDomainAgentJobTypeToString(agentJob), qemuDomainAsyncJobTypeToString(asyncJob), + NULLSTR(currentAPI), obj->def->name, qemuDomainJobTypeToString(priv->job.active), qemuDomainAgentJobTypeToString(priv->job.agentActive), -- 2.34.1

2 1

[PATCH 0/2] qemuDomainPinIOThread: Update live definition after process pinning
by Peter Krempa 18 Jan '22

18 Jan '22

see 2/2 Peter Krempa (2): qemuDomainPinIOThread: Copy the cpu bitmap instead of re-parsing it qemuDomainPinIOThread: Update live definition after process pinning src/qemu/qemu_driver.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) -- 2.34.1

3 4

[libvirt PATCH 0/6] util: virnetdev: use g_auto for virCommand
by Ján Tomko 18 Jan '22

18 Jan '22

Refactor some functions to remove more manual virCommand freeing. virNetDevBandwidthSet is left untouched. Ján Tomko (6): util: midonet: use g_auto for virCommand util: virNetDevBandwidthUpdateRate: refactor util: virNetDevBandwidthManipulateFilter: use g_auto util: virNetDevBandwidthClear: use g_auto util: refactor virNetDevBandwidthPlug util: refactor virNetDevBandwidthUnplug src/util/virnetdevbandwidth.c | 128 +++++++++++++--------------------- src/util/virnetdevmidonet.c | 20 ++---- 2 files changed, 53 insertions(+), 95 deletions(-) -- 2.31.1

2 7

[libvirt PATCH 0/6] util: openvswitch: cleanup
by Ján Tomko 18 Jan '22

18 Jan '22

Rearrange some code and remove 'cmd' variable reuse to get rid of manual 'virCommandFree' in functions using g_auto. Ján Tomko (6): util: openvswitch: move InterfaceClear{Rx,Tx}Qos util: openvswitch: unexport InterfaceClear{Rx,Tx}Qos util: openvswitch: split out virNetDevOpenvswitchInterfaceSetTxQos util: openvswitch: split out virNetDevOpenvswitchInterfaceSetRxQos util: openvswitch: do not reuse cmd in InterfaceSetTxQos util: openvswitch: do not reuse cmd in InterfaceClearTxQos src/libvirt_private.syms | 2 - src/util/virnetdevopenvswitch.c | 406 +++++++++++++++++--------------- src/util/virnetdevopenvswitch.h | 7 - 3 files changed, 213 insertions(+), 202 deletions(-) -- 2.31.1

2 7

[libvirt PATCH 0/2] dnsmasq: Some small tweaks
by Andrea Bolognani 18 Jan '22

18 Jan '22

Applies on top of Michal's patches. https://listman.redhat.com/archives/libvir-list/2022-January/msg00715.html Andrea Bolognani (2): spec: Drop BuildRequires on dnsmasq util: Stop storing dnsmasq version libvirt.spec.in | 1 - src/util/virdnsmasq.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) -- 2.34.1

2 3

[PATCH v5 00/13] Add riscv kvm accel support
by Yifei Jiang 17 Jan '22

17 Jan '22

This series adds both riscv32 and riscv64 kvm support, and implements migration based on riscv. Because of RISC-V KVM has been merged into the Linux master, so this series are changed from RFC to patch. Several steps to use this: 1. Build emulation $ ./configure --target-list=riscv64-softmmu $ make -j$(nproc) 2. Build kernel 3. Build QEMU VM Cross built in riscv toolchain. $ PKG_CONFIG_LIBDIR=<toolchain pkgconfig path> $ export PKG_CONFIG_SYSROOT_DIR=<toolchain sysroot path> $ ./configure --target-list=riscv64-softmmu --enable-kvm \ --cross-prefix=riscv64-linux-gnu- --disable-libiscsi --disable-glusterfs \ --disable-libusb --disable-usb-redir --audio-drv-list= --disable-opengl \ --disable-libxml2 $ make -j$(nproc) 4. Start emulation $ ./qemu-system-riscv64 -M virt -m 4096M -cpu rv64 -nographic \ -name guest=riscv-hyp,debug-threads=on \ -smp 4 \ -bios ./fw_jump.bin \ -kernel ./Image \ -drive file=./hyp.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" 5. Start kvm-acceled QEMU VM in emulation $ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \ -name guest=riscv-guset \ -smp 2 \ -bios none \ -kernel ./Image \ -drive file=./guest.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" Changes since patch v4 - Commit enable kvm accel as an independent patch. - Bugfix some checkpatch errors. - Bugfix lost a interrupt in the sifive_u machine. Changes since patch v3 - Re-write the for-loop in sifive_plic_create(). - Drop unnecessary change in hw/riscv/virt.c. - Use serial to handle console sbi call. Changes since patch v2 - Create a macro for get and put timer csr. - Remove M-mode PLIC contexts when kvm is enabled. - Add get timer frequency. - Move cpu_host_load to vmstate_kvmtimer. Changes since patch v1 - Rebase on recent commit a216e7cf119c91ffdf5931834a1a030ebea40d70 - Sync-up headers with Linux-5.16-rc4. - Fixbug in kvm_arch_init_vcpu. - Create a macro for get and put regs csr. - Start kernel directly when kvm_enabled. - Use riscv_cpu_set_irq to inject KVM interrupts. - Use the Semihosting Console API for RISC-V kvm handle sbi. - Update vmstate_riscv_cpu version id. Placing kvm_timer into a subsection. Changes since RFC v6 - Rebase on recent commit 8627edfb3f1fca24a96a0954148885c3241c10f8 - Sync-up headers with Linux-5.16-rc1 Changes since RFC v5 - Rebase on QEMU v6.1.0-rc1 and kvm-riscv linux v19. - Move kvm interrupt setting to riscv_cpu_update_mip(). - Replace __u64 with uint64_t. Changes since RFC v4 - Rebase on QEMU v6.0.0-rc2 and kvm-riscv linux v17. - Remove time scaling support as software solution is incomplete. Because it will cause unacceptable performance degradation. and We will post a better solution. - Revise according to Alistair's review comments. - Remove compile time XLEN checks in kvm_riscv_reg_id - Surround TYPE_RISCV_CPU_HOST definition by CONFIG_KVM and share it between RV32 and RV64. - Add kvm-stub.c for reduce unnecessary compilation checks. - Add riscv_setup_direct_kernel() to direct boot kernel for KVM. Changes since RFC v3 - Rebase on QEMU v5.2.0-rc2 and kvm-riscv linux v15. - Add time scaling support(New patches 13, 14 and 15). - Fix the bug that guest vm can't reboot. Changes since RFC v2 - Fix checkpatch error at target/riscv/sbi_ecall_interface.h. - Add riscv migration support. Changes since RFC v1 - Add separate SBI ecall interface header. - Add riscv32 kvm accel support. Yifei Jiang (13): update-linux-headers: Add asm-riscv/kvm.h target/riscv: Add target/riscv/kvm.c to place the public kvm interface target/riscv: Implement function kvm_arch_init_vcpu target/riscv: Implement kvm_arch_get_registers target/riscv: Implement kvm_arch_put_registers target/riscv: Support start kernel directly by KVM target/riscv: Support setting external interrupt by KVM target/riscv: Handle KVM_EXIT_RISCV_SBI exit target/riscv: Add host cpu type target/riscv: Add kvm_riscv_get/put_regs_timer target/riscv: Implement virtual time adjusting with vm state changing target/riscv: Support virtual time context synchronization target/riscv: enable riscv kvm accel hw/intc/sifive_plic.c | 20 +- hw/riscv/boot.c | 16 +- hw/riscv/virt.c | 83 +++-- include/hw/riscv/boot.h | 1 + linux-headers/asm-riscv/kvm.h | 128 +++++++ meson.build | 2 + target/riscv/cpu.c | 29 +- target/riscv/cpu.h | 11 + target/riscv/kvm-stub.c | 30 ++ target/riscv/kvm.c | 535 +++++++++++++++++++++++++++++ target/riscv/kvm_riscv.h | 25 ++ target/riscv/machine.c | 30 ++ target/riscv/meson.build | 1 + target/riscv/sbi_ecall_interface.h | 72 ++++ 14 files changed, 951 insertions(+), 32 deletions(-) create mode 100644 linux-headers/asm-riscv/kvm.h create mode 100644 target/riscv/kvm-stub.c create mode 100644 target/riscv/kvm.c create mode 100644 target/riscv/kvm_riscv.h create mode 100644 target/riscv/sbi_ecall_interface.h -- 2.19.1

3 17

[PATCH v8 0/2] remove sysconfig files
by Olaf Hering 17 Jan '22

17 Jan '22

remove comments for legacy qemu audio remove comments from libvirt-guests script rebased to 4902dc68e555ccf28af3427f75661c54a2fffc0f Olaf Hering (2): remove sysconfig files NEWS: mention removal of sysconfig NEWS.rst | 10 ++++ docs/daemons.rst | 21 ++++++++ docs/remote.html.in | 6 +-- libvirt.spec.in | 69 +++++++++++++++++++------ 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 | 1 + src/qemu/virtqemud.sysconf | 12 ----- src/remote/libvirtd.service.in | 1 + 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.sysconf | 50 ------------------ tools/meson.build | 6 --- 53 files changed, 103 insertions(+), 245 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

2 3

[PATCH V2 0/2] docs: Add man page for libvirt-guests
by Jim Fehlig 17 Jan '22

17 Jan '22

V2 of https://listman.redhat.com/archives/libvir-list/2022-January/msg00336.html Changes since V1: - New patch to only install libvirt-guests when building libvirtd - Only install libvirt-guests man page when building libvirtd - Default config overridden in sysconfig file, not environment Jim Fehlig (2): build: Only install libvirt-guests when building libvirtd docs: Add man page for libvirt-guests docs/manpages/index.rst | 1 + docs/manpages/libvirt-guests.rst | 151 +++++++++++++++++++++++++++++++ docs/manpages/meson.build | 1 + libvirt.spec.in | 1 + tools/libvirt-guests.service.in | 2 +- tools/meson.build | 38 ++++---- 6 files changed, 175 insertions(+), 19 deletions(-) create mode 100644 docs/manpages/libvirt-guests.rst -- 2.34.1

2 5

[PATCH v2] docs: domain: document legacy audio for qemu
by Olaf Hering 17 Jan '22

17 Jan '22

Adding a blurb like this was forgotten in 2009. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- docs/formatdomain.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index d4f30bb8af..f07ea34232 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -7079,6 +7079,20 @@ is permitted with the following attributes. The audio format, one of ``s8``, ``u8``, ``s16``, ``u16``, ``s32``, ``u32``, ``f32``. The default is hypervisor specific. +Note: +If no ``<audio/>`` element is defined, and the ``graphics`` element is set to +either 'vnc' or 'sdl', the libvirtd or virtqemud process will honor the following +environment variables: + +* ``SDL_AUDIODRIVER`` + + Valid values are 'pulseaudio', 'esd', 'alsa' or 'arts'. + +* ``QEMU_AUDIO_DRV`` + + Valid values are 'pa', 'pulseaudio', 'none', 'alsa', 'coreaudio', 'jack', + 'oss', 'sdl', 'spice' or 'file'. + None audio backend ^^^^^^^^^^^^^^^^^^

2 3

[PATCH] testutils: Terminate usage string with a new line
by Michal Privoznik 17 Jan '22

17 Jan '22

If a test binary is executed with an argument then usage information is printed out (that no arguments are accepted and what environment variables affect execution). The string is printed onto stderr but it is not terminated with a newline character producing not so nice output. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. tests/testutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 322c3b9400..2b37c1965d 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -826,7 +826,7 @@ int virTestMain(int argc, fprintf(stderr, "Usage: %s\n", argv[0]); fputs("effective environment variables:\n" "VIR_TEST_VERBOSE set to show names of individual tests\n" - "VIR_TEST_DEBUG set to show information for debugging failures", + "VIR_TEST_DEBUG set to show information for debugging failures\n", stderr); return EXIT_FAILURE; } -- 2.34.1

1 0

[libvirt PATCH v2 0/2] Code style documentation
by Tim Wiederhake 17 Jan '22

17 Jan '22

Some additions and clarifications to libvirt's code style documentation, based on points of feedback that are given regularly on the mailing list. V1: https://listman.redhat.com/archives/libvir-list/2022-January/msg00631.html Changes since V1: * patch 1: Do create typedefs for public types, do not for private types * patches 2 and 3: Pushed * patch 4 (now 2): Rewritten examples as requested Tim Wiederhake (2): docs: coding-style: Clarify on virXXXPtr types docs: coding-style: One variable declaration per line docs/coding-style.rst | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) -- 2.31.1

2 4

[PATCH v3 0/7] virdnsmasq: Lookup DNSMASQ in PATH
by Michal Privoznik 17 Jan '22

17 Jan '22

v3 of: https://listman.redhat.com/archives/libvir-list/2022-January/msg00386.html diff to v2: - Make dnsmasqCapsGetBinaryPath() fail if dnsmasq is not found - Change the way caps are constructed in networkxml2conftest - More code cleanup However, as I was going through the code I realized that what we really do is check dnsmasq's version against the minimal required one (2.67). No actual capabilities are parsed. This is due to cleanup merged earlier this release (v8.0.0-rc1~138 and commits around). While we could drop more code I figured it may be worth keeping it for future use. I mean, one day we might want to have an capability for give feature. Michal Prívozník (7): virdnsmasq: Drop @binaryPath argument from dnsmasqCapsNewEmpty() lib: Prefer g_autoptr(dnsmasqCaps) instead of explicit unref virdnsmasq: Lookup DNSMASQ in PATH virdnsmasq: Require non NULL @caps in dnsmasqCapsGetBinaryPath() networkxml2conftest: Use dnsmasqCapsNewFromBinary() to construct caps virdnsmasq: Drop dnsmasqCapsNewFromBuffer() virdnsmasq: Join dnsmasqCapsNewEmpty() and dnsmasqCapsNewFromBinary() src/libvirt_private.syms | 1 - src/util/virdnsmasq.c | 50 ++++++++----------------------------- src/util/virdnsmasq.h | 1 - tests/meson.build | 1 + tests/networkmock.c | 46 ++++++++++++++++++++++++++++++++++ tests/networkxml2conftest.c | 46 ++++++++++++++++++++++++++++++---- 6 files changed, 98 insertions(+), 47 deletions(-) create mode 100644 tests/networkmock.c -- 2.34.1

3 21

[PATCH v2] libselinux: Strip spaces before values in config
by Vit Mojzis 17 Jan '22

17 Jan '22

Spaces before values in /etc/selinux/config should be ignored just as spaces after them are. E.g. "SELINUXTYPE= targeted" should be a valid value. Fixes: # sed -i 's/^SELINUXTYPE=/SELINUXTYPE= /g' /etc/selinux/config # dnf install <any_package> ... RPM: error: selabel_open: (/etc/selinux/ targeted/contexts/files/file_contexts) No such file or directory RPM: error: Plugin selinux: hook tsm_pre failed ... Error: Could not run transaction. Signed-off-by: Vit Mojzis <vmojzis(a)redhat.com> --- libselinux/src/selinux_config.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libselinux/src/selinux_config.c b/libselinux/src/selinux_config.c index 97f81a8b..d2e49ee1 100644 --- a/libselinux/src/selinux_config.c +++ b/libselinux/src/selinux_config.c @@ -92,6 +92,7 @@ int selinux_getenforcemode(int *enforce) FILE *cfg = fopen(SELINUXCONFIG, "re"); if (cfg) { char *buf; + char *tag; int len = sizeof(SELINUXTAG) - 1; buf = malloc(selinux_page_size); if (!buf) { @@ -101,21 +102,24 @@ int selinux_getenforcemode(int *enforce) while (fgets_unlocked(buf, selinux_page_size, cfg)) { if (strncmp(buf, SELINUXTAG, len)) continue; + tag = buf+len; + while (isspace(*tag)) + tag++; if (!strncasecmp - (buf + len, "enforcing", sizeof("enforcing") - 1)) { + (tag, "enforcing", sizeof("enforcing") - 1)) { *enforce = 1; ret = 0; break; } else if (!strncasecmp - (buf + len, "permissive", + (tag, "permissive", sizeof("permissive") - 1)) { *enforce = 0; ret = 0; break; } else if (!strncasecmp - (buf + len, "disabled", + (tag, "disabled", sizeof("disabled") - 1)) { *enforce = -1; ret = 0; @@ -176,7 +180,10 @@ static void init_selinux_config(void) if (!strncasecmp(buf_p, SELINUXTYPETAG, sizeof(SELINUXTYPETAG) - 1)) { - type = strdup(buf_p + sizeof(SELINUXTYPETAG) - 1); + buf_p += sizeof(SELINUXTYPETAG) - 1; + while (isspace(*buf_p)) + buf_p++; + type = strdup(buf_p); if (!type) { free(line_buf); fclose(fp); @@ -199,6 +206,8 @@ static void init_selinux_config(void) } else if (!strncmp(buf_p, REQUIRESEUSERS, sizeof(REQUIRESEUSERS) - 1)) { value = buf_p + sizeof(REQUIRESEUSERS) - 1; + while (isspace(*value)) + value++; intptr = &require_seusers; } else { continue; -- 2.30.2

1 0

[PATCH 0/3] qemu: Add caps for qemu-7.0 dev cycle and re-enable JSON for -device
by Peter Krempa 17 Jan '22

17 Jan '22

Note that I've truncated the auto-generated stuff out of patches 2/3 and 3/3. For full version: git fetch https://gitlab.com/pipo.sk/libvirt.git device-json-reenable Also note that I've based this on the 'staging' branch of qemu.git currently, which means that there's a small possibility that the pull request will be rejected. I'll make sure to verify that before pushing. Peter Krempa (3): qemuxml2(argv|xml)data: x86-kvm-32-on-64: Add machine type tests: qemucapabilities: Add test data for the qemu-7.0 development cycle qemu: capabilities: Re-enable JSON syntax for -device src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_capabilities.h | 5 +- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 230 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 236 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 230 + .../caps_7.0.0.x86_64.replies | 37261 ++++++++++++++++ .../caps_7.0.0.x86_64.xml | 3717 ++ .../audio-alsa-best.x86_64-latest.args | 4 +- .../audio-alsa-full.x86_64-latest.args | 4 +- .../audio-alsa-minimal.x86_64-latest.args | 4 +- .../audio-coreaudio-best.x86_64-latest.args | 4 +- .../audio-coreaudio-full.x86_64-latest.args | 4 +- ...audio-coreaudio-minimal.x86_64-latest.args | 4 +- ...udio-default-nographics.x86_64-latest.args | 4 +- .../audio-default-sdl.x86_64-latest.args | 6 +- .../audio-default-spice.x86_64-latest.args | 6 +- .../audio-default-vnc.x86_64-latest.args | 6 +- .../audio-file-best.x86_64-latest.args | 4 +- .../audio-file-full.x86_64-latest.args | 4 +- .../audio-file-minimal.x86_64-latest.args | 4 +- .../audio-jack-full.x86_64-latest.args | 4 +- .../audio-jack-minimal.x86_64-latest.args | 4 +- .../audio-many-backends.x86_64-latest.args | 14 +- .../audio-none-best.x86_64-latest.args | 4 +- .../audio-none-full.x86_64-latest.args | 4 +- .../audio-none-minimal.x86_64-latest.args | 4 +- .../audio-oss-best.x86_64-latest.args | 4 +- .../audio-oss-full.x86_64-latest.args | 4 +- .../audio-oss-minimal.x86_64-latest.args | 4 +- .../audio-pulseaudio-best.x86_64-latest.args | 4 +- .../audio-pulseaudio-full.x86_64-latest.args | 4 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 4 +- .../audio-sdl-best.x86_64-latest.args | 4 +- .../audio-sdl-full.x86_64-latest.args | 4 +- .../audio-sdl-minimal.x86_64-latest.args | 4 +- .../audio-spice-best.x86_64-latest.args | 4 +- .../audio-spice-full.x86_64-latest.args | 4 +- .../audio-spice-minimal.x86_64-latest.args | 4 +- .../blkdeviotune-group-num.x86_64-latest.args | 8 +- ...blkdeviotune-max-length.x86_64-latest.args | 8 +- .../blkdeviotune-max.x86_64-latest.args | 8 +- .../blkdeviotune.x86_64-latest.args | 8 +- .../channel-unix-guestfwd.x86_64-latest.args | 4 +- .../console-compat-auto.x86_64-latest.args | 8 +- .../console-compat-chardev.x86_64-latest.args | 8 +- .../console-compat.x86_64-latest.args | 6 +- .../console-virtio-unix.x86_64-latest.args | 10 +- .../controller-usb-order.x86_64-latest.args | 8 +- .../controller-virtio-scsi.x86_64-latest.args | 24 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 4 +- .../cpu-host-model.x86_64-latest.args | 10 +- .../cpu-translation.x86_64-latest.args | 4 +- .../cputune-cpuset-big-id.x86_64-latest.args | 6 +- .../devices-acpi-index.x86_64-latest.args | 16 +- .../disk-aio-io_uring.x86_64-latest.args | 6 +- .../disk-aio.x86_64-latest.args | 8 +- ...-backing-chains-noindex.x86_64-latest.args | 16 +- .../disk-blockio.x86_64-latest.args | 8 +- .../disk-boot-cdrom.x86_64-latest.args | 6 +- .../disk-boot-disk.x86_64-latest.args | 6 +- .../disk-cache.x86_64-latest.args | 14 +- .../disk-cdrom-bus-other.x86_64-latest.args | 6 +- ...m-empty-network-invalid.x86_64-latest.args | 4 +- .../disk-cdrom-network.x86_64-latest.args | 10 +- .../disk-cdrom-tray.x86_64-latest.args | 10 +- .../disk-cdrom.x86_64-latest.args | 10 +- .../disk-copy_on_read.x86_64-latest.args | 12 +- .../disk-detect-zeroes.x86_64-latest.args | 8 +- .../disk-discard.x86_64-latest.args | 8 +- .../disk-error-policy.x86_64-latest.args | 8 +- .../disk-floppy-q35.x86_64-latest.args | 12 +- .../disk-floppy-tray.x86_64-latest.args | 10 +- .../disk-floppy.x86_64-latest.args | 8 +- .../disk-fmt-qcow.x86_64-latest.args | 6 +- .../disk-geometry.x86_64-latest.args | 6 +- .../disk-ide-split.x86_64-latest.args | 8 +- .../disk-ide-wwn.x86_64-latest.args | 6 +- .../disk-ioeventfd.x86_64-latest.args | 12 +- .../disk-metadata-cache.x86_64-latest.args | 8 +- .../disk-network-gluster.x86_64-latest.args | 8 +- .../disk-network-http.x86_64-latest.args | 10 +- .../disk-network-iscsi.x86_64-latest.args | 18 +- .../disk-network-nbd.x86_64-latest.args | 12 +- .../disk-network-nfs.x86_64-latest.args | 6 +- ...-network-rbd-encryption.x86_64-latest.args | 12 +- ...sk-network-rbd-no-colon.x86_64-latest.args | 8 +- .../disk-network-rbd.x86_64-latest.args | 14 +- ...isk-network-source-auth.x86_64-latest.args | 8 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 4 +- .../disk-no-boot.x86_64-latest.args | 8 +- .../disk-nvme.x86_64-latest.args | 12 +- .../disk-order.x86_64-latest.args | 12 +- .../disk-readonly-disk.x86_64-latest.args | 8 +- .../disk-rotation.x86_64-latest.args | 12 +- .../disk-sata-device.x86_64-latest.args | 8 +- .../disk-scsi-device-auto.x86_64-latest.args | 10 +- .../disk-scsi-disk-split.x86_64-latest.args | 20 +- .../disk-scsi-disk-vpd.x86_64-latest.args | 12 +- .../disk-scsi-disk-wwn.x86_64-latest.args | 12 +- ...sk-scsi-lun-passthrough.x86_64-latest.args | 12 +- .../disk-scsi.x86_64-latest.args | 26 +- .../disk-serial.x86_64-latest.args | 8 +- .../disk-shared.x86_64-latest.args | 14 +- .../disk-slices.x86_64-latest.args | 14 +- .../disk-snapshot.x86_64-latest.args | 10 +- .../disk-source-pool-mode.x86_64-latest.args | 12 +- .../disk-source-pool.x86_64-latest.args | 14 +- .../disk-transient.x86_64-latest.args | 6 +- ...sk-usb-device-removable.x86_64-latest.args | 8 +- .../disk-usb-device.x86_64-latest.args | 8 +- .../disk-vhostuser.x86_64-latest.args | 8 +- .../disk-virtio-queues.x86_64-latest.args | 8 +- ...irtio-scsi-reservations.x86_64-latest.args | 10 +- .../disk-virtio.x86_64-latest.args | 10 +- .../encrypted-disk-usage.x86_64-latest.args | 6 +- .../encrypted-disk.x86_64-latest.args | 6 +- .../eoi-disabled.x86_64-latest.args | 4 +- .../eoi-enabled.x86_64-latest.args | 4 +- .../event_idx.x86_64-latest.args | 12 +- ...d-memory-numa-topology4.x86_64-latest.args | 4 +- .../fips-enabled.x86_64-latest.args | 6 +- .../floppy-drive-fat.x86_64-latest.args | 6 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +- .../genid-auto.x86_64-latest.args | 4 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 4 +- ...egl-headless-rendernode.x86_64-latest.args | 6 +- .../graphics-egl-headless.x86_64-latest.args | 6 +- ...s-spice-agent-file-xfer.x86_64-latest.args | 8 +- ...aphics-spice-agentmouse.x86_64-latest.args | 10 +- ...s-spice-auto-socket-cfg.x86_64-latest.args | 4 +- ...phics-spice-auto-socket.x86_64-latest.args | 4 +- ...phics-spice-compression.x86_64-latest.args | 8 +- ...hics-spice-egl-headless.x86_64-latest.args | 6 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 6 +- .../graphics-spice-no-args.x86_64-latest.args | 6 +- .../graphics-spice-qxl-vga.x86_64-latest.args | 8 +- .../graphics-spice-sasl.x86_64-latest.args | 6 +- .../graphics-spice-socket.x86_64-latest.args | 4 +- .../graphics-spice-timeout.x86_64-latest.args | 14 +- ...raphics-spice-usb-redir.x86_64-latest.args | 16 +- .../graphics-spice.x86_64-latest.args | 8 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 6 +- ...raphics-vnc-auto-socket.x86_64-latest.args | 4 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 6 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 6 +- .../graphics-vnc-none.x86_64-latest.args | 4 +- .../graphics-vnc-policy.x86_64-latest.args | 6 +- .../graphics-vnc-power.x86_64-latest.args | 6 +- ...remove-generated-socket.x86_64-latest.args | 6 +- .../graphics-vnc-sasl.x86_64-latest.args | 6 +- ...-vnc-socket-new-cmdline.x86_64-latest.args | 4 +- .../graphics-vnc-socket.x86_64-latest.args | 4 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 4 +- .../graphics-vnc-tls.x86_64-latest.args | 4 +- .../graphics-vnc-websocket.x86_64-latest.args | 4 +- .../graphics-vnc.x86_64-latest.args | 6 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 8 +- ...play-spice-egl-headless.x86_64-latest.args | 6 +- ...ev-display-spice-opengl.x86_64-latest.args | 6 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 6 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +- .../hostdev-scsi-lsi.x86_64-latest.args | 20 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 22 +- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 4 +- .../hyperv-off.x86_64-latest.args | 4 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-passthrough.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../input-linux.x86_64-latest.args | 4 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 2 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +- .../intel-iommu-eim.x86_64-latest.args | 2 +- .../intel-iommu.x86_64-latest.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 10 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 4 +- ...nch-security-sev-direct.x86_64-latest.args | 4 +- ...luks-disks-source-qcow2.x86_64-latest.args | 16 +- .../luks-disks-source.x86_64-latest.args | 14 +- .../luks-disks.x86_64-latest.args | 8 +- ...memory-default-hugepage.x86_64-latest.args | 4 +- .../memfd-memory-numa.x86_64-latest.args | 6 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 8 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 8 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 8 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 8 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 8 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 8 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 10 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 8 +- .../misc-no-reboot.x86_64-latest.args | 4 +- .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- .../name-escape.x86_64-latest.args | 20 +- .../net-vdpa.x86_64-latest.args | 4 +- .../net-vhostuser.x86_64-latest.args | 8 +- .../numatune-hmat.x86_64-latest.args | 4 +- ...emnode-restrictive-mode.x86_64-latest.args | 4 +- .../numatune-memnode.x86_64-latest.args | 4 +- .../numatune-system-memory.x86_64-latest.args | 2 +- .../os-firmware-bios.x86_64-latest.args | 16 +- ...re-efi-no-enrolled-keys.x86_64-latest.args | 6 +- ...os-firmware-efi-secboot.x86_64-latest.args | 16 +- .../os-firmware-efi.x86_64-latest.args | 16 +- .../panic-double.x86_64-latest.args | 4 +- .../panic-no-address.x86_64-latest.args | 8 +- .../qemuxml2argvdata/panic.x86_64-latest.args | 8 +- ...arallel-parport-chardev.x86_64-latest.args | 8 +- .../parallel-tcp-chardev.x86_64-latest.args | 8 +- .../parallel-unix-chardev.x86_64-latest.args | 8 +- ...pi-root-hotplug-disable.x86_64-latest.args | 4 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 4 +- .../pci-serial-dev-chardev.x86_64-latest.args | 8 +- ...cie-root-port-nohotplug.x86_64-latest.args | 18 +- .../pv-spinlock-disabled.x86_64-latest.args | 4 +- .../pv-spinlock-enabled.x86_64-latest.args | 4 +- .../qemu-ns.x86_64-latest.args | 6 +- ...rial-dev-chardev-iobase.x86_64-latest.args | 8 +- .../serial-dev-chardev.x86_64-latest.args | 8 +- .../serial-file-chardev.x86_64-latest.args | 8 +- .../serial-file-log.x86_64-latest.args | 6 +- .../serial-many-chardev.x86_64-latest.args | 10 +- .../serial-pty-chardev.x86_64-latest.args | 8 +- ...erial-spiceport-nospice.x86_64-latest.args | 6 +- .../serial-spiceport.x86_64-latest.args | 12 +- .../serial-tcp-chardev.x86_64-latest.args | 8 +- ...rial-tcp-telnet-chardev.x86_64-latest.args | 8 +- ...p-tlsx509-chardev-notls.x86_64-latest.args | 10 +- ...-tlsx509-chardev-verify.x86_64-latest.args | 10 +- ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 10 +- ...-tlsx509-secret-chardev.x86_64-latest.args | 10 +- .../serial-udp-chardev.x86_64-latest.args | 10 +- .../serial-unix-chardev.x86_64-latest.args | 8 +- .../serial-vc-chardev.x86_64-latest.args | 8 +- ...rtcard-passthrough-unix.x86_64-latest.args | 8 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +- .../tpm-emulator-tpm2.x86_64-latest.args | 6 +- .../tpm-emulator.x86_64-latest.args | 6 +- .../tpm-passthrough-crb.x86_64-latest.args | 6 +- .../tpm-passthrough.x86_64-latest.args | 6 +- .../tseg-explicit-size.x86_64-latest.args | 10 +- .../usb-redir-unix.x86_64-latest.args | 14 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 12 +- ...host-user-gpu-secondary.x86_64-latest.args | 10 +- .../vhost-user-vga.x86_64-latest.args | 8 +- .../vhost-vsock-auto.x86_64-latest.args | 6 +- .../vhost-vsock.x86_64-latest.args | 6 +- ...eo-bochs-display-device.x86_64-latest.args | 8 +- ...video-qxl-device-vram64.x86_64-latest.args | 6 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 8 +- ...eo-ramfb-display-device.x86_64-latest.args | 8 +- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 8 +- .../virtio-9p-createmode.x86_64-latest.args | 14 +- .../virtio-9p-multidevs.x86_64-latest.args | 12 +- .../virtio-lun.x86_64-latest.args | 12 +- ...virtio-non-transitional.x86_64-latest.args | 42 +- ...-options-controller-ats.x86_64-latest.args | 12 +- ...ptions-controller-iommu.x86_64-latest.args | 12 +- ...tions-controller-packed.x86_64-latest.args | 12 +- ...virtio-options-disk-ats.x86_64-latest.args | 8 +- ...rtio-options-disk-iommu.x86_64-latest.args | 8 +- ...tio-options-disk-packed.x86_64-latest.args | 8 +- .../virtio-options-fs-ats.x86_64-latest.args | 8 +- ...virtio-options-fs-iommu.x86_64-latest.args | 8 +- ...irtio-options-fs-packed.x86_64-latest.args | 8 +- ...irtio-options-input-ats.x86_64-latest.args | 8 +- ...tio-options-input-iommu.x86_64-latest.args | 8 +- ...io-options-input-packed.x86_64-latest.args | 8 +- ...-options-memballoon-ats.x86_64-latest.args | 4 +- ...loon-freepage-reporting.x86_64-latest.args | 4 +- ...ptions-memballoon-iommu.x86_64-latest.args | 4 +- ...tions-memballoon-packed.x86_64-latest.args | 4 +- .../virtio-options-net-ats.x86_64-latest.args | 8 +- ...irtio-options-net-iommu.x86_64-latest.args | 8 +- ...rtio-options-net-packed.x86_64-latest.args | 8 +- .../virtio-options-rng-ats.x86_64-latest.args | 8 +- ...irtio-options-rng-iommu.x86_64-latest.args | 8 +- ...rtio-options-rng-packed.x86_64-latest.args | 8 +- ...irtio-options-video-ats.x86_64-latest.args | 8 +- ...tio-options-video-iommu.x86_64-latest.args | 8 +- ...io-options-video-packed.x86_64-latest.args | 8 +- .../virtio-options.x86_64-latest.args | 28 +- .../virtio-rng-builtin.x86_64-latest.args | 6 +- .../virtio-rng-egd-unix.x86_64-latest.args | 6 +- .../virtio-transitional.x86_64-latest.args | 26 +- .../watchdog-device.x86_64-latest.args | 8 +- .../watchdog-dump.x86_64-latest.args | 8 +- .../watchdog-injectnmi.x86_64-latest.args | 8 +- .../watchdog.x86_64-latest.args | 6 +- .../x86-kvm-32-on-64.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.xml | 2 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 14 +- ...efault-cpu-tcg-features.x86_64-latest.args | 10 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 14 +- .../x86_64-pc-graphics.x86_64-latest.args | 20 +- .../x86_64-pc-headless.x86_64-latest.args | 16 +- .../x86_64-q35-graphics.x86_64-latest.args | 34 +- .../x86_64-q35-headless.x86_64-latest.args | 30 +- .../x86-kvm-32-on-64.x86_64-latest.xml | 2 +- 305 files changed, 42883 insertions(+), 1202 deletions(-) create mode 100644 tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_7.0.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml -- 2.34.1

2 6

[libvirt PATCH 0/4] Code style documentation
by Tim Wiederhake 15 Jan '22

15 Jan '22

Some additions and clarifications to libvirt's code style documentation, based on points of feedback that are given regularly on the mailing list. Tim Wiederhake (4): docs: coding-style: Clarify on virXXXPtr types docs: coding-style: Rewrite section on shortening comparisons docs: coding-style: Remove "no_memory" as acceptable goto target docs: coding-style: One variable declaration per line docs/coding-style.rst | 79 ++++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 23 deletions(-) -- 2.31.1

6 15

[libvirt PATCH 0/3] Bump some min versions
by Daniel P. Berrangé 14 Jan '22

14 Jan '22

Given previous platforms we've dropped, we can bump the min compilers. Daniel P. Berrangé (3): configure: bump min required GCC to 7.4.0 configure: bump min required CLang to 6.0 / XCode 10.0 examples: drop some conditionals checks from macros config.h | 14 +++++++------- examples/c/misc/event-test.c | 14 ++------------ 2 files changed, 9 insertions(+), 19 deletions(-) -- 2.33.1

2 4

[RFC 0/1] qemu: update index for serial device using taget.port
by divya 14 Jan '22

14 Jan '22

Issue ----- The port being provided in the xml file of the domain is not being used for the creation of qemu command. On adding the serial device : <serial> <target type='serial' port='3'/> </serial> Generated qemu command will look like : /usr/libexec/qemu-kvm ...\ -device isa-serial,chardev=charserial0,id=serial0 Actually it should be : /usr/libexec/qemu-kvm ...\ -device isa-serial,chardev=charserial0,id=serial0,index=3 Patch ----- Out already for the correction : https://listman.redhat.com/archives/libvir-list/2018-April/msg02302.html This patch was not followed up. According to me there are multiple reasons Reasons for not following up ---------------------------- Index : specifies the index number of a connector port. If not specified, the index is automatically incremented. This logic exists both on qemu as well as libvirt. https://github.com/qemu/qemu/blob/master/hw/char/serial-isa.c#L62 Issue 1: If we want two isa-serial devices and for the first one is we mention the port to be 3, then for the next device it not automatically assign the port number 4 which will throw the following error : error: internal error: process exited while connecting to monitor: 2021-11-12T11:05:31.169987Z qemu-kvm: -device isa-serial,chardev=charserial2,id=serial2,index=5: Max. supported number of ISA serial ports is 4. But we are left with 3 ports (0,1,2) which are unused. So ideally we should have used them. Issue 2: It is possible that two devices get the same port address which might lead to a lot of ambiguity. Example: we want two devices and for the second one we provide the index 0. Then from default logic the first device will be allotted port 0 and the second device will overwrite it and get port 0. Solution : ---------- Port allocation logic 1. Precedence should be given to serial devices as we only have the first 4 ports for them. 1.1. Check the command line/xml file, scan for all the devices mentioned and then start with the isa-serial devices for port allocation. 2.Maintain a buffer(bitmap) for marking the allocated ports. 3.While assigning a port to the device 3.1. If no port is provided by the user : provide the next available port. 3.2. Else check: 3.2.1. If the port is already allocated : throw the error. 3.2.2. Else allocate the port. 3.3. If out of ports : throw error -> qemu throws the error. Libvirt manages the port numbers with the similar logic(auto increment) along with the above mentioned bug. Hence need to add the above patch along with the Port allocation logic. root (1): update index for serial device using taget.port src/conf/domain_conf.c | 70 +++++++++++++++++-- src/qemu/qemu_command.c | 20 ++++-- tests/qemuhotplugtest.c | 1 - ...g-console-compat-2-live+console-virtio.xml | 4 +- .../qemuhotplug-console-compat-2-live.xml | 4 +- tests/qemuxml2argvdata/bios.args | 2 +- .../qemuxml2argvdata/console-compat-auto.args | 2 +- .../console-compat-chardev.args | 2 +- tests/qemuxml2argvdata/console-compat.args | 2 +- .../qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 2 +- .../name-escape.x86_64-2.11.0.args | 4 +- tests/qemuxml2argvdata/name-escape.xml | 1 + .../q35-virt-manager-basic.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- .../qemuxml2argvdata/serial-dev-chardev.args | 2 +- .../qemuxml2argvdata/serial-file-chardev.args | 2 +- tests/qemuxml2argvdata/serial-file-log.args | 2 +- .../qemuxml2argvdata/serial-many-chardev.args | 4 +- .../qemuxml2argvdata/serial-pty-chardev.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 2 +- .../serial-tcp-telnet-chardev.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.args | 8 ++- .../serial-tcp-tlsx509-chardev-notls.xml | 18 ++++- .../serial-tcp-tlsx509-chardev-verify.args | 4 +- .../serial-tcp-tlsx509-chardev-verify.xml | 2 +- .../serial-tcp-tlsx509-chardev.args | 4 +- .../serial-tcp-tlsx509-chardev.xml | 2 +- .../serial-tcp-tlsx509-secret-chardev.args | 4 +- .../serial-tcp-tlsx509-secret-chardev.xml | 2 +- .../qemuxml2argvdata/serial-udp-chardev.args | 4 +- .../qemuxml2argvdata/serial-unix-chardev.args | 4 +- .../serial-unix-chardev.x86_64-latest.args | 4 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- tests/qemuxml2argvdata/user-aliases.args | 4 +- .../virtio-9p-createmode.x86_64-latest.args | 2 +- .../virtio-9p-multidevs.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 2 +- .../x86_64-pc-headless.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 2 +- .../x86_64-q35-headless.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-chardev.xml | 2 +- 43 files changed, 149 insertions(+), 65 deletions(-) -- 2.27.0

9 53

[PATCH] tests: Report expected monitor command for simulated commands
by Michal Privoznik 14 Jan '22

14 Jan '22

There are two tests currently that simulate QMP talk: qemucapabilitiestest and qemuhotplugtest. In both cases they check whether currently executed command is the one for which reply was provided. If not an error message is reported. However, the error message contains only the actual command and not the expected one. This makes it harder to navigate through .replies files. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemumonitortestutils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index f7a0a37685..073ae5d73a 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -648,7 +648,8 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTest *test, ret = qemuMonitorTestAddResponse(test, data->response); } else { if (data->cmderr) { - qemuMonitorTestError("%s: %s", data->cmderr, cmdstr); + qemuMonitorTestError("%s: %s expected %s", + data->cmderr, cmdstr, data->command_name); } else { qemuMonitorTestErrorInvalidCommand(data->command_name, cmdstr); } -- 2.34.1

2 1

[PATCH partially-for-8.0 00/17] qemu: Fix use-after free when redefining snapshots and cleanup the code
by Peter Krempa 14 Jan '22

14 Jan '22

Patches 1 and 2 should be pushed for 8.0 as the bug was introduced in this dev cycle and the patches are specifically kept very simple. The rest of the series refactors the snapshot validation and helper code to have less weird semantics which lead to this bug. Peter Krempa (17): qemuSnapshotRedefine: Rename 'def' to 'snapdef' qemuSnapshotRedefine: Fix use of snapshot definition after free virDomainMomentAssignDef: Simplify error handling virDomainSnapshotRedefineValidate: Fix validation of VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY flag virDomainSnapshotAlignDisks: Improve function comment virDomainSnapshotAlignDisks: Convert @default_snapshot to virDomainSnapshotLocation virDomainSnapshotAlignDisks: Move 'require_match' selection logic inside virDomainSnapshotAlignDisks: Allow alternate domain definition when redefining virDomainSnapshotRedefineValidate: Unexport virDomainSnapshotRedefinePrep: Use 'snapdef' for snapshot definition object virDomainSnapshotRedefineValidate: Don't modify the snapshot definition testDomainSnapshotCreateXML: Extract snapshot redefinition code qemuSnapshotCreate: Use 'snapdef' instead of 'def' qemuSnapshotCreate: Standardize handling of the reference on @snapdef qemuDomainSnapshotLoad: Refactor handling of snapshot definition object virDomainSnapshotAssignDef: Clear second argument when it is consumed virDomainSnapshotRedefinePrep: Don't do partial redefine src/conf/snapshot_conf.c | 120 +++++++++++++++------------- src/conf/snapshot_conf.h | 13 +-- src/conf/virdomainmomentobjlist.c | 9 +-- src/conf/virdomainsnapshotobjlist.c | 29 ++++++- src/conf/virdomainsnapshotobjlist.h | 5 +- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 18 ++--- src/qemu/qemu_snapshot.c | 35 ++++---- src/test/test_driver.c | 89 ++++++++++++--------- src/vz/vz_sdk.c | 3 +- 10 files changed, 180 insertions(+), 142 deletions(-) -- 2.31.1

2 21

[PATCH 00/11] Misc cleanups
by Michal Privoznik 14 Jan '22

14 Jan '22

Couple of cleanups I've done whilst looking around our code base. Michal Prívozník (11): storage_file: Declare virStorageSourceParseRBDColonString only in one header virconf: Report an error in when virConfSetValue() fails xen_xl: Check for virConfSetValue() retval src: Declare and use g_autoptr(virConfValue) virconf: Make virConfSetValue() clear consumed pointer libxl: Don't use a static buffer in xenParseXLVnuma() libxl: Allocate @libxldisk in xenParseXLDisk() on stack xen_xl.c: Use g_autofree more xen_xl.c: Use g_autoptr() for virCPUDef libxl: Remove needless labels virsh: Remove needless labels src/libxl/xen_common.c | 62 ++--- src/libxl/xen_xl.c | 259 ++++++------------ src/libxl/xen_xm.c | 18 +- src/storage_file/storage_source.h | 5 - .../storage_source_backingstore.h | 3 +- src/util/virconf.c | 19 +- src/util/virconf.h | 3 +- tools/virsh-host.c | 20 +- tools/vsh.c | 11 +- 9 files changed, 135 insertions(+), 265 deletions(-) -- 2.34.1

2 14

Release of libvirt-8.0.0
by Jiri Denemark 14 Jan '22

14 Jan '22

The 8.0.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * Security * libxl: Fix potential deadlock and crash (CVE-2021-4147) A rogue guest could continuously reboot itself and cause libvirtd on the host to deadlock or crash, resulting in a denial of service condition. * Removed features * qemu: Explicitly forbid live changing nodeset for strict numatune For ``strict`` mode of <numatune/> it can't be guaranteed that memory is moved completely onto new set of nodes (e.g. QEMU might have locked pieces of its memory) thus breaking the strict promise. If live migration of QEMU memory between NUMA nodes is desired, users are advised to use ``restrictive`` mode instead. * New features * qemu: Synchronous write mode for disk copy operations The ``blockdev-mirror`` block job supports a mode where writes from the VM are synchronously propagated to the destination of the copy. This ensures that the job will converge under heavy I/O. Implement the mode for the copy blockjob as ``VIR_DOMAIN_BLOCK_COPY_SYNCHRONOUS_WRITES`` flag exposed via ``virsh blockcopy --synchronous-writes`` and for non-shared storage migration as ``VIR_MIGRATE_NON_SHARED_SYNCHRONOUS_WRITES`` exposed via ``virsh migrate --copy-storage-synchronous-writes``. * Introduce TCG domain features Libvirt is now able to set the size of translation block cache size (tb-size) for TCG domains. * qemu: Add new API to inject a launch secret in a domain New API ``virDomainSetLaunchSecurityState()`` and virsh command ``domsetlaunchsecstate`` are added to support injecting a launch secret in a domain's memory. * Improvements * libxl: Implement the virDomainGetMessages API * qemu: Preserve qcow2 sub-cluster allocation state after external snapshots and block-copy The new image which is installed as an overlay on top of the current chain when taking an external snapshot, or the target of a block copy operation now enables sub-cluster allocation (``extended_l2``) if the original image has the option enabled. * Bug fixes * qemu: Fix device hot-unplug with ``libvirt-7.9`` or ``libvirt-7.10`` used with ``qemu-6.2`` An internal change to the configuration format used by the above libvirt versions triggers a bug in ``qemu-6.2`` where qemu no longer emits the event notifying that the device was unplugged successfully and thus libvirt never removes the device from the definition. This impacts only devices which were present at startup of the VM, hotplugged devices behave correctly. This is fixed in ``libvirt-8.0`` by reverting to the old configuration approach until qemu is fixed. As a workaround for ``libvirt-7.9`` and ``libvirt-7.10`` the old configuration approach can be forced by: Option 1, global ``qemu.conf``:: capability_filters = [ "device.json" ] Option 2, per VM XML override:: <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> [...] <qemu:capabilities> <qemu:del capability='device.json'/> </qemu:capabilities> </domain> * Fix sparse streams with split daemon In split daemon scenario, a client connected to a hypervisor driver and using sparse streams (e.g. ``virsh vol-download --sparse``) would make the hypervisor daemon enter an infinite loop without any data transfer. This is now fixed. * Build no longer requires RPC library Code and its cross dependencies were fixed so that build without remote driver and thus an RPC library (like ``tirpc``) fails no more. * virnetdevopenvswitch: Fix 'burst' value passed to ovs-vsctl When a ``<bandwidth/>`` was defined for a TAP device that's plugged into an OvS bridge values passed to the OvS were incorrectly recalculated resulting in slightly different limits being applied. Enjoy. Jirka

1 0

[libvirt PATCH 00/14] Random fixes and improvements
by Tim Wiederhake 13 Jan '22

13 Jan '22

A collection of drive-by fixes and improvements that quickly derailed into the g_auto-ification of src/conf/interface_conf.c. Tim Wiederhake (14): docs: coding-style: Clarify on virXXXPtr types virQEMUCapsSEVInfoCopy: Remove superfluous g_auto usage virInterfaceDefDevFormat: Add missing error handling conf: interface: Preparation for g_auto conf: interface: Use g_auto conf: interface: Remove ret and goto virInterfaceDefParseXML: Inline trivial virInterfaceDefParseName virInterfaceDefParseIP: Simplify and cleanup virInterfaceDefParseDhcp: Simplify and cleanup virInterfaceDefParseProtoIPv4: Simplify and cleanup virInterfaceDefParseProtoIPv6: Simplify and cleanup virInterfaceDefParseIfAdressing: Simplify and cleanup virInterfaceDefParseXML: Simplify and cleanup virInterfaceDefParse: Simplify and cleanup docs/coding-style.rst | 5 + src/conf/interface_conf.c | 357 ++++++++++++----------------------- src/qemu/qemu_capabilities.c | 4 +- 3 files changed, 128 insertions(+), 238 deletions(-) -- 2.31.1

2 19

[libvirt PATCH for-8.0.0] virt-ssh-helper: Move manual page to section 8
by Andrea Bolognani 13 Jan '22

13 Jan '22

While sections are somewhat loosely defined and thus the choice is not quite a clear-cut one, section 8 might be a slightly better fit in this case. Suggested-by: Olaf Hering <olaf(a)aepfle.de> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- We could also merge this after 8.0.0, but I think it would be a little bit nicer if the manual page didn't move around between releases. docs/manpages/meson.build | 2 +- docs/manpages/virt-ssh-helper.rst | 2 +- libvirt.spec.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index 6763d19af8..150f45d296 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -19,11 +19,11 @@ docs_man_files = [ { 'name': 'virt-pki-query-dn', 'section': '1', 'install': true }, { 'name': 'virt-pki-validate', 'section': '1', 'install': true }, { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') }, - { 'name': 'virt-ssh-helper', 'section': '1', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'virt-xml-validate', 'section': '1', 'install': true }, { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') }, + { 'name': 'virt-ssh-helper', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'virtbhyved', 'section': '8', 'install': conf.has('WITH_BHYVE') }, { 'name': 'virtinterfaced', 'section': '8', 'install': conf.has('WITH_INTERFACE') }, { 'name': 'virtlockd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, diff --git a/docs/manpages/virt-ssh-helper.rst b/docs/manpages/virt-ssh-helper.rst index 175ddacaec..9d0cf10bc3 100644 --- a/docs/manpages/virt-ssh-helper.rst +++ b/docs/manpages/virt-ssh-helper.rst @@ -6,7 +6,7 @@ virt-ssh-helper libvirt socket proxy -------------------- -:Manual section: 1 +:Manual section: 8 :Manual group: Virtualization Support .. contents:: diff --git a/libvirt.spec.in b/libvirt.spec.in index 7a90a1a9e6..db9d622699 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1693,7 +1693,7 @@ exit 0 %{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-host-validate.1* -%{_mandir}/man1/virt-ssh-helper.1* +%{_mandir}/man8/virt-ssh-helper.8* %{_mandir}/man8/libvirtd.8* %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* -- 2.31.1

2 2

[PATCH] Print errors on daemon startup if logging setup fails
by Martin Kletzander 13 Jan '22

13 Jan '22

https://bugzilla.redhat.com/show_bug.cgi?id=2039652 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/locking/lock_daemon.c | 4 +++- src/logging/log_daemon.c | 4 +++- src/remote/remote_daemon.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index ea81940a4325..75ebd059d79a 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -919,8 +919,10 @@ int main(int argc, char **argv) { config->log_outputs, privileged, verbose, - godaemon) < 0) + godaemon) < 0) { + virDispatchError(NULL); exit(EXIT_FAILURE); + } if (!pid_file && virPidFileConstructPath(privileged, diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index fe7fa8534aec..8c3eb66895dc 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -725,8 +725,10 @@ int main(int argc, char **argv) { config->log_outputs, privileged, verbose, - godaemon) < 0) + godaemon) < 0) { + virDispatchError(NULL); exit(EXIT_FAILURE); + } if (!pid_file && virPidFileConstructPath(privileged, diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 84157e6cc19a..1b8e982a2f01 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -940,8 +940,10 @@ int main(int argc, char **argv) { config->log_outputs, privileged, verbose, - godaemon) < 0) + godaemon) < 0) { + virDispatchError(NULL); exit(EXIT_FAILURE); + } /* Let's try to initialize global variable that holds the host's boot time. */ if (virHostBootTimeInit() < 0) { -- 2.34.1

2 1

[PATCH] meson: Detect rst2html5 and rst2man only when needed
by Ivan Teterevkov 13 Jan '22

13 Jan '22

Detect these commands in docs/meson.build, i.e. only when users enable documentation. Signed-off-by: Ivan Teterevkov <ivan.teterevkov(a)nutanix.com> --- docs/meson.build | 41 +++++++++++++++++++++++++++++++++++++++++ meson.build | 31 ------------------------------- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index 3e912f21ad..50c12cc3c2 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -171,6 +171,47 @@ docs_lxc_api_xml = docs_api_generated[1] docs_qemu_api_xml = docs_api_generated[2] docs_admin_api_xml = docs_api_generated[3] +docs_programs_groups = [ + { 'name': 'rst2html5', 'prog': [ 'rst2html5', 'rst2html5.py', 'rst2html5-3' ] }, + { 'name': 'rst2man', 'prog': [ 'rst2man', 'rst2man.py', 'rst2man-3' ] }, +] + +foreach item : docs_programs_groups + prog = find_program(item.get('prog'), dirs: libvirt_sbin_path) + varname = item.get('name').underscorify() + conf.set_quoted(varname.to_upper(), prog.path()) + set_variable('@0@_prog'.format(varname), prog) +endforeach + +# There are two versions of rst2html5 in the wild: one is the version +# coming from the docutils package, and the other is the one coming +# from the rst2html5 package. These versions are subtly different, +# and the libvirt documentation can only be successfully generated +# using the docutils version. Every now and then, users will report +# build failures that can be traced back to having the wrong version +# installed. +# +# The only reliable way to tell the two binaries apart seems to be +# looking look at their version information: the docutils version +# will report +# +# rst2html5 (Docutils ..., Python ..., on ...) +# +# whereas the rst2html5 version will report +# +# rst2html5 ... (Docutils ..., Python ..., on ...) +# +# with the additional bit of information being the version number for +# the rst2html5 package itself. +# +# Use this knowledge to detect the version that we know doesn't work +# for building libvirt and reject it +rst2html5_version = run_command(rst2html5_prog, '--version') +rst2html5_version = rst2html5_version.stdout().split(' ') +if rst2html5_version[1] != '(Docutils' + error('Please uninstall the rst2html5 package and install the docutils package') +endif + docs_rst2html5_gen = generator( rst2html5_prog, output: '@BASENAME@.html.in', diff --git a/meson.build b/meson.build index 214a3f05eb..0d98f13d5e 100644 --- a/meson.build +++ b/meson.build @@ -788,8 +788,6 @@ required_programs = [ required_programs_groups = [ { 'name': 'rpcgen', 'prog': [ 'rpcgen', 'portable-rpcgen' ] }, - { 'name': 'rst2html5', 'prog': [ 'rst2html5', 'rst2html5.py', 'rst2html5-3' ] }, - { 'name': 'rst2man', 'prog': [ 'rst2man', 'rst2man.py', 'rst2man-3' ] }, ] if host_machine.system() == 'freebsd' @@ -810,35 +808,6 @@ foreach item : required_programs_groups set_variable('@0@_prog'.format(varname), prog) endforeach -# There are two versions of rst2html5 in the wild: one is the version -# coming from the docutils package, and the other is the one coming -# from the rst2html5 package. These versions are subtly different, -# and the libvirt documentation can only be successfully generated -# using the docutils version. Every now and then, users will report -# build failures that can be traced back to having the wrong version -# installed. -# -# The only reliable way to tell the two binaries apart seems to be -# looking look at their version information: the docutils version -# will report -# -# rst2html5 (Docutils ..., Python ..., on ...) -# -# whereas the rst2html5 version will report -# -# rst2html5 ... (Docutils ..., Python ..., on ...) -# -# with the additional bit of information being the version number for -# the rst2html5 package itself. -# -# Use this knowledge to detect the version that we know doesn't work -# for building libvirt and reject it -rst2html5_version = run_command(rst2html5_prog, '--version') -rst2html5_version = rst2html5_version.stdout().split(' ') -if rst2html5_version[1] != '(Docutils' - error('Please uninstall the rst2html5 package and install the docutils package') -endif - # optional programs optional_programs = [ -- 2.35.0-rc0

2 1

[PATCH] NEWS: Mention propagation of sub-cluster allocation on snapshots and block-copy
by Peter Krempa 13 Jan '22

13 Jan '22

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index d9fd50a067..c6970814b1 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -57,6 +57,13 @@ v8.0.0 (unreleased) * libxl: Implement the virDomainGetMessages API + * qemu: Preserve qcow2 sub-cluster allocation state after external snapshots and block-copy + + The new image which is installed as an overlay on top of the current chain + when taking an external snapshot, or the target of a block copy operation + now enables sub-cluster allocation (``extended_l2``) if the original + image has the option enabled. + * **Bug fixes** * qemu: Fix device hot-unplug with ``libvirt-7.9`` or ``libvirt-7.10`` used with ``qemu-6.2`` -- 2.31.1

2 1

Entering freeze for libvirt-8.0.0
by Jiri Denemark 13 Jan '22

13 Jan '22

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

2 2

[PATCH] docs: tpm: Clarify omission or removal of active_pcr_banks node
by Stefan Berger 13 Jan '22

13 Jan '22

Add a sentence to the active_pcr_banks node documentation that clarifies that when the active_pcr_banks node is removed from the XML or when it is omitted that the set of active PCR banks is not changed anymore. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2039246 Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- docs/formatdomain.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index d4f30bb8af..a84be77c37 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -7640,6 +7640,8 @@ Example: usage of the TPM Emulator of a TPM 2.0 to activate. Valid names are for example sha1, sha256, sha384, and sha512. If this node is provided, the set of PCR banks are activated before every start of a VM and this step is logged in the swtpm's log. + If this node is removed or omitted then libvirt will not modify the + active PCR banks upon VM start but leave them at their last configuration. This attribute requires that swtpm_setup v0.7 or later is installed and may not have any effect otherwise. The selection of PCR banks only works with the ``emulator`` backend. since:`Since 7.10.0` -- 2.31.1

2 1

[PATCH] NEWS: Document my contributions for upcoming release
by Michal Privoznik 13 Jan '22

13 Jan '22

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- NEWS.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index b5893627e3..32ab0c801e 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -90,6 +90,24 @@ v8.0.0 (unreleased) </qemu:capabilities> </domain> + * Fix sparse streams with split daemon + + In split daemon scenario, when a client connected to a hypervisor driver + using sparse streams (e.g. ``virsh vol-download --sparse``) would make the + hypervisor daemon enter an infinite loop without any data transfer. This is + now fixed. + + * Build no longer requires RPC library + + Code and its cross dependencies were fixed so that build without remote + driver and thus an RPC library (like ``tirpc``) fails no more. + + * virnetdevopenvswitch: Fix 'burst' value passed to ovs-vsctl + + When a ``<bandwidth/>`` was defined for an TAP device that's plugged into an + OvS bridge values passed to the OvS were incorrectly recalculated resulting + in slightly different limits being applied. + v7.10.0 (2021-12-01) ==================== -- 2.34.1

2 1

[PATCH] rpc: Emit a warning when applying RPC throttling
by Ivan Teterevkov 13 Jan '22

13 Jan '22

Whenever the number of outstanding requests being served reaches max_client_requests, the RPC server applies RX throttling and temporarily stops receiving incoming data. Consequently, it stops receiving the keep-alive responses from the client and eventually may cause a connection timeout on the server-side. This patch emits a warning message in such cases so that the users may root-cause the connection timeout and reconfigure max_client_requests depending on their application. Signed-off-by: Ivan Teterevkov <ivan.teterevkov(a)nutanix.com> --- src/rpc/virnetserverclient.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 7050430e17..9d86e1ba3e 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1293,6 +1293,10 @@ static virNetMessage *virNetServerClientDispatchRead(virNetServerClient *client) client->rx->buffer = g_new0(char, client->rx->bufferLength); client->nrequests++; } + } else { + VIR_WARN("Applying RPC throttling, consider increasing " + "max_client_requests (client->nrequests_max=%zu)", + client->nrequests_max); } virNetServerClientUpdateEvent(client); -- 2.35.0-rc0

1 0

[PATCH] Fix missing-field-initializers error
by huangy81＠chinatelecom.cn 12 Jan '22

12 Jan '22

From: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> When compile libvirt via ninja tool with default configuration, it report the error message as the following: "missing initializer for field 'path' of 'virTPMBinaryInfo'". So initialize the 'path' field in 'virTPMBinaryInfo' with 'NULL'. Signed-off-by: Hyman Huang(黄勇) <huangy81(a)chinatelecom.cn> --- src/util/virtpm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index cf4c7c4..a02d933 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -122,13 +122,16 @@ typedef struct _virTPMBinaryInfo { static virTPMBinaryInfo swtpmBinaries[VIR_TPM_BINARY_LAST] = { [VIR_TPM_BINARY_SWTPM] = { + .path = NULL, .parm = "socket", .capsParse = virTPMSwtpmFeatureTypeFromString, }, [VIR_TPM_BINARY_SWTPM_SETUP] = { + .path = NULL, .capsParse = virTPMSwtpmSetupFeatureTypeFromString, }, [VIR_TPM_BINARY_SWTPM_IOCTL] = { + .path = NULL, }, }; -- 1.8.3.1

3 4

[PATCH for 8.0 0/3] Fix creation of snapshots without libvirt metadata
by Peter Krempa 12 Jan '22

12 Jan '22

After a recent unreleased refactor we don't remove the temporary snapshot object from the list when finishing a snapshot without metadata thus we should fix it before releasing a buggy release. This patchset fixes it by not adding it into the list in the first place. Peter Krempa (3): virdomainmomentobjlist.h: Convert to modern header style conf: moment: Export helpers to create the virDomainMoment wrapper qemuSnapshotCreate: Don't insert snapshot into list with VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA src/conf/virdomainmomentobjlist.c | 4 +- src/conf/virdomainmomentobjlist.h | 121 +++++++++++++++++++----------- src/libvirt_private.syms | 2 + src/qemu/qemu_snapshot.c | 25 +++--- 4 files changed, 97 insertions(+), 55 deletions(-) -- 2.31.1

2 6

[PATCH v4] report error when virProcessGetStatInfo() is unable to parse data
by Ani Sinha 12 Jan '22

12 Jan '22

Currently virProcessGetStatInfo() always returns success and only logs error when it is unable to parse the data. Make this function actually report the error and return a negative value in this error scenario. Fix the callers so that they do not override the error generated. Also fix non-linux implementation of this function so as to report error. Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/ch/ch_driver.c | 2 -- src/qemu/qemu_driver.c | 7 +------ src/util/virprocess.c | 17 +++++++++++++---- 3 files changed, 14 insertions(+), 12 deletions(-) changelog: v4: on freebsd error on the logs is a problem appaently. try to fix that. v3: fix non linux implementation v2: fix callers diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 53e0872207..3cbc668489 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -1073,8 +1073,6 @@ chDomainHelperGetVcpus(virDomainObj *vm, if (virProcessGetStatInfo(&vcpuinfo->cpuTime, &vcpuinfo->cpu, NULL, vm->pid, vcpupid) < 0) { - virReportSystemError(errno, "%s", - _("cannot get vCPU placement & pCPU time")); return -1; } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d3d76c003f..65ac5ef367 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1359,8 +1359,6 @@ qemuDomainHelperGetVcpus(virDomainObj *vm, if (virProcessGetStatInfo(&vcpuinfo->cpuTime, &vcpuinfo->cpu, NULL, vm->pid, vcpupid) < 0) { - virReportSystemError(errno, "%s", - _("cannot get vCPU placement & pCPU time")); return -1; } } @@ -2521,8 +2519,6 @@ qemuDomainGetInfo(virDomainPtr dom, if (virDomainObjIsActive(vm)) { if (virProcessGetStatInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("cannot read cputime for domain")); goto cleanup; } } @@ -10530,8 +10526,7 @@ qemuDomainMemoryStatsInternal(virQEMUDriver *driver, } if (virProcessGetStatInfo(NULL, NULL, &rss, vm->pid, 0) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("cannot get RSS for domain")); + virResetLastError(); } else { stats[ret].tag = VIR_DOMAIN_MEMORY_STAT_RSS; stats[ret].val = rss; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b559a4257e..cbb31441cc 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1779,12 +1779,20 @@ virProcessGetStatInfo(unsigned long long *cpuTime, long rss = 0; int cpu = 0; - if (!proc_stat || - virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_UTIME], NULL, 10, &usertime) < 0 || + if (!proc_stat) { + VIR_WARN("Unable to get proc stats from the kernel"); + return 0; + } + + if (virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_UTIME], NULL, 10, &usertime) < 0 || virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_STIME], NULL, 10, &systime) < 0 || virStrToLong_l(proc_stat[VIR_PROCESS_STAT_RSS], NULL, 10, &rss) < 0 || virStrToLong_i(proc_stat[VIR_PROCESS_STAT_PROCESSOR], NULL, 10, &cpu) < 0) { - VIR_WARN("cannot parse process status data"); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse process status data for pid '%d/%d'"), + (int) pid, (int) tid); + + return -1; } /* We got jiffies @@ -1881,7 +1889,8 @@ virProcessGetStatInfo(unsigned long long *cpuTime G_GNUC_UNUSED, pid_t pid G_GNUC_UNUSED, pid_t tid G_GNUC_UNUSED) { - errno = ENOSYS; + virReportSystemError(ENOSYS, "%s", + _("Process statistics data is not supported on this platform")); return -1; } -- 2.25.1

2 4

[PATCH v3] report error when virProcessGetStatInfo() is unable to parse data
by Ani Sinha 12 Jan '22

12 Jan '22

Currently virProcessGetStatInfo() always returns success and only logs error when it is unable to parse the data. Make this function actually report the error and return a negative value in this error scenario. Fix the callers so that they do not override the error generated. Also fix non-linux implementation of this function so as to report error. Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/ch/ch_driver.c | 2 -- src/qemu/qemu_driver.c | 7 +------ src/util/virprocess.c | 9 +++++++-- 3 files changed, 8 insertions(+), 10 deletions(-) changelog: v3: fix non-linux implementation v2: fix callers diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 53e0872207..3cbc668489 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -1073,8 +1073,6 @@ chDomainHelperGetVcpus(virDomainObj *vm, if (virProcessGetStatInfo(&vcpuinfo->cpuTime, &vcpuinfo->cpu, NULL, vm->pid, vcpupid) < 0) { - virReportSystemError(errno, "%s", - _("cannot get vCPU placement & pCPU time")); return -1; } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d3d76c003f..9a17c93b08 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1359,8 +1359,6 @@ qemuDomainHelperGetVcpus(virDomainObj *vm, if (virProcessGetStatInfo(&vcpuinfo->cpuTime, &vcpuinfo->cpu, NULL, vm->pid, vcpupid) < 0) { - virReportSystemError(errno, "%s", - _("cannot get vCPU placement & pCPU time")); return -1; } } @@ -2521,8 +2519,6 @@ qemuDomainGetInfo(virDomainPtr dom, if (virDomainObjIsActive(vm)) { if (virProcessGetStatInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("cannot read cputime for domain")); goto cleanup; } } @@ -10530,8 +10526,7 @@ qemuDomainMemoryStatsInternal(virQEMUDriver *driver, } if (virProcessGetStatInfo(NULL, NULL, &rss, vm->pid, 0) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("cannot get RSS for domain")); + return -1; } else { stats[ret].tag = VIR_DOMAIN_MEMORY_STAT_RSS; stats[ret].val = rss; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b559a4257e..709ec616de 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1784,7 +1784,11 @@ virProcessGetStatInfo(unsigned long long *cpuTime, virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_STIME], NULL, 10, &systime) < 0 || virStrToLong_l(proc_stat[VIR_PROCESS_STAT_RSS], NULL, 10, &rss) < 0 || virStrToLong_i(proc_stat[VIR_PROCESS_STAT_PROCESSOR], NULL, 10, &cpu) < 0) { - VIR_WARN("cannot parse process status data"); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse process status data for pid '%d/%d'"), + (int) pid, (int) tid); + + return -1; } /* We got jiffies @@ -1881,7 +1885,8 @@ virProcessGetStatInfo(unsigned long long *cpuTime G_GNUC_UNUSED, pid_t pid G_GNUC_UNUSED, pid_t tid G_GNUC_UNUSED) { - errno = ENOSYS; + virReportSystemError(ENOSYS, "%s", + _("Process statistics data is not supported on this platform")); return -1; } -- 2.25.1

2 3

[libvirt PATCH 0/3] Misc fixes / improvements
by Daniel P. Berrangé 12 Jan '22

12 Jan '22

Just a few things I dealt with as side effect of other work I'm doing wrt AMD SEV. Daniel P. Berrangé (3): docs: split example for <os> schema docs: use virYesNo definition in more schemas qemu: split handling of distinct firmware enum conversions docs/formatdomain.rst | 32 +++++++++++++++++++++++++++++--- docs/schemas/capability.rng | 5 +---- docs/schemas/domainbackup.rng | 5 +---- docs/schemas/domaincaps.rng | 5 +---- docs/schemas/domaincommon.rng | 17 ++++------------- src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_firmware.c | 21 +++++++++++++++++++-- 7 files changed, 57 insertions(+), 32 deletions(-) -- 2.33.1

2 4

[PATCH 0/1] qemu_tpm: Get swtpm pid without binary validation
by Vasiliy Ulyanov 12 Jan '22

12 Jan '22

Hi all and Happy New Year! My name is Vasiliy, I am an engineer at SUSE. I was playing around with TPM in libvirt and trying to enable it in KubeVirt. With the emulator I was always getting "swtpm failed to start" internal error. After debugging the issue I found that the problem was not actually with starting the emulator but rather with retrieving the PID. The code in libvirt currently verifies that /proc/[pid]/exe points to the correct swtpm binary. In my case an attempt to dereference the symlink from procfs always resulted in EACCES. Eventually I found this issue [1]. It appears that libvirt needs CAP_SYS_PTRACE otherwise it will not be able to access the exe link (even if run as root). This can also be observed with the following reproducer: $ docker run -it --rm --security-opt apparmor:unconfined --security-opt seccomp:unconfined busybox / # adduser -D test / # su - test ~ $ sleep infinity & ~ $ exit / # stat /proc/$(pidof sleep)/exe File: stat: /proc/10/exe: cannot read link: Permission denied Size: 0 Blocks: 0 IO Block: 1024 symbolic link Device: 6eh/110d Inode: 187271 Links: 1 Access: (0777/lrwxrwxrwx) Uid: ( 1000/ test) Gid: ( 1000/ test) Access: 2022-01-03 06:52:39.480790247 +0000 Modify: 2022-01-03 06:52:39.480790247 +0000 Change: 2022-01-03 06:52:39.480790247 +0000 $ docker run -it --rm --security-opt apparmor:unconfined --security-opt seccomp:unconfined --cap-add sys_ptrace busybox / # adduser -D test / # su - test ~ $ sleep infinity & ~ $ exit / # stat /proc/$(pidof sleep)/exe File: '/proc/10/exe' -> '/bin/sleep' Size: 0 Blocks: 0 IO Block: 1024 symbolic link Device: 6eh/110d Inode: 195011 Links: 1 Access: (0777/lrwxrwxrwx) Uid: ( 1000/ test) Gid: ( 1000/ test) Access: 2022-01-03 07:13:28.003224653 +0000 Modify: 2022-01-03 07:13:28.003224653 +0000 Change: 2022-01-03 07:13:28.003224653 +0000 I tried to adapt the function that retrieves swtpm PID so it also covers the usecase when libvirt is run in a container without ptrace capability. The patch solved the issue for me and I verified that the error is no more reproducible. So I wanted to propose that solution to handle the issue. Or maybe someone can suggest a better alternative which would be more suitable? Would appreciate any feedback. Thanks. [1] https://github.com/moby/moby/issues/40713 Vasiliy Ulyanov (1): qemu_tpm: Get swtpm pid without binary validation src/qemu/qemu_tpm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.34.1

3 4

[PATCH v4 00/12] Add riscv kvm accel support
by Yifei Jiang 12 Jan '22

12 Jan '22

This series adds both riscv32 and riscv64 kvm support, and implements migration based on riscv. Because of RISC-V KVM has been merged into the Linux master, so this series are changed from RFC to patch. Several steps to use this: 1. Build emulation $ ./configure --target-list=riscv64-softmmu $ make -j$(nproc) 2. Build kernel 3. Build QEMU VM Cross built in riscv toolchain. $ PKG_CONFIG_LIBDIR=<toolchain pkgconfig path> $ export PKG_CONFIG_SYSROOT_DIR=<toolchain sysroot path> $ ./configure --target-list=riscv64-softmmu --enable-kvm \ --cross-prefix=riscv64-linux-gnu- --disable-libiscsi --disable-glusterfs \ --disable-libusb --disable-usb-redir --audio-drv-list= --disable-opengl \ --disable-libxml2 $ make -j$(nproc) 4. Start emulation $ ./qemu-system-riscv64 -M virt -m 4096M -cpu rv64,x-h=true -nographic \ -name guest=riscv-hyp,debug-threads=on \ -smp 4 \ -bios ./fw_jump.bin \ -kernel ./Image \ -drive file=./hyp.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" 5. Start kvm-acceled QEMU VM in emulation $ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \ -name guest=riscv-guset \ -smp 2 \ -bios none \ -kernel ./Image \ -drive file=./guest.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" Changes since patch v3 - Re-write the for-loop in sifive_plic_create(). - Drop unnecessary change in hw/riscv/virt.c. - Use serial to handle console sbi call. Changes since patch v2 - Create a macro for get and put timer csr. - Remove M-mode PLIC contexts when kvm is enabled. - Add get timer frequency. - Move cpu_host_load to vmstate_kvmtimer. Changes since patch v1 - Rebase on recent commit a216e7cf119c91ffdf5931834a1a030ebea40d70 - Sync-up headers with Linux-5.16-rc4. - Fixbug in kvm_arch_init_vcpu. - Create a macro for get and put regs csr. - Start kernel directly when kvm_enabled. - Use riscv_cpu_set_irq to inject KVM interrupts. - Use the Semihosting Console API for RISC-V kvm handle sbi. - Update vmstate_riscv_cpu version id. Placing kvm_timer into a subsection. Changes since RFC v6 - Rebase on recent commit 8627edfb3f1fca24a96a0954148885c3241c10f8 - Sync-up headers with Linux-5.16-rc1 Changes since RFC v5 - Rebase on QEMU v6.1.0-rc1 and kvm-riscv linux v19. - Move kvm interrupt setting to riscv_cpu_update_mip(). - Replace __u64 with uint64_t. Changes since RFC v4 - Rebase on QEMU v6.0.0-rc2 and kvm-riscv linux v17. - Remove time scaling support as software solution is incomplete. Because it will cause unacceptable performance degradation. and We will post a better solution. - Revise according to Alistair's review comments. - Remove compile time XLEN checks in kvm_riscv_reg_id - Surround TYPE_RISCV_CPU_HOST definition by CONFIG_KVM and share it between RV32 and RV64. - Add kvm-stub.c for reduce unnecessary compilation checks. - Add riscv_setup_direct_kernel() to direct boot kernel for KVM. Changes since RFC v3 - Rebase on QEMU v5.2.0-rc2 and kvm-riscv linux v15. - Add time scaling support(New patches 13, 14 and 15). - Fix the bug that guest vm can't reboot. Changes since RFC v2 - Fix checkpatch error at target/riscv/sbi_ecall_interface.h. - Add riscv migration support. Changes since RFC v1 - Add separate SBI ecall interface header. - Add riscv32 kvm accel support. Yifei Jiang (12): update-linux-headers: Add asm-riscv/kvm.h target/riscv: Add target/riscv/kvm.c to place the public kvm interface target/riscv: Implement function kvm_arch_init_vcpu target/riscv: Implement kvm_arch_get_registers target/riscv: Implement kvm_arch_put_registers target/riscv: Support start kernel directly by KVM target/riscv: Support setting external interrupt by KVM target/riscv: Handle KVM_EXIT_RISCV_SBI exit target/riscv: Add host cpu type target/riscv: Add kvm_riscv_get/put_regs_timer target/riscv: Implement virtual time adjusting with vm state changing target/riscv: Support virtual time context synchronization hw/intc/sifive_plic.c | 21 +- hw/riscv/boot.c | 16 +- hw/riscv/virt.c | 83 +++-- include/hw/riscv/boot.h | 1 + linux-headers/asm-riscv/kvm.h | 128 +++++++ meson.build | 2 + target/riscv/cpu.c | 29 +- target/riscv/cpu.h | 11 + target/riscv/kvm-stub.c | 30 ++ target/riscv/kvm.c | 532 +++++++++++++++++++++++++++++ target/riscv/kvm_riscv.h | 25 ++ target/riscv/machine.c | 30 ++ target/riscv/meson.build | 1 + target/riscv/sbi_ecall_interface.h | 72 ++++ 14 files changed, 948 insertions(+), 33 deletions(-) create mode 100644 linux-headers/asm-riscv/kvm.h create mode 100644 target/riscv/kvm-stub.c create mode 100644 target/riscv/kvm.c create mode 100644 target/riscv/kvm_riscv.h create mode 100644 target/riscv/sbi_ecall_interface.h -- 2.19.1

3 20

[libvirt PATCH v4 0/7] cgroup and thread management in ch driver.
by Praveen K Paladugu 11 Jan '22

11 Jan '22

This patchset adds support for cgroup management of ch threads. This version correctly manages cgroups for vcpu and emulator threads created by ch. cgroup management for iothreads is not yet supported. Along with cgroup management, this patchset also enables support for pinning vcpu and emulator threads to selected host cpus. v4: * addressed all open comments in v3 * dropped all the merged commits v3: * addrressed all the formatting comments in v2 patch set * dropped indentation patches are they do not adhere to libvirt coding style * fixed build issue in qemu driver that was introduced in v2 Praveen K Paladugu (3): qemu,hypervisor: refactor some cgroup mgmt methods ch_process: Setup emulator and iothread settings ch_driver: emulator threadinfo & pinning callbacks Vineeth Pillai (4): ch: methods for cgroup mgmt in ch driver ch_driver,ch_domain: vcpupin callback in ch driver ch_driver: enable typed param string for numatune ch_driver: add numatune callbacks for CH driver src/ch/ch_conf.c | 2 + src/ch/ch_conf.h | 4 +- src/ch/ch_domain.c | 64 ++++ src/ch/ch_domain.h | 18 +- src/ch/ch_driver.c | 590 +++++++++++++++++++++++++++++++++ src/ch/ch_monitor.c | 156 +++++++++ src/ch/ch_monitor.h | 56 +++- src/ch/ch_process.c | 385 ++++++++++++++++++++- src/ch/ch_process.h | 3 + src/hypervisor/domain_cgroup.c | 457 ++++++++++++++++++++++++- src/hypervisor/domain_cgroup.h | 72 ++++ src/libvirt_private.syms | 14 +- src/qemu/qemu_cgroup.c | 413 +---------------------- src/qemu/qemu_cgroup.h | 11 - src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_hotplug.c | 7 +- src/qemu/qemu_process.c | 24 +- 17 files changed, 1835 insertions(+), 455 deletions(-) -- 2.27.0

1 7

[PATCH 0/3] virdnsmasq: Lookup DNSMASQ in PATH
by Michal Privoznik 11 Jan '22

11 Jan '22

This is an alternative implementation to Olaf's original patch posted here: https://listman.redhat.com/archives/libvir-list/2021-August/msg00273.html I find my patches to be a bit cleaner, but either way we should merge his or mine. Michal Prívozník (3): virdnsmasq: Drop @binaryPath argument from dnsmasqCapsNewEmpty() virdnsmasq: Lookup DNSMASQ in PATH virdnsmasq: Require non NULL @caps in dnsmasqCapsGetBinaryPath() src/util/virdnsmasq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.34.1

4 13

[PATCH v6 0/4] remove sysconfig files
by Olaf Hering 11 Jan '22

11 Jan '22

fix virtnetworkd avoid duplicate %posttrans sections (berrange) add comment to %libvirt_sc_pre (berrange) rebased to adc0eaead0ebe11f38798e431d2748bfe9b54a30 Olaf Hering (4): rpm: fix %preun of virtnetworkd 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 | 6 +- libvirt.spec.in | 103 ++++++++++++++++-------- 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, 170 insertions(+), 263 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

5 20

[PATCH] docs: minor fix in launchSecurity
by Boris Fiuczynski 11 Jan '22

11 Jan '22

Correcting XML element. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index d4f30bb8af..69e02e0135 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -8201,7 +8201,7 @@ Note: DEA/TDEA is synonymous with DES/TDES. Launch Security --------------- -Specifying ``<launchSecurity type='s390-pv'\>`` in a s390 domain prepares +Specifying ``<launchSecurity type='s390-pv'/>`` in a s390 domain prepares the guest to run in protected virtualization secure mode, also known as IBM Secure Execution. For more required host and guest preparation steps, see `Protected Virtualization on s390 <kbase/s390_protected_virt.html>`__ -- 2.33.1

2 1

[libvirt PATCH v2 0/3] ci: Check spelling
by Tim Wiederhake 11 Jan '22

11 Jan '22

This is a wrapper for codespell [1], a spell checker for source code. Codespell does not compare words to a dictionary, but rather works by checking words against a list of common typos, making it produce fewer false positives than other solutions. The script in this patch works around the lack of per-directory ignore lists and some oddities regarding capitalization in ignore lists. [1] (https://github.com/codespell-project/codespell/) V1: https://listman.redhat.com/archives/libvir-list/2021-October/msg00015.html The wrapper script changed since it was Reviewed-by: Ján, hence I did not mark patch #2 as already reviewed. Regards, Tim Tim Wiederhake (3): scripts: Check spelling ci: Add spell checking Fix some typos .gitlab-ci.yml | 12 +++ scripts/check-spelling.py | 119 ++++++++++++++++++++++++++++++ src/qemu/qemu_cgroup.c | 2 +- tests/qemucapabilitiesnumbering.c | 2 +- tests/qemucapabilitiestest.c | 4 +- 5 files changed, 135 insertions(+), 4 deletions(-) create mode 100755 scripts/check-spelling.py -- 2.31.1

4 8

[PATCH v2] report error when virProcessGetStatInfo() is unable to parse data
by Ani Sinha 11 Jan '22

11 Jan '22

Currently virProcessGetStatInfo() always returns success and only logs error when it is unable to parse the data. Make this function actually report the error and return a negative value in this error scenario. Fix the callers so that they do not override the error generated. Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/ch/ch_driver.c | 2 -- src/qemu/qemu_driver.c | 7 +------ src/util/virprocess.c | 6 +++++- 3 files changed, 6 insertions(+), 9 deletions(-) changelog: v2: fixed the callers diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 53e0872207..3cbc668489 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -1073,8 +1073,6 @@ chDomainHelperGetVcpus(virDomainObj *vm, if (virProcessGetStatInfo(&vcpuinfo->cpuTime, &vcpuinfo->cpu, NULL, vm->pid, vcpupid) < 0) { - virReportSystemError(errno, "%s", - _("cannot get vCPU placement & pCPU time")); return -1; } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4974450333..015ffb2ce7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1359,8 +1359,6 @@ qemuDomainHelperGetVcpus(virDomainObj *vm, if (virProcessGetStatInfo(&vcpuinfo->cpuTime, &vcpuinfo->cpu, NULL, vm->pid, vcpupid) < 0) { - virReportSystemError(errno, "%s", - _("cannot get vCPU placement & pCPU time")); return -1; } } @@ -2521,8 +2519,6 @@ qemuDomainGetInfo(virDomainPtr dom, if (virDomainObjIsActive(vm)) { if (virProcessGetStatInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("cannot read cputime for domain")); goto cleanup; } } @@ -10530,8 +10526,7 @@ qemuDomainMemoryStatsInternal(virQEMUDriver *driver, } if (virProcessGetStatInfo(NULL, NULL, &rss, vm->pid, 0) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("cannot get RSS for domain")); + return -1; } else { stats[ret].tag = VIR_DOMAIN_MEMORY_STAT_RSS; stats[ret].val = rss; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index c74bd16fe6..b9f498d5d8 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1783,7 +1783,11 @@ virProcessGetStatInfo(unsigned long long *cpuTime, virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_STIME], NULL, 10, &systime) < 0 || virStrToLong_l(proc_stat[VIR_PROCESS_STAT_RSS], NULL, 10, &rss) < 0 || virStrToLong_i(proc_stat[VIR_PROCESS_STAT_PROCESSOR], NULL, 10, &cpu) < 0) { - VIR_WARN("cannot parse process status data"); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse process status data for pid '%d/%d'"), + (int) pid, (int) tid); + + return -1; } /* We got jiffies -- 2.25.1

3 3

[libvirt PATCH v5 00/20] qemu: Introduce hvf domain type for Hypervisor.framework
by Andrea Bolognani 11 Jan '22

11 Jan '22

In order to hopefully address [libvirt#147] at long last, I've picked up Roman's patches from 2018 and attempted to forward-port them. More specifically, I've used the [roolebo/hvf-domain] branch as a starting point, since it seems to contain a few improvements over [v2] and was just easier to pick up. The code is mostly his own, so I've retained the existing authorship information, but I've dropped Reviewed-by tags for commits that have been modified in non-trivial ways. I've applied very minimal style tweaks along the way, but overall I've tried to modify the existing patches as little as possible. I've added a few changes of my own, which I've marked as "fixup!" when I felt that they should be squashed into the previous patch rather than existing as separate commits. The new test cases, such as they are, pass, and no regressions to KVM support appear to have been introduced in the process. I don't currently have access to a machine running macOS, so I can't verify that it's actually possible to start a hardware-accelerated VM by myself, but a user has confirmed on the GitLab issue that the new feature works. Changes from [v4]: * fixed an issue that prevented machine types from being probed correctly, effectively making the entire thing non functional; * only report HVF support as available when the guest architecture and the host architecture match. Changes from [v3]: * reintroduced the patch that was missing in the initial version of the forward-port; * converted the documentation to reStructuredText and trimmed it significantly; * reworked virQEMUCapsAccelStr() based on Dan's suggestions; * reworked macOS support in the test suite based on Dan's suggestions; * fixed a few minor issues found while doing the above. Changes from [v2]: * rebased on top of master; * added a couple of simple test cases. Useful links: * GitLab: [abologna/hvf] * CI: [pipeline] [libvirt#147] https://gitlab.com/libvirt/libvirt/-/issues/147 [roolebo/hvf-domain] https://github.com/roolebo/libvirt/tree/hvf-domain [abologna/hvf] https://gitlab.com/abologna/libvirt/-/commits/hvf [pipeline] https://gitlab.com/abologna/libvirt/-/pipelines/443320533 [v4] https://listman.redhat.com/archives/libvir-list/2022-January/msg00280.html [v3] https://listman.redhat.com/archives/libvir-list/2022-January/msg00131.html [v2] https://listman.redhat.com/archives/libvir-list/2018-November/msg00802.html Andrea Bolognani (7): qemu: Only probe KVM on Linux fixup! qemu: Fix / improve virQEMUCapsProbeHVF() tests: Introduce testQemuHostOS tests: Add macOS support to testutilsqemu tests: Add macOS support to qemuxml2*test tests: Add HVF test cases fixup! NEWS: Mention Apple Silicon support for HVF Roman Bolshakov (13): qemu: Add KVM CPUs into cache only if KVM is present conf: Add hvf domain type qemu: Define hvf capability qemu: Query hvf capability on macOS qemu: Expose hvf domain type if hvf is supported qemu: Introduce virQEMUCapsAccelStr qemu: Introduce virQEMUCapsTypeIsAccelerated qemu: Introduce virQEMUCapsHaveAccel qemu: Correct CPU capabilities probing for hvf docs: Add hvf on QEMU driver page docs: Note hvf support for domain elements docs: Add support page for libvirt on macOS news: Mention hvf domain type NEWS.rst | 6 + docs/docs.html.in | 3 + docs/drvqemu.rst | 48 +++++- docs/formatdomain.rst | 22 +-- docs/index.html.in | 4 +- docs/macos.rst | 44 ++++++ docs/meson.build | 1 + docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 147 ++++++++++++++++-- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 4 + src/qemu/qemu_process.c | 10 +- .../hvf-aarch64-virt-headless.args | 48 ++++++ .../hvf-aarch64-virt-headless.xml | 45 ++++++ .../hvf-x86_64-q35-headless.args | 47 ++++++ .../hvf-x86_64-q35-headless.x86_64-latest.err | 1 + .../hvf-x86_64-q35-headless.xml | 44 ++++++ tests/qemuxml2argvtest.c | 43 ++++- .../hvf-aarch64-virt-headless.xml | 94 +++++++++++ .../hvf-x86_64-q35-headless.xml | 97 ++++++++++++ tests/qemuxml2xmltest.c | 43 ++++- tests/testutilsqemu.c | 146 +++++++++++++---- tests/testutilsqemu.h | 10 ++ 25 files changed, 849 insertions(+), 64 deletions(-) create mode 100644 docs/macos.rst create mode 100644 tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args create mode 100644 tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml create mode 100644 tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args create mode 100644 tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml create mode 100644 tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml create mode 100644 tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.xml -- 2.31.1

1 20

[PATCH] docs: Add man page for libvirt-guests
by Jim Fehlig 10 Jan '22

10 Jan '22

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/manpages/index.rst | 1 + docs/manpages/libvirt-guests.rst | 146 +++++++++++++++++++++++++++++++ docs/manpages/meson.build | 1 + tools/libvirt-guests.service.in | 2 +- 4 files changed, 149 insertions(+), 1 deletion(-) diff --git a/docs/manpages/index.rst b/docs/manpages/index.rst index fb4a36d46a..b2717bc9f2 100644 --- a/docs/manpages/index.rst +++ b/docs/manpages/index.rst @@ -41,6 +41,7 @@ Tools * `virt-admin(1) <virt-admin.html>`__ - daemon administration interface * `virsh(1) <virsh.html>`__ - management user interface * `virt-qemu-run(1) <virt-qemu-run.html>`__ - run standalone QEMU instances +* `libvirt-guests(8) <libvirt-guests.html>`__ - Suspend/Resume running libvirt guests Key codes ========= diff --git a/docs/manpages/libvirt-guests.rst b/docs/manpages/libvirt-guests.rst new file mode 100644 index 0000000000..9dc7ed3473 --- /dev/null +++ b/docs/manpages/libvirt-guests.rst @@ -0,0 +1,146 @@ +============== +libvirt-guests +============== + +------------------------------------- +suspend/resume running libvirt guests +------------------------------------- + +:Manual section: 8 +:Manual group: Virtualization Support + +.. contents:: + +SYNOPSIS +======== + +``libvirt-guests`` *COMMAND* + + +DESCRIPTION +=========== + +``libvirt-guests`` is a service that can be used to coordinate guest and host +lifecyle actions. By default, ``libvirt-guests`` will suspend running guests +when the host shuts down, and restore them to their pre-shutdown state when +the host reboots. + +``libvirt-guests`` is typically under control of systemd. When +``libvirt-guests.service`` is enabled, systemd will call ``libvirt-guests`` +with the ``start`` *command* when the host boots. Conversely, systemd will call +``libvirt-guests`` with the ``stop`` *command* when the host shuts down. + +``libvirt-guests`` can be used directly. In addition to the ``start`` and +``stop`` *commands*, it also supports ``status``, ``restart``, ``condrestart``, +``try-restart``, ``reload``, ``force-reload``, ``gueststatus``, and +``shutdown`` *commands*. + + +ENVIRONMENT +=========== + +The following environment variables can be used to alter the behavior of +``libvirt-guests`` + +- URIS=default + + URIs to check for running guests + +- ON_BOOT=start + + Action taken on host boot + + * start + + All guests which were running on shutdown are started on boot regardless + of their autostart settings + + * ignore + + ``libvirt-guests`` won't start any guest on boot, however, guests marked + as autostart will still be automatically started by libvirtd + +- START_DELAY=0 + + Number of seconds to wait between each guest start. Set to 0 to allow parallel + startup. + +- ON_SHUTDOWN=suspend + + 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. + +- PARALLEL_SHUTDOWN=0 + + 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. + +- SHUTDOWN_TIMEOUT=300 + + 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). + +- BYPASS_CACHE=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. + + - SYNC_TIME=1 + + 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. + + +BUGS +==== + +Please report all bugs you discover. This should be done via either: + +#. the mailing list + + `https://libvirt.org/contact.html <https://libvirt.org/contact.html>`_ + +#. the bug tracker + + `https://libvirt.org/bugs.html <https://libvirt.org/bugs.html>`_ + +Alternatively, you may report bugs to your software distributor / vendor. + + +AUTHORS +======= + +Please refer to the AUTHORS file distributed with libvirt. + + +LICENSE +======= + +``libvirt-guests`` is distributed under the terms of the GNU LGPL v2.1+. +This is free software; see the source for copying conditions. There +is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE + + +SEE ALSO +======== + +libvirtd(8), `https://libvirt.org/ <https://libvirt.org/>`_ diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index 6763d19af8..2c84011aa7 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -39,6 +39,7 @@ docs_man_files = [ { 'name': 'virtvboxd', 'section': '8', 'install': conf.has('WITH_VBOX') }, { 'name': 'virtvzd', 'section': '8', 'install': conf.has('WITH_VZ') }, { 'name': 'virtxend', 'section': '8', 'install': conf.has('WITH_LIBXL') }, + { 'name': 'libvirt-guests', 'section': '8', 'install': true }, ] foreach name : keycode_list diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index 10c664016a..1a9b233e11 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -6,7 +6,7 @@ After=network.target After=time-sync.target After=libvirtd.service After=virt-guest-shutdown.target -Documentation=man:libvirtd(8) +Documentation=man:libvirt-guests(8) Documentation=https://libvirt.org [Service] -- 2.34.1

3 3

[PATCH v1] virdnsmasq: fix runtime search for executable
by Olaf Hering 10 Jan '22

10 Jan '22

dnsmasq is an optional binary which does not neccessary exist during build. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- src/util/virdnsmasq.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index f2f606913f..06d192c99d 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -729,8 +729,26 @@ dnsmasqCapsRefreshInternal(dnsmasqCaps *caps, bool force) return ret; } +static char * +dnsmasqGetBinaryPath(void) +{ + static const char binary[] = DNSMASQ; + char *binary_path; + + if (g_path_is_absolute(binary)) + return g_strdup(binary); + + binary_path = virFindFileInPath(binary); + if (!binary_path) { + virReportSystemError(ENOENT, _("Cannot find '%s' in path"), binary); + binary_path = g_strdup(binary); + } + + return binary_path; +} + static dnsmasqCaps * -dnsmasqCapsNewEmpty(const char *binaryPath) +dnsmasqCapsNewEmpty(void) { dnsmasqCaps *caps; @@ -739,14 +757,14 @@ dnsmasqCapsNewEmpty(const char *binaryPath) if (!(caps = virObjectNew(dnsmasqCapsClass))) return NULL; caps->flags = virBitmapNew(DNSMASQ_CAPS_LAST); - caps->binaryPath = g_strdup(binaryPath ? binaryPath : DNSMASQ); + caps->binaryPath = dnsmasqGetBinaryPath(); return caps; } dnsmasqCaps * dnsmasqCapsNewFromBuffer(const char *buf) { - dnsmasqCaps *caps = dnsmasqCapsNewEmpty(DNSMASQ); + dnsmasqCaps *caps = dnsmasqCapsNewEmpty(); if (!caps) return NULL; @@ -761,7 +779,7 @@ dnsmasqCapsNewFromBuffer(const char *buf) dnsmasqCaps * dnsmasqCapsNewFromBinary(void) { - dnsmasqCaps *caps = dnsmasqCapsNewEmpty(DNSMASQ); + dnsmasqCaps *caps = dnsmasqCapsNewEmpty(); if (!caps) return NULL; @@ -776,7 +794,7 @@ dnsmasqCapsNewFromBinary(void) const char * dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps) { - return caps ? caps->binaryPath : DNSMASQ; + return caps ? caps->binaryPath : dnsmasqGetBinaryPath(); } unsigned long

3 6

[PATCH] virsh-network: Don't check for virshXXXTypeFromString() >= VIR_XXX_LAST
by Michal Privoznik 10 Jan '22

10 Jan '22

They way our VIR_ENUM_IMPL() and virXXXTypeFromString() work is that for any string that's not recognized a negative one is returned. And, since VIR_XXX_LAST is passed to VIR_ENUM_IMPL() we can be sure that all enum members are covered. Therefore, there is no way that virXXXTypeFromString() can return a value that's bigger or equal to VIR_XXX_LAST. I've noticed two places where such comparison was made, both in cmdNetworkUpdate(). Drop them. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-network.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 5f574be78c..b2daf31d6b 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -984,7 +984,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) command = VIR_NETWORK_UPDATE_COMMAND_ADD_LAST; } else { command = virshNetworkUpdateCommandTypeFromString(commandStr); - if (command <= 0 || command >= VIR_NETWORK_UPDATE_COMMAND_LAST) { + if (command <= 0) { vshError(ctl, _("unrecognized command name '%s'"), commandStr); goto cleanup; } @@ -994,7 +994,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) goto cleanup; section = virshNetworkSectionTypeFromString(sectionStr); - if (section <= 0 || section >= VIR_NETWORK_SECTION_LAST) { + if (section <= 0) { vshError(ctl, _("unrecognized section name '%s'"), sectionStr); goto cleanup; } -- 2.34.1

2 1

[libvirt PATCH v2 0/1] Improve usage information and manual pages
by Andrea Bolognani 10 Jan '22

10 Jan '22

Changes from [v1]: * the commit message has been updated to include the rationale for adding a manual page for virt-ssh-helper. [v1] https://listman.redhat.com/archives/libvir-list/2021-December/msg00466.html Andrea Bolognani (1): virt-ssh-helper: Add manual page docs/manpages/meson.build | 1 + docs/manpages/virt-ssh-helper.rst | 95 +++++++++++++++++++++++++++++++ libvirt.spec.in | 1 + 3 files changed, 97 insertions(+) create mode 100644 docs/manpages/virt-ssh-helper.rst -- 2.31.1

4 10