- Devel - libvirt List Archives

Release of libvirt-9.3.0
by Jiri Denemark 02 May '23

02 May '23

The 9.3.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://download.libvirt.org/ https://download.libvirt.org/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * New features * qemu: Introduce support for ``igb`` network interface model ``igb`` is a successor to the ``e1000e`` network device using PCIe interface. It was introduced in QEMU 8.0 * qemu: Improve handling of maximum physical address configuration * Improvements * qemu: Change default machine type for ARM and RISC-V ARM and RISC-V architectures now use the ``virt`` machine type by default. The previous defaults were nearly unusable and had to be overridden in most cases. * Improve translatable strings format substitutions All translatable error messages with substitution strings were converted to use positional modifiers to allow translators to shuffle around words in the translation. The translations in Weblate were also updated to match. * qemu: Improve validation of ``watchdog`` devices Certain invalid configurations of ``watchdog`` device are now properly detected: - hotplug of always-present platform watchdogs is forbidden - ``iTCO`` watchdog can be configured only once - ``ib700`` watchdog is allowed only on ``i440fx`` machines * Improved output of ``virt-host-validate`` on ARM Our validation tool now parses the ``IORT`` data on ARM to properly detect presence of SMMU and other features. * Bug fixes * qemu: Fix inactive internal snapshots of VM with UEFI firmware Recent changes to UEFI firmware handling resulted into breaking support for inactive internal snapshots of VMs with UEFI which historically worked. (Although the intention was to disallow them together with active ones, but the check did not work properly.) Preserve existing functionality by allowing such snapshots explicitly. * qemu: Properly configure locked memory limit for VMs with ``<disk type='nvme'`` The NVMe driver in qemu requires some memory to be locked. This was not taken into account in the code which calculates the memory limits based on devices present in the configuration * Fix native build on win32 Various improvements to the build system now allow users to build the client library of libvirt on win32 natively. * qemu: Properly detect tray of hotplugged CD-ROM devices Media in a CD-ROM device which was hotplugged could not be changed as the presence of the tray was not detected properly on hotplug. Enjoy. Jirka

1 0

[PATCH] NEWS: Update news for the 9.3.0 release
by Peter Krempa 02 May '23

02 May '23

Update the news file mentioning important changes such as the change of translatable strings or the fix of inactive snapshots of VMs using uefi. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 2a844ce40c..d0d78e2127 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,6 +17,13 @@ v9.3.0 (unreleased) * **New features** + * qemu: Introduce support for ``igb`` network interface model + + ``igb`` is a successor to the ``e1000e`` network device using PCIe interface. + It was introduced in QEMU 8.0 + + * qemu: Improve handling of maximum physical address configuration + * **Improvements** * qemu: Change default machine type for ARM and RISC-V @@ -25,8 +32,54 @@ v9.3.0 (unreleased) The previous defaults were nearly unusable and had to be overridden in most cases. + * Improve translatable strings format substitutions + + All translatable error message with substitution strings were converted to + use positional modifiers to allow translators to shuffle around the + translated message. The translations pulled from Weblate were also updated to + match. + + * qemu: Improve validation of ``watchdog`` devices + + Certain invalid configurations of ``watchdog`` device are now properly + detected: + + - hotplug of always-present platform watchdogs is forbidden + - ``iTCO`` watchdog can be configured only once + - ``ib700`` watchdog is allowed only on ``i440fx`` machines + + * Improved output of ``virt-host-validate`` on ARM + + Our validation tool now parses the ``IORT`` data on ARM to properly detect + presence of SMMU and other features. + * **Bug fixes** + * qemu: Fix inactive internal snapshots of VM with UEFI firmware + + Recent changes to UEFI firmware handling resulted into breaking support + for inactive internal snapshots of VMs with UEFI which historically worked. + (Although the intention was to disallow them together with active ones, but + the check did not work properly.) + + Preserve existing functionality by allowing such snapshots explicitly. + + * qemu: Properly configure locked memory limit for VMs with ``<disk type='nvme'`` + + The NVMe driver in qemu requires some memory to be locked. This was not + taken into account in the code which calculates the memory limits based + on devices present in the configuration + + * Fix native build on win32 + + Various improvements to the build system now allow users to build the client + library of libvirt on win32 natively. + + * qemu: Properly detect tray of hotplugged CD-ROM devices + + Media in a CD-ROM device which was hotplugged could not be changed as the + presence of the tray was not detected properly on hotplug. + v9.2.0 (2023-04-01) =================== -- 2.40.0

2 1

[PATCH v3 00/10] Deprecate/rename singlestep command line option, monitor interfaces
by Peter Maydell 02 May '23

02 May '23

The command line option '-singlestep' and its HMP equivalent the 'singlestep' command are very confusingly named, because they have nothing to do with single-stepping the guest (either via the gdb stub or by emulation of guest CPU architectural debug facilities). What they actually do is put TCG into a mode where it puts only one guest instruction into each translation block. This is useful for some circumstances such as when you want the -d debug logging to be easier to interpret, or if you have a finicky guest binary that wants to see interrupts delivered at something other than the end of a basic block. The confusing name is made worse by the fact that our documentation for these is so minimal as to be useless for telling users what they really do. This series: * changes the command line interface: for user-mode emulators, the new option is '-one-insn-per-tb', and for system mode emulators it is a TCG accel property '-accel tcg,one-insn-per-tb=on' * updates all the places which currently directly touch the 'singlestep' global variable to instead get the current accelerator and query/set the QOM property (except the one internal to TCG itself in curr_cflags()) * documents that the old -singlestep option is deprecated * adds a new HMP command 'one-insn-per-tb', and deprecates the old 'singlestep' command. (Strictly we don't need to deprecate HMP commands, but I'd already written the code for v1 of this series and it's a minor user convenience.) * moves the 'is one-insn-per-tb on?' info from 'info status' to 'info jit' * deprecates the 'singlestep' member of the QMP StatusInfo type, with no replacement. (We have a sketch of a design of how we might provide this in QMP if we need to, but I'm pretty sure nobody using QMP is actually using the info in the 'singlestep' field, especially since it's always been wrongly documented and there's no write interface, only a read one.) Changes v2->v3: * curr_cflags() is a hot path, so use a global variable so it doesn't have to fetch the current accelerator object. (NB: I haven't done the tcg_global_cflags thing suggested in review of v2; justification in the below-the-fold part of the patch 3 commit message notes.) * put the new line in test-hmp.c in its proper alphabetical order place in patch 8 * in patch 10 don't provide a replacement field in the QMP StatusInfo type, just deprecate the old one * I finally tested that bsd-user compiles, and fixed the missing-close-bracket error in that patch :-) Patches still needing review: 3, 7, 10 thanks -- PMM Peter Maydell (10): make one-insn-per-tb an accel option softmmu: Don't use 'singlestep' global in QMP and HMP commands accel/tcg: Use one_insn_per_tb global instead of old singlestep global linux-user: Add '-one-insn-per-tb' option equivalent to '-singlestep' bsd-user: Add '-one-insn-per-tb' option equivalent to '-singlestep' Document that -singlestep command line option is deprecated accel/tcg: Report one-insn-per-tb in 'info jit', not 'info status' hmp: Add 'one-insn-per-tb' command equivalent to 'singlestep' qapi/run-state.json: Fix missing newline at end of file hmp: Deprecate 'singlestep' member of StatusInfo docs/about/deprecated.rst | 39 +++++++++++++++++++++++++++++++++++++ docs/user/main.rst | 14 +++++++++++-- qapi/run-state.json | 16 +++++++++++---- accel/tcg/internal.h | 2 ++ include/exec/cpu-common.h | 2 -- include/monitor/hmp.h | 2 +- accel/tcg/cpu-exec.c | 2 +- accel/tcg/monitor.c | 14 +++++++++++++ accel/tcg/tcg-all.c | 23 ++++++++++++++++++++++ bsd-user/main.c | 14 ++++++++----- linux-user/main.c | 18 +++++++++++------ softmmu/globals.c | 1 - softmmu/runstate-hmp-cmds.c | 25 ++++++++++++++++++------ softmmu/runstate.c | 10 +++++++++- softmmu/vl.c | 17 ++++++++++++++-- tests/qtest/test-hmp.c | 1 + hmp-commands.hx | 25 ++++++++++++++++++++---- qemu-options.hx | 12 ++++++++++-- tcg/tci/README | 2 +- 19 files changed, 201 insertions(+), 38 deletions(-) -- 2.34.1

4 29

[PATCH] virpci: Resolve leak in virPCIVirtualFunctionList cleanup
by Tim Shearer 02 May '23

02 May '23

Repeatedly querying an SR-IOV PCI device's capabilities exposes a memory leak caused by a failure to free the virPCIVirtualFunction array within the parent struct's g_autoptr cleanup. Valgrind output after getting a single interface's XML description 1000 times: ==325982== 256,000 bytes in 1,000 blocks are definitely lost in loss record 2,634 of 2,635 ==325982== at 0x4C3C096: realloc (vg_replace_malloc.c:1437) ==325982== by 0x59D952D: g_realloc (in /usr/lib64/libglib-2.0.so.0.5600.4) ==325982== by 0x4EE1F52: virReallocN (viralloc.c:52) ==325982== by 0x4EE1FB7: virExpandN (viralloc.c:78) ==325982== by 0x4EE219A: virInsertElementInternal (viralloc.c:183) ==325982== by 0x4EE23B2: virAppendElement (viralloc.c:288) ==325982== by 0x4F65D85: virPCIGetVirtualFunctionsFull (virpci.c:2389) ==325982== by 0x4F65753: virPCIGetVirtualFunctions (virpci.c:2256) ==325982== by 0x505CB75: virNodeDeviceGetPCISRIOVCaps (node_device_conf.c:2969) ==325982== by 0x505D181: virNodeDeviceGetPCIDynamicCaps (node_device_conf.c:3099) ==325982== by 0x505BC4E: virNodeDeviceUpdateCaps (node_device_conf.c:2677) ==325982== by 0x260FCBB2: nodeDeviceGetXMLDesc (node_device_driver.c:355) Signed-off-by: Tim Shearer <tshearer(a)adva.com> --- src/util/virpci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virpci.c b/src/util/virpci.c index 9e564e4a4f..cc2b07bbba 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2245,6 +2245,7 @@ virPCIVirtualFunctionListFree(virPCIVirtualFunctionList *list) g_free(list->functions[i].ifname); } + g_free(list->functions); g_free(list); } -- 2.31.1

2 1

None
by daggs 01 May '23

01 May '23

Greetings, I'm trying to boot a VM with pi of the on sound card and the gpu using libvirt[1] and qemu I have a script that loads the needed KVM mods, starts libvirt and press the HDD Then starts the VM with virus. I've configured qemu hooks to run scripts in the relevant events. In prepare, I disable active ui, unbind the screen and consoles, unload all the mods of the hw and load the vfio mods with the IDs of the devs and allow unsafe intrs. Then libvirt tries to start the VM and fails with the this error: error: Failed to start domain 'win_user_home' error: internal error: qemu unexpectedly closed the monitor: 2023-05-01T14:59:49.968252Z qemu-system-x86_64: -device {"driver":"vfio-pci","host":"0000:05:00.0","id":"hostdev0","bus":"pci.5","multifunction":true,"addr":"0x0"}: vfio 0000:05:00.0: failed to setup container for group 14: Failed to set iommu for container: Operation not permitted The GPU has its own iommu group[2] and I pass the soundcard too. Why am I getting this error? I did got the VM to start in earlier more simple setup with less devices so I know it boots. thanks, Dagg 1. xml file: <domain type='kvm'> <name>win_user_home</name> <uuid>f17be092-0fcb-47b6-b717-d4b8052ed289</uuid> <metadata> <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0"> <libosinfo:os id="http://microsoft.com/win/11"/> </libosinfo:libosinfo> </metadata> <memory unit='KiB'>24582834</memory> <currentMemory unit='KiB'>24582834</currentMemory> <vcpu placement='static'>12</vcpu> <os firmware='efi'> <type arch='x86_64' machine='pc-q35-7.1'>hvm</type> <firmware> <feature enabled='no' name='enrolled-keys'/> <feature enabled='yes' name='secure-boot'/> </firmware> <loader readonly='yes' secure='yes' type='pflash'>/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd</loader> <nvram template='/usr/share/edk2-ovmf/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/win_user_home_VARS.fd</nvram> <boot dev='cdrom'/> <bootmenu enable='no'/> </os> <features> <acpi/> <apic/> <hyperv mode='custom'> <relaxed state='on'/> <vapic state='on'/> <spinlocks state='on' retries='8191'/> <vpindex state='on'/> <runtime state='on'/> <synic state='on'/> <reset state='on'/> <vendor_id state='on' value='wateverr'/> <frequencies state='on'/> </hyperv> <kvm> <hidden state='on'/> </kvm> <vmport state='off'/> <smm state='on'/> <ioapic driver='kvm'/> </features> <cpu mode='host-passthrough' check='none' migratable='on'> <topology sockets='1' dies='1' cores='6' threads='2'/> <cache level='3' mode='emulate'/> <feature policy='require' name='topoext'/> </cpu> <clock offset='utc'> <timer name='rtc' tickpolicy='catchup'/> <timer name='pit' tickpolicy='delay'/> <timer name='hpet' present='no'/> <timer name='kvmclock' present='yes'/> <timer name='hypervclock' present='yes'/> </clock> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <pm> <suspend-to-mem enabled='no'/> <suspend-to-disk enabled='no'/> </pm> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw' cache='none' io='native' discard='unmap' detect_zeroes='unmap'/> <source dev='/dev/loop0p2'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> </disk> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/home/virt_admin/Win11_22H2_EnglishInternational_x64v1.iso'/> <target dev='sda' bus='sata'/> <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> <controller type='usb' index='0' model='qemu-xhci' ports='15'> <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> </controller> <controller type='sata' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> </controller> <controller type='pci' index='0' model='pcie-root'/> <controller type='pci' index='1' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='1' port='0x8'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> </controller> <controller type='pci' index='2' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='2' port='0x9'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <controller type='pci' index='3' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='3' port='0xa'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='4' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='4' port='0xb'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/> </controller> <controller type='pci' index='5' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='5' port='0xc'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/> </controller> <controller type='pci' index='6' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='6' port='0xd'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/> </controller> <controller type='pci' index='7' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='7' port='0xe'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x6'/> </controller> <interface type='bridge'> <mac address='52:54:00:85:5b:21'/> <source bridge='br0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </interface> <serial type='pty'> <target type='isa-serial' port='0'> <model name='isa-serial'/> </target> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <tpm model='tpm-tis'> <backend type='emulator' version='2.0'/> </tpm> <audio id='1' type='none'/> <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x05' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0' multifunction='on'/> </hostdev> <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x05' slot='0x00' function='0x1'/> </source> <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x1'/> </hostdev> <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x07' slot='0x00' function='0x4'/> </source> <address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x4'/> </hostdev> <watchdog model='itco' action='reset'/> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> </memballoon> </devices> </domain> 2. iommu list: IOMMU Group 0: 00:01.0 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse PCIe Dummy Host Bridge [1022:1482] IOMMU Group 1: 00:01.2 PCI bridge [0604]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse GPP Bridge [1022:1483] IOMMU Group 2: 00:02.0 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse PCIe Dummy Host Bridge [1022:1482] IOMMU Group 3: 00:03.0 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse PCIe Dummy Host Bridge [1022:1482] IOMMU Group 4: 00:03.1 PCI bridge [0604]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse GPP Bridge [1022:1483] IOMMU Group 5: 00:04.0 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse PCIe Dummy Host Bridge [1022:1482] IOMMU Group 6: 00:05.0 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse PCIe Dummy Host Bridge [1022:1482] IOMMU Group 7: 00:07.0 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse PCIe Dummy Host Bridge [1022:1482] IOMMU Group 8: 00:07.1 PCI bridge [0604]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse Internal PCIe GPP Bridge 0 to bus[E:B] [1022:1484] IOMMU Group 9: 00:08.0 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse PCIe Dummy Host Bridge [1022:1482] IOMMU Group 10: 00:08.1 PCI bridge [0604]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse Internal PCIe GPP Bridge 0 to bus[E:B] [1022:1484] IOMMU Group 11: 00:14.0 SMBus [0c05]: Advanced Micro Devices, Inc. [AMD] FCH SMBus Controller [1022:790b] (rev 61) 00:14.3 ISA bridge [0601]: Advanced Micro Devices, Inc. [AMD] FCH LPC Bridge [1022:790e] (rev 51) IOMMU Group 12: 00:18.0 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Matisse/Vermeer Data Fabric: Device 18h; Function 0 [1022:1440] 00:18.1 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Matisse/Vermeer Data Fabric: Device 18h; Function 1 [1022:1441] 00:18.2 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Matisse/Vermeer Data Fabric: Device 18h; Function 2 [1022:1442] 00:18.3 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Matisse/Vermeer Data Fabric: Device 18h; Function 3 [1022:1443] 00:18.4 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Matisse/Vermeer Data Fabric: Device 18h; Function 4 [1022:1444] 00:18.5 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Matisse/Vermeer Data Fabric: Device 18h; Function 5 [1022:1445] 00:18.6 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Matisse/Vermeer Data Fabric: Device 18h; Function 6 [1022:1446] 00:18.7 Host bridge [0600]: Advanced Micro Devices, Inc. [AMD] Matisse/Vermeer Data Fabric: Device 18h; Function 7 [1022:1447] IOMMU Group 13: 01:00.0 USB controller [0c03]: Advanced Micro Devices, Inc. [AMD] 500 Series Chipset USB 3.1 XHCI Controller [1022:43ee] 01:00.1 SATA controller [0106]: Advanced Micro Devices, Inc. [AMD] 500 Series Chipset SATA Controller [1022:43eb] 01:00.2 PCI bridge [0604]: Advanced Micro Devices, Inc. [AMD] 500 Series Chipset Switch Upstream Port [1022:43e9] 02:08.0 PCI bridge [0604]: Advanced Micro Devices, Inc. [AMD] Device [1022:43ea] 02:09.0 PCI bridge [0604]: Advanced Micro Devices, Inc. [AMD] Device [1022:43ea] 03:00.0 Network controller [0280]: Intel Corporation Wi-Fi 6 AX200 [8086:2723] (rev 1a) 04:00.0 Ethernet controller [0200]: Realtek Semiconductor Co., Ltd. RTL8125 2.5GbE Controller [10ec:8125] (rev 04) IOMMU Group 14: 05:00.0 VGA compatible controller [0300]: NVIDIA Corporation GP107 [GeForce GTX 1050 Ti] [10de:1c82] (rev a1) 05:00.1 Audio device [0403]: NVIDIA Corporation GP107GL High Definition Audio Controller [10de:0fb9] (rev a1) IOMMU Group 15: 06:00.0 Non-Essential Instrumentation [1300]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse PCIe Dummy Function [1022:148a] IOMMU Group 16: 07:00.0 Non-Essential Instrumentation [1300]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse Reserved SPP [1022:1485] IOMMU Group 17: 07:00.1 Encryption controller [1080]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse Cryptographic Coprocessor PSPCPP [1022:1486] IOMMU Group 18: 07:00.3 USB controller [0c03]: Advanced Micro Devices, Inc. [AMD] Matisse USB 3.0 Host Controller [1022:149c] IOMMU Group 19: 07:00.4 Audio device [0403]: Advanced Micro Devices, Inc. [AMD] Starship/Matisse HD Audio Controller [1022:1487]

1 0

[PATCH v2 0/1] qemu: Allow sockets in long or deep paths.
by Nick Guenther 29 Apr '23

29 Apr '23

v1: https://listman.redhat.com/archives/libvir-list/2023-April/239441.html Address v1's cleanup bugs by using g_autofree and the concurrency bugs by forking a subprocess before chdir(). It works! I have been working on the other solution of putting paths in /var/run, from https://listman.redhat.com/archives/libvir-list/2023-April/239536.html, but so my attempts have ballooned out of control. I would like to offer this improved version of my original patch in the meantime. Plus there's the unclear impact of the other strategy on upgrades: https://listman.redhat.com/archives/libvir-list/2023-April/239470.html, which means even once that's implemented it will take a long time to vet. The chdir() approach cuts right to the point. I'm hoping you'll accept both approaches as complementary and worth adopting. Original issue: https://gitlab.com/libvirt/libvirt/-/issues/466 Cheers! Nick Guenther (1): qemu: Allow sockets in long or deep paths. src/qemu/qemu_command.c | 72 ++++++++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 15 deletions(-) -- 2.34.1

2 3

[PATCH 0/2] tools: virsh-domain: display progress with enhanced granularity
by Shaleen Bathla 28 Apr '23

28 Apr '23

Changes since v1 ================================================================================ - Remove superfluous parenthesis - Update progress as 99.99 instead of 99.00 - Add comment for auto-round-off prevention logic for double Description ================================================================================== While working with active blockcommit using virsh/libvirt, we found that in case of heavy IO, the progress may stay stuck at 99% for quite a while. It will be much better if we show progress upto 2 decimal places more precise which should be sufficient for most scenarios for now. This will give a user, a better understanding of the progress of blockjob/blockcommit etc This patch intends to do exactly that by adding more granularity to blockjob/blockcommit etc progress. Shaleen Bathla (2): tools: virsh-domain: refactor variable initialization tools: virsh-domain: display progress with enhanced granularity tools/virsh-domain.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) -- 2.31.1

3 6

Entering freeze for libvirt-9.3.0
by Jiri Denemark 27 Apr '23

27 Apr '23

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

1 1

[libvirt PATCH v2 0/1] meson: Check header usability
by Andrea Bolognani 27 Apr '23

27 Apr '23

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/850846324 Changes from [v1]: * replace all uses of has_header() with check_header(). [v1] https://listman.redhat.com/archives/libvir-list/2023-April/239672.html Andrea Bolognani (1): meson: Check header usability meson.build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.40.0

2 5

[libvirt PATCH] meson: Check usability of linux/kvm.h
by Andrea Bolognani 27 Apr '23

27 Apr '23

This fixes cross-building in some scenarios. Specifically, when building for armv7l on x86_64, has_header() will see the x86_64 version of the header and consider it usable. Later, when an attempt is made to actually use it, the compiler will quickly realize that things can't quite work. The reason why we haven't hit this in our CI is that we only ever install the foreign version of header files. When building the Debian package, however, some of the Debian-specific tooling will bring in the native version of the Linux headers in addition to the foreign one, causing Meson to misreport the header's availability status. Checking for its actual usability, as opposed to mere presence, is enough to make things work correctly in all cases. https://bugs.debian.org/1024504 Suggested-by: Helmut Grohne <helmut(a)subdivi.de> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- meson.build | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index d35d5e076b..21a4bd5b37 100644 --- a/meson.build +++ b/meson.build @@ -614,7 +614,6 @@ headers = [ 'asm/hwcap.h', 'ifaddrs.h', 'libtasn1.h', - 'linux/kvm.h', 'mntent.h', 'net/ethernet.h', 'net/if.h', @@ -635,12 +634,24 @@ if host_machine.system() == 'freebsd' headers += 'libutil.h' endif +# headers for which we need to check actual usability. in most +# cases, checking for presence is enough (and it's way faster) +check_headers = [ + 'linux/kvm.h', +] + foreach name : headers if cc.has_header(name) conf.set('WITH_@0@'.format(name.underscorify().to_upper()), 1) endif endforeach +foreach name : check_headers + if cc.check_header(name) + conf.set('WITH_@0@'.format(name.underscorify().to_upper()), 1) + endif +endforeach + # check for kernel header required by src/util/virnetdevbridge.c if host_machine.system() == 'linux' if not cc.has_header('linux/sockios.h') -- 2.40.0

3 4

[PATCH] ci: Regenerate files
by Michal Privoznik 27 Apr '23

27 Apr '23

This removes minor version number from OpenSUSE LEAP target names and on CentOS Stream 9 installs flake8 from repositories, instead of pip. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- ci/buildenv/centos-stream-9.sh | 5 +---- .../{opensuse-leap-154.sh => opensuse-leap-15.sh} | 0 ci/containers/centos-stream-9.Dockerfile | 6 +----- ...leap-154.Dockerfile => opensuse-leap-15.Dockerfile} | 0 ci/gitlab/builds.yml | 10 +++++----- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 7 files changed, 10 insertions(+), 17 deletions(-) rename ci/buildenv/{opensuse-leap-154.sh => opensuse-leap-15.sh} (100%) rename ci/containers/{opensuse-leap-154.Dockerfile => opensuse-leap-15.Dockerfile} (100%) diff --git a/ci/buildenv/centos-stream-9.sh b/ci/buildenv/centos-stream-9.sh index 79d74d9b2b..454e1f6322 100644 --- a/ci/buildenv/centos-stream-9.sh +++ b/ci/buildenv/centos-stream-9.sh @@ -68,9 +68,7 @@ function install_buildenv() { polkit \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ + python3-flake8 \ qemu-img \ readline-devel \ rpcgen \ @@ -88,7 +86,6 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - /usr/bin/pip3 install flake8 } export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" diff --git a/ci/buildenv/opensuse-leap-154.sh b/ci/buildenv/opensuse-leap-15.sh similarity index 100% rename from ci/buildenv/opensuse-leap-154.sh rename to ci/buildenv/opensuse-leap-15.sh diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index 6478031379..47e9008b72 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -69,9 +69,7 @@ RUN dnf distro-sync -y && \ polkit \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ + python3-flake8 \ qemu-img \ readline-devel \ rpcgen \ @@ -92,8 +90,6 @@ RUN dnf distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN /usr/bin/pip3 install flake8 - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/opensuse-leap-154.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile similarity index 100% rename from ci/containers/opensuse-leap-154.Dockerfile rename to ci/containers/opensuse-leap-15.Dockerfile diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 545478d351..258d7a1da7 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -285,23 +285,23 @@ x86_64-fedora-rawhide-clang-local-env: RPM: skip -x86_64-opensuse-leap-154-prebuilt-env: +x86_64-opensuse-leap-15-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-opensuse-leap-154-container + - job: x86_64-opensuse-leap-15-container optional: true allow_failure: false variables: - NAME: opensuse-leap-154 + NAME: opensuse-leap-15 RPM: skip -x86_64-opensuse-leap-154-local-env: +x86_64-opensuse-leap-15-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: IMAGE: registry.opensuse.org/opensuse/leap:15.4 - NAME: opensuse-leap-154 + NAME: opensuse-leap-15 RPM: skip diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 150df26519..5a02843ed9 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -77,11 +77,11 @@ x86_64-fedora-rawhide-container: NAME: fedora-rawhide -x86_64-opensuse-leap-154-container: +x86_64-opensuse-leap-15-container: extends: .container_job allow_failure: false variables: - NAME: opensuse-leap-154 + NAME: opensuse-leap-15 x86_64-opensuse-tumbleweed-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index b68c7361ab..82b8463605 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -160,7 +160,7 @@ targets: freebsd-13: x86_64 - opensuse-leap-154: + opensuse-leap-15: jobs: - arch: x86_64 variables: -- 2.39.2

2 1

[libvirt PATCH 0/2] docs: Link to java.libvirt.org
by Andrea Bolognani 27 Apr '23

27 Apr '23

That's the new canonical location for information on libvirt-java. A server-side redirect will have to be created in order to keep existing external links working. Andrea Bolognani (2): docs: Link to java.libvirt.org docs: Drop java.rst docs/bindings.rst | 3 +- docs/docs.rst | 2 +- docs/java.rst | 127 ---------------------------------------------- docs/meson.build | 1 - 4 files changed, 3 insertions(+), 130 deletions(-) delete mode 100644 docs/java.rst -- 2.40.0

3 5

[PATCH 0/2] tools: virsh-domain: display progress with enhanced granularity
by Shaleen Bathla 27 Apr '23

27 Apr '23

While working with active blockcommit using virsh/libvirt, we found that in case of heavy IO, the progress may stay stuck at 99% for quite a while. It will be much better if we show progress upto 2 decimal places more precise which should be sufficient for most scenarios for now. This will give a user, a better understanding of the progress of blockjob/blockcommit etc This patch intends to do exactly that by adding more granularity to blockjob/blockcommit etc progress. Shaleen Bathla (2): tools: virsh-domain: refactor variable initialization tools: virsh-domain: display progress with enhanced granularity tools/virsh-domain.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) -- 2.31.1

3 4

[libvirt PATCH] run: add ability to set selinux context
by Jonathon Jongsma 26 Apr '23

26 Apr '23

When running libvirt from the build directory with the 'run' script, it will run as unconfined_t. This can result in unexpected behavior when selinux is enforcing due to the fact that the selinux policies are written assuming that libvirt is running with the system_u:system_r:virtd_t context. This patch adds a new --selinux option to the run script. When this option is specified, it will launch the specified binary using the 'runcon' utility to set its selinux context to the one mentioned above. Since this requires root privileges, setting the selinux context is not the default behavior and must be enabled with the command line switch. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- run.in | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/run.in b/run.in index c6d3411082..4aa458b791 100644 --- a/run.in +++ b/run.in @@ -40,6 +40,7 @@ # # ---------------------------------------------------------------------- +import argparse import os import os.path import random @@ -59,15 +60,20 @@ def prepend(env, varname, extradir): here = "@abs_builddir@" -if len(sys.argv) < 2: - print("syntax: %s BINARY [ARGS...]" % sys.argv[0], file=sys.stderr) +parser = argparse.ArgumentParser(add_help=False) +parser.add_argument('--selinux', + action='store_true', + help='Run in the appropriate selinux context') + +opts, args = parser.parse_known_args() + +if len(args) < 1: + print("syntax: %s [--selinux] BINARY [ARGS...]" % sys.argv[0], file=sys.stderr) sys.exit(1) -prog = sys.argv[1] -args = sys.argv[1:] +prog = args[0] env = os.environ - prepend(env, "LD_LIBRARY_PATH", os.path.join(here, "src")) prepend(env, "PKG_CONFIG_PATH", os.path.join(here, "src")) prepend(env, "PATH", os.path.join(here, "tools")) @@ -130,10 +136,20 @@ def change_unit(name, action): return ret == 0 +def chcon(path, type): + ret = subprocess.call(["chcon", "-t", type, path]) + return ret == 0 + + +def restorecon(path): + ret = subprocess.call(["restorecon", path]) + return ret == 0 + + try_stop_units = [] if is_systemd_host(): maybe_stopped_units = [] - for arg in sys.argv: + for arg in args: name = os.path.basename(arg) if is_modular_daemon(name): # Only need to stop libvirtd or this specific modular unit @@ -149,6 +165,31 @@ if is_systemd_host(): if is_unit_active(unit): try_stop_units.append(unit) +if opts.selinux: + # if using a wrapper command like 'gdb', setting the selinux context + # won't work because the wrapper command will not be a valid entrypoint + # for the virtd_t context + if os.path.basename(prog) not in ["libvirtd", *modular_daemons]: + sys.exit("'{}' is not recognized as a valid libvirt daemon. Selinux " + "process context can only be set when using executing a " + "libvirt daemon directly without wrapper commands".format(prog)) + + progpath = os.path.abspath(prog) + if not progpath.startswith(os.path.abspath(here)): + sys.exit("Refusing to change selinux context of file outside build " + "directory: {}".format(prog)) + + # selinux won't allow us to transition to the virtd_t context from e.g. the + # user_home_t context (the likely label of the local executable file) + print("Setting file context of {} to virtd_exec_t...".format(progpath)) + if not chcon(progpath, "virtd_exec_t"): + sys.exit("Failed to change selinux context of binary") + + args = ['runcon', + '-u', 'system_u', + '-r', 'system_r', + '-t', 'virtd_t', *args] + if len(try_stop_units) == 0: # Run the program directly, replacing ourselves os.execvpe(prog, args, env) @@ -178,6 +219,9 @@ else: except Exception as e: print("%s" % e, file=sys.stderr) finally: + if opts.selinux: + print("Restoring selinux context...") + restorecon(prog) print("Re-starting original systemd units...") stopped_units.reverse() for unit in stopped_units: -- 2.39.2

2 6

Re: [PATCH v3 10/10] hmp: Deprecate 'singlestep' member of StatusInfo
by Peter Maydell 25 Apr '23

25 Apr '23

On Tue, 25 Apr 2023 at 13:10, Markus Armbruster <armbru(a)redhat.com> wrote: > > Peter Maydell <peter.maydell(a)linaro.org> writes: > > > -# Notes: @singlestep is enabled through the GDB stub > > +# Notes: @singlestep is enabled on the command line with > > +# '-accel tcg,one-insn-per-tb=on', or with the HMP > > +# 'one-insn-per-tb' command. > > You're deleting "enabled through the GDB stub". Is this one of the > misstatements you alluded to in the commit message Yes -- this field has never been anything to do with GDB-enabled singlestep (or for that matter with emulation of any guest-CPU architecture singlestep functionality). I assume that whoever originally wrote that text was confused by the terrible name of the command line option/global variable. -- PMM

2 1

[PATCH] docs: Fix missing backtick in formatdomain.rst
by Martin Kletzander 25 Apr '23

25 Apr '23

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 8420f5f99c3a..3b9251547e84 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1209,7 +1209,7 @@ NUMA Node Tuning memory nodes, and it requires setting mode to 'restrictive' in ``memnode`` elements (see quirk below). This exists solely for the purpose of being able to request movement of such memory for a running domain using ``virsh - numatune`` or ``virDomainSetNumaParameters` and is not guaranteed to happen. + numatune`` or ``virDomainSetNumaParameters`` and is not guaranteed to happen. Attribute ``nodeset`` specifies the NUMA nodes, using the same syntax as attribute ``cpuset`` of element ``vcpu``. Attribute ``placement`` ( :since:`since 0.9.12` ) can be used to indicate the memory placement mode for -- 2.40.0

1 0

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

25 Apr '23

v2 of: https://listman.redhat.com/archives/libvir-list/2023-April/239378.html diff to v1: - More patches - Dropped qemuHostdevPreparePCIDevicesCheckSupport() completely - Dropped virQEMUCaps passing (patch 9/9) - Dropped even more checks effectively dead code Michal Prívozník (9): qemuDomainAttachHostDevice: Prepare device early and for all types qemu_domain: Move internals of qemuDomainPrepareHostdev() into a separate function qemu: Move <hostdev/> PCI backend setting into qemuDomainPrepareHostdev() qemuxml2argvtest: Drop needless PCI backend setting qemu: Deny all but VFIO PCI backends in hostdev prepare phase qemu_hotplug: Drop PCI backend check in qemuDomainAttachHostPCIDevice() qemu: Move <hostdev> SCSI path generation into qemuDomainPrepareHostdev() qemu: Remove empty functions qemu: Stop virQEMUCaps propagation into qemuHostdevPreparePCIDevices() src/qemu/qemu_domain.c | 167 ++++++++++++++++++++++++++++----------- src/qemu/qemu_driver.c | 56 ------------- src/qemu/qemu_hostdev.c | 67 +--------------- src/qemu/qemu_hostdev.h | 2 - src/qemu/qemu_hotplug.c | 43 ++-------- src/qemu/qemu_process.c | 60 +------------- src/qemu/qemu_process.h | 3 - tests/qemuxml2argvmock.c | 10 +++ tests/qemuxml2argvtest.c | 28 ------- 9 files changed, 142 insertions(+), 294 deletions(-) -- 2.39.2

3 20

[PATCH 0/2] lxc: Couple of almost trivial fixes
by Michal Privoznik 25 Apr '23

25 Apr '23

*** BLURB HERE *** Michal Prívozník (2): lxc: Make lxcCreateHostdevDef() less versatile lxc: Fix access to hostdev capabilities src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_hostdev.c | 4 ++-- src/lxc/lxc_native.c | 14 +++++--------- 3 files changed, 8 insertions(+), 12 deletions(-) -- 2.39.2

2 3

[PATCH v2] vfio/pci: Propagate ACPI notifications to user-space via eventfd
by Grzegorz Jaszczyk 25 Apr '23

25 Apr '23

To allow pass-through devices receiving ACPI notifications, permit to register ACPI notify handler (via introduced new ioctl) for a given device. The handler role is to receive and propagate such ACPI notifications to the user-space through the user provided eventfd. This allows VMM to receive and propagate them further to the VM, where the actual driver for pass-through device resides and can react to device specific notifications accordingly. The eventfd usage ensures VMM and device isolation: it allows to use a dedicated channel associated with the device for such events, such that the VMM has direct access. Since the eventfd counter is used as ACPI notification value placeholder, the eventfd signaling needs to be serialized in order to not end up with notification values being coalesced. Therefore ACPI notification values are buffered and signalized one by one, when the previous notification value has been consumed. Signed-off-by: Grzegorz Jaszczyk <jaz(a)semihalf.com> --- Changelog v1..v2: - The v2 implementation is actually completely different then v1: instead of using acpi netlink events for propagating ACPI notifications to the user space take advantage of eventfd, which can provide better VMM and device isolation: it allows to use a dedicated channel associated with the device for such events, such that the VMM has direct access. - Using eventfd counter as notification value placeholder was suggested in v1 and requires additional serialization logic introduced in v2. - Since the vfio-pci supports non-ACPI platforms address !CONFIG_ACPI case. - v1 discussion: https://patchwork.kernel.org/project/kvm/patch/20230307220553.631069-1-jaz@… --- drivers/vfio/pci/vfio_pci_core.c | 215 +++++++++++++++++++++++++++++++ include/linux/vfio_pci_core.h | 11 ++ include/uapi/linux/vfio.h | 15 +++ 3 files changed, 241 insertions(+) diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c index a5ab416cf476..ba8c49217875 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -10,6 +10,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/acpi.h> #include <linux/aperture.h> #include <linux/device.h> #include <linux/eventfd.h> @@ -679,6 +680,70 @@ void vfio_pci_core_disable(struct vfio_pci_core_device *vdev) } EXPORT_SYMBOL_GPL(vfio_pci_core_disable); +struct notification_queue { + int notification_val; + struct list_head notify_val_next; +}; + +#if IS_ENABLED(CONFIG_ACPI) +static void vfio_pci_core_acpi_notify(acpi_handle handle, u32 event, void *data) +{ + struct vfio_pci_core_device *vdev = (struct vfio_pci_core_device *)data; + struct vfio_acpi_notification *acpi_notify = vdev->acpi_notification; + struct notification_queue *entry; + + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + return; + + entry->notification_val = event; + INIT_LIST_HEAD(&entry->notify_val_next); + + mutex_lock(&acpi_notify->notification_list_lock); + list_add_tail(&entry->notify_val_next, &acpi_notify->notification_list); + mutex_unlock(&acpi_notify->notification_list_lock); + + schedule_work(&acpi_notify->acpi_notification_work); +} + +void vfio_pci_acpi_notify_close_device(struct vfio_pci_core_device *vdev) +{ + struct vfio_acpi_notification *acpi_notify = vdev->acpi_notification; + struct pci_dev *pdev = vdev->pdev; + struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); + struct notification_queue *entry, *entry_tmp; + u64 cnt; + + if (!acpi_notify || !acpi_notify->acpi_notify_trigger) + return; + + acpi_remove_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, + vfio_pci_core_acpi_notify); + + eventfd_ctx_remove_wait_queue(acpi_notify->acpi_notify_trigger, + &acpi_notify->wait, &cnt); + + flush_work(&acpi_notify->acpi_notification_work); + + mutex_lock(&acpi_notify->notification_list_lock); + list_for_each_entry_safe(entry, entry_tmp, + &acpi_notify->notification_list, + notify_val_next) { + list_del(&entry->notify_val_next); + kfree(entry); + } + mutex_unlock(&acpi_notify->notification_list_lock); + + eventfd_ctx_put(acpi_notify->acpi_notify_trigger); + + kfree(acpi_notify); + + vdev->acpi_notification = NULL; +} +#else +void vfio_pci_acpi_notify_close_device(struct vfio_pci_core_device *vdev) {} +#endif /* CONFIG_ACPI */ + void vfio_pci_core_close_device(struct vfio_device *core_vdev) { struct vfio_pci_core_device *vdev = @@ -705,6 +770,8 @@ void vfio_pci_core_close_device(struct vfio_device *core_vdev) vdev->req_trigger = NULL; } mutex_unlock(&vdev->igate); + + vfio_pci_acpi_notify_close_device(vdev); } EXPORT_SYMBOL_GPL(vfio_pci_core_close_device); @@ -882,6 +949,152 @@ int vfio_pci_core_register_dev_region(struct vfio_pci_core_device *vdev, } EXPORT_SYMBOL_GPL(vfio_pci_core_register_dev_region); +#if IS_ENABLED(CONFIG_ACPI) +static int vfio_pci_eventfd_wakeup(wait_queue_entry_t *wait, unsigned int mode, + int sync, void *key) +{ + struct vfio_acpi_notification *acpi_notify = + container_of(wait, struct vfio_acpi_notification, wait); + __poll_t flags = key_to_poll(key); + + /* + * eventfd_read signalize EPOLLOUT at the end of its function - this + * means previous eventfd with its notification value was consumed so + * the next notification can be signalized now if pending - schedule + * proper work. + */ + if (flags & EPOLLOUT) { + mutex_unlock(&acpi_notify->notification_lock); + schedule_work(&acpi_notify->acpi_notification_work); + } + + return 0; +} + +static void vfio_pci_ptable_queue_proc(struct file *file, + wait_queue_head_t *wqh, poll_table *pt) +{ + struct vfio_acpi_notification *acpi_notify = + container_of(pt, struct vfio_acpi_notification, pt); + + add_wait_queue(wqh, &acpi_notify->wait); +} + +static void acpi_notification_work_fn(struct work_struct *work) +{ + struct vfio_acpi_notification *acpi_notify; + struct notification_queue *entry; + + acpi_notify = container_of(work, struct vfio_acpi_notification, + acpi_notification_work); + + mutex_lock(&acpi_notify->notification_list_lock); + if (list_empty(&acpi_notify->notification_list) || !acpi_notify->acpi_notify_trigger) + goto out; + + /* + * If the previous eventfd was not yet consumed by user-space lets hold + * on and exit. The notification function will be rescheduled when + * signaling eventfd will be possible (when the EPOLLOUT will be + * signalized and unlocks notify_events). + */ + if (!mutex_trylock(&acpi_notify->notification_lock)) + goto out; + + entry = list_first_entry(&acpi_notify->notification_list, + struct notification_queue, notify_val_next); + + list_del(&entry->notify_val_next); + mutex_unlock(&acpi_notify->notification_list_lock); + + eventfd_signal(acpi_notify->acpi_notify_trigger, entry->notification_val); + + kfree(entry); + + return; +out: + mutex_unlock(&acpi_notify->notification_list_lock); +} + +static int vfio_pci_ioctl_acpi_notify_eventfd(struct vfio_pci_core_device *vdev, struct + vfio_irq_info __user *arg) +{ + struct file *acpi_notify_trigger_file; + struct vfio_acpi_notification *acpi_notify; + struct pci_dev *pdev = vdev->pdev; + struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); + struct vfio_acpi_notify_eventfd entry; + struct eventfd_ctx *efdctx; + acpi_status status; + __poll_t events; + + if (!adev) + return -ENODEV; + + if (copy_from_user(&entry, arg, sizeof(entry))) + return -EFAULT; + + if (entry.notify_eventfd < 0) + return -EINVAL; + + efdctx = eventfd_ctx_fdget(entry.notify_eventfd); + if (IS_ERR(efdctx)) + return PTR_ERR(efdctx); + + vdev->acpi_notification = kzalloc(sizeof(*acpi_notify), GFP_KERNEL); + if (!vdev->acpi_notification) + return -ENOMEM; + + acpi_notify = vdev->acpi_notification; + + INIT_WORK(&acpi_notify->acpi_notification_work, acpi_notification_work_fn); + INIT_LIST_HEAD(&acpi_notify->notification_list); + + acpi_notify->acpi_notify_trigger = efdctx; + + mutex_init(&acpi_notify->notification_lock); + + /* + * Install custom wake-up handler to be notified whenever underlying + * eventfd is consumed by the user-space. + */ + init_waitqueue_func_entry(&acpi_notify->wait, vfio_pci_eventfd_wakeup); + init_poll_funcptr(&acpi_notify->pt, vfio_pci_ptable_queue_proc); + + acpi_notify_trigger_file = eventfd_fget(entry.notify_eventfd); + events = vfs_poll(acpi_notify_trigger_file, &acpi_notify->pt); + + status = acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, + vfio_pci_core_acpi_notify, (void *)vdev); + + if (ACPI_FAILURE(status)) { + u64 cnt; + + pci_err(pdev, "Failed to install notify handler: %s", + acpi_format_exception(status)); + + eventfd_ctx_remove_wait_queue(acpi_notify->acpi_notify_trigger, + &acpi_notify->wait, &cnt); + + flush_work(&acpi_notify->acpi_notification_work); + + eventfd_ctx_put(acpi_notify->acpi_notify_trigger); + + kfree(acpi_notify); + + return -ENODEV; + } + + return 0; +} +#else +static int vfio_pci_ioctl_acpi_notify_eventfd(struct vfio_pci_core_device *vdev, struct + vfio_irq_info __user *arg) +{ + return -ENODEV; +} +#endif /* CONFIG_ACPI */ + static int vfio_pci_ioctl_get_info(struct vfio_pci_core_device *vdev, struct vfio_device_info __user *arg) { @@ -1398,6 +1611,8 @@ long vfio_pci_core_ioctl(struct vfio_device *core_vdev, unsigned int cmd, return vfio_pci_ioctl_reset(vdev, uarg); case VFIO_DEVICE_SET_IRQS: return vfio_pci_ioctl_set_irqs(vdev, uarg); + case VFIO_ACPI_NOTIFY_EVENTFD: + return vfio_pci_ioctl_acpi_notify_eventfd(vdev, uarg); default: return -ENOTTY; } diff --git a/include/linux/vfio_pci_core.h b/include/linux/vfio_pci_core.h index 367fd79226a3..3711e8a1c6f0 100644 --- a/include/linux/vfio_pci_core.h +++ b/include/linux/vfio_pci_core.h @@ -49,6 +49,16 @@ struct vfio_pci_region { u32 flags; }; +struct vfio_acpi_notification { + struct eventfd_ctx *acpi_notify_trigger; + struct work_struct acpi_notification_work; + struct list_head notification_list; + struct mutex notification_list_lock; + struct mutex notification_lock; + poll_table pt; + wait_queue_entry_t wait; +}; + struct vfio_pci_core_device { struct vfio_device vdev; struct pci_dev *pdev; @@ -96,6 +106,7 @@ struct vfio_pci_core_device { struct mutex vma_lock; struct list_head vma_list; struct rw_semaphore memory_lock; + struct vfio_acpi_notification *acpi_notification; }; /* Will be exported for vfio pci drivers usage */ diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 0552e8dcf0cb..d4b602d8f4b2 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -1622,6 +1622,21 @@ struct vfio_iommu_spapr_tce_remove { }; #define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20) +/** + * VFIO_ACPI_NOTIFY_EVENTFD - _IOW(VFIO_TYPE, VFIO_BASE + 21, struct vfio_acpi_notify_eventfd) + * + * Register ACPI notify handler for a given device which will allow to receive + * and propagate ACPI notifications to the user-space through the user provided + * eventfd. + * + * Return: 0 on success, -errno on failure. + */ +struct vfio_acpi_notify_eventfd { + __s32 notify_eventfd; + __u32 reserved; +}; +#define VFIO_ACPI_NOTIFY_EVENTFD _IO(VFIO_TYPE, VFIO_BASE + 21) + /* ***************************************************************** */ #endif /* _UAPIVFIO_H */ -- 2.40.0.634.g4ca3ef3211-goog

2 3

[libvirt PATCHv2 0/3] qemu: support host-phys-bits-limit
by Ján Tomko 24 Apr '23

24 Apr '23

Ján Tomko (3): conf: cpu: add limit for maxphysaddr qemu: add support for setting host-phys-bits-limit qemu: allow forcing emulated maxphysaddr docs/formatdomain.rst | 10 ++++-- src/conf/cpu_conf.c | 13 ++++++++ src/conf/cpu_conf.h | 1 + src/conf/schemas/cputypes.rng | 5 +++ src/qemu/qemu_command.c | 8 ++++- src/qemu/qemu_validate.c | 7 ---- ...-phys-bits-emulate-bare.x86_64-latest.args | 33 +++++++++++++++++++ .../cpu-phys-bits-emulate-bare.xml | 20 +++++++++++ .../cpu-phys-bits-emulate3.err | 1 - .../cpu-phys-bits-emulate3.xml | 20 ----------- .../cpu-phys-bits-limit.x86_64-latest.args | 33 +++++++++++++++++++ .../qemuxml2argvdata/cpu-phys-bits-limit.xml | 20 +++++++++++ tests/qemuxml2argvtest.c | 3 +- ...u-phys-bits-emulate-bare.x86_64-latest.xml | 31 +++++++++++++++++ .../cpu-phys-bits-limit.x86_64-latest.xml | 31 +++++++++++++++++ tests/qemuxml2xmltest.c | 3 ++ 16 files changed, 207 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.xml delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate3.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-limit.xml create mode 100644 tests/qemuxml2xmloutdata/cpu-phys-bits-emulate-bare.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/cpu-phys-bits-limit.x86_64-latest.xml -- 2.39.2

2 6

[PATCH 00/11] qemuhotplugtest: Various cleanups and improvements
by Michal Privoznik 24 Apr '23

24 Apr '23

While working on something else, I've taken a look at qemuhotplugtest and realized we can do various cleanups and improvements. The test still covers just live attach/detach/update, but after this it's prepared better to test also config attach/detach/update. Michal Prívozník (11): qemu: Replace @dom argument with @driver in qemuDomainUpdateDeviceLive() qemu: Move qemuDomainAttachDeviceLive() into qemu_hotplug.c qemu: Move qemuDomainUpdateDeviceLive() into qemu_hotplug.c qemuhotplugtest: Call qemuDomainDetachDeviceLive() directly qemuhotplugtest: Call qemuDomainAttachDeviceLive() directly qemuhotplugtest: Call qemuDomainUpdateDeviceLive() directly qemu_hotplug.h: Expose less functions qemuhotplugtest: Fix misleading comment on monitor unlock qemuhotplugtest: Don't overwrite vm->def->id in testQemuHotplugCheckResult() qemuhotplugtest: use g_autoptr(virDomainDeviceDef) qemuhotplugtest: Verify domain XML on UPDATE src/qemu/qemu_driver.c | 472 +--------------- src/qemu/qemu_hotplug.c | 525 +++++++++++++++++- src/qemu/qemu_hotplug.h | 68 +-- tests/qemuhotplugtest.c | 197 +------ ...hotplug-disk-cdrom+disk-cdrom-nochange.xml | 1 + .../qemuhotplug-disk-cdrom.xml | 30 +- ...graphics-spice+graphics-spice-nochange.xml | 1 + ...graphics-spice-listen-network-password.xml | 71 +++ ...imeout+graphics-spice-timeout-nochange.xml | 1 + ...imeout+graphics-spice-timeout-password.xml | 117 ++++ .../qemuhotplug-graphics-spice-timeout.xml | 50 +- .../qemuhotplug-graphics-spice.xml | 41 +- 12 files changed, 819 insertions(+), 755 deletions(-) create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom+disk-cdrom-nochange.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice+graphics-spice-nochange.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network+graphics-spice-listen-network-password.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-nochange.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml -- 2.39.2

2 22

[libvirt PATCH] Move default Input bus logic to PostParse handling
by K Shiva 24 Apr '23

24 Apr '23

A new enum type "Default" has been added for Input bus. The logic that handled default input bus types in virDomainInputParseXML() has been moved to a new function virDomainInputDefPostParse() in domain_postparse.c Link to Issue: https://gitlab.com/libvirt/libvirt/-/issues/8 Signed-off-by: K Shiva <shiva_kr(a)riseup.net> --- src/conf/domain_conf.c | 27 +++------------------------ src/conf/domain_conf.h | 1 + src/conf/domain_postparse.c | 30 ++++++++++++++++++++++++++++++ src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_hotplug.c | 2 ++ 6 files changed, 38 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b03a3ff011..22af3f1d8a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -905,6 +905,7 @@ VIR_ENUM_IMPL(virDomainInput, VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST, + "default", "ps2", "usb", "xen", @@ -10693,7 +10694,6 @@ virDomainPanicDefParseXML(virDomainXMLOption *xmlopt, /* Parse the XML definition for an input device */ static virDomainInputDef * virDomainInputDefParseXML(virDomainXMLOption *xmlopt, - const virDomainDef *dom, xmlNodePtr node, xmlXPathContextPtr ctxt, unsigned int flags) @@ -10741,27 +10741,7 @@ virDomainInputDefParseXML(virDomainXMLOption *xmlopt, } } else { - if (dom->os.type == VIR_DOMAIN_OSTYPE_HVM) { - if ((def->type == VIR_DOMAIN_INPUT_TYPE_MOUSE || - def->type == VIR_DOMAIN_INPUT_TYPE_KBD) && - (ARCH_IS_X86(dom->os.arch) || dom->os.arch == VIR_ARCH_NONE)) { - def->bus = VIR_DOMAIN_INPUT_BUS_PS2; - } else if (ARCH_IS_S390(dom->os.arch) || - def->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) { - def->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO; - } else if (def->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) { - def->bus = VIR_DOMAIN_INPUT_BUS_NONE; - } else { - def->bus = VIR_DOMAIN_INPUT_BUS_USB; - } - } else if (dom->os.type == VIR_DOMAIN_OSTYPE_XEN || - dom->os.type == VIR_DOMAIN_OSTYPE_XENPVH) { - def->bus = VIR_DOMAIN_INPUT_BUS_XEN; - } else { - if ((dom->virtType == VIR_DOMAIN_VIRT_VZ || - dom->virtType == VIR_DOMAIN_VIRT_PARALLELS)) - def->bus = VIR_DOMAIN_INPUT_BUS_PARALLELS; - } + def->bus = VIR_DOMAIN_INPUT_BUS_DEFAULT; } if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt, &def->info, flags) < 0) @@ -13766,7 +13746,7 @@ virDomainDeviceDefParse(const char *xmlStr, return NULL; break; case VIR_DOMAIN_DEVICE_INPUT: - if (!(dev->data.input = virDomainInputDefParseXML(xmlopt, def, node, + if (!(dev->data.input = virDomainInputDefParseXML(xmlopt, node, ctxt, flags))) return NULL; break; @@ -18872,7 +18852,6 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, for (i = 0; i < n; i++) { virDomainInputDef *input = virDomainInputDefParseXML(xmlopt, - def, nodes[i], ctxt, flags); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 511067a050..2a8fc6f90d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1510,6 +1510,7 @@ typedef enum { } virDomainInputType; typedef enum { + VIR_DOMAIN_INPUT_BUS_DEFAULT, VIR_DOMAIN_INPUT_BUS_PS2, VIR_DOMAIN_INPUT_BUS_USB, VIR_DOMAIN_INPUT_BUS_XEN, diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c index b756e2cde8..7ef478e3e1 100644 --- a/src/conf/domain_postparse.c +++ b/src/conf/domain_postparse.c @@ -649,6 +649,33 @@ virDomainFSDefPostParse(virDomainFSDef *fs) return 0; } +static void +virDomainInputDefPostParse(virDomainInputDef *input, + const virDomainDef *def) +{ + if (input->bus == VIR_DOMAIN_INPUT_BUS_DEFAULT) { + if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { + if ((input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE || + input->type == VIR_DOMAIN_INPUT_TYPE_KBD) && + (ARCH_IS_X86(def->os.arch) || def->os.arch == VIR_ARCH_NONE)) { + } else if (ARCH_IS_S390(def->os.arch) || + input->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) { + input->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO; + } else if (input->type == VIR_DOMAIN_INPUT_TYPE_EVDEV) { + input->bus = VIR_DOMAIN_INPUT_BUS_NONE; + } else { + input->bus = VIR_DOMAIN_INPUT_BUS_USB; + } + } else if (def->os.type == VIR_DOMAIN_OSTYPE_XEN || + def->os.type == VIR_DOMAIN_OSTYPE_XENPVH) { + input->bus = VIR_DOMAIN_INPUT_BUS_XEN; + } else { + if ((def->virtType == VIR_DOMAIN_VIRT_VZ || + def->virtType == VIR_DOMAIN_VIRT_PARALLELS)) + input->bus = VIR_DOMAIN_INPUT_BUS_PARALLELS; + } + } +} static int virDomainDeviceDefPostParseCommon(virDomainDeviceDef *dev, @@ -701,6 +728,9 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_NET: case VIR_DOMAIN_DEVICE_INPUT: + virDomainInputDefPostParse(dev->data.input, def); + ret = 0; + break; case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_WATCHDOG: case VIR_DOMAIN_DEVICE_GRAPHICS: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4ca93bf3dc..135e35f43a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4345,6 +4345,7 @@ qemuBuildInputCommandLine(virCommand *cmd, if (!(props = qemuBuildInputVirtioDevProps(def, input, qemuCaps))) return -1; + case VIR_DOMAIN_INPUT_BUS_DEFAULT: case VIR_DOMAIN_INPUT_BUS_PS2: case VIR_DOMAIN_INPUT_BUS_XEN: case VIR_DOMAIN_INPUT_BUS_PARALLELS: diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 7d3d072d5a..49c5e199fa 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -984,6 +984,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev, } return 0; + case VIR_DOMAIN_INPUT_BUS_DEFAULT: case VIR_DOMAIN_INPUT_BUS_PS2: case VIR_DOMAIN_INPUT_BUS_USB: case VIR_DOMAIN_INPUT_BUS_XEN: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5072798cb7..f7a41e376e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3053,6 +3053,7 @@ qemuDomainAttachInputDevice(virDomainObj *vm, goto cleanup; break; + case VIR_DOMAIN_INPUT_BUS_DEFAULT: case VIR_DOMAIN_INPUT_BUS_PS2: case VIR_DOMAIN_INPUT_BUS_XEN: case VIR_DOMAIN_INPUT_BUS_PARALLELS: @@ -5799,6 +5800,7 @@ qemuDomainDetachPrepInput(virDomainObj *vm, *detach = input = vm->def->inputs[idx]; switch ((virDomainInputBus) input->bus) { + case VIR_DOMAIN_INPUT_BUS_DEFAULT: case VIR_DOMAIN_INPUT_BUS_PS2: case VIR_DOMAIN_INPUT_BUS_XEN: case VIR_DOMAIN_INPUT_BUS_PARALLELS: -- 2.40.0

3 2

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

21 Apr '23

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

2 5

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

21 Apr '23

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

3 4

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

21 Apr '23

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

3 10