- Devel - libvirt List Archives

[libvirt PATCH] Remove trailing spaces from translatable strings
by Ján Tomko 03 Apr '23

03 Apr '23

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/rpc/virnetsshsession.c | 2 +- src/test/test_driver.c | 2 +- tools/virt-admin.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 7bf27c161a..f84805825b 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -737,7 +737,7 @@ virNetSSHAuthenticateKeyboardInteractive(virNetSSHSession *sess, if (!sess->cred || !sess->cred->cb) { virReportError(VIR_ERR_SSH, "%s", _("Can't perform keyboard-interactive authentication: " - "Authentication callback not provided ")); + "Authentication callback not provided")); return -1; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 822639e0f3..7b06896d44 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3979,7 +3979,7 @@ testDomainSetBlockIoTune(virDomainPtr dom, do { \ if (info.FIELD > info.FIELD_MAX) { \ virReportError(VIR_ERR_INVALID_ARG, \ - _("%1$s cannot be set higher than %2$s "), \ + _("%1$s cannot be set higher than %2$s"), \ #FIELD, #FIELD_MAX); \ goto cleanup; \ } \ diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 43c91097a3..db246dc3a6 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -501,7 +501,7 @@ cmdSrvThreadpoolSet(vshControl *ctl, const vshCmd *cmd) if (!nparams) { vshError(ctl, "%s", _("At least one of options --min-workers, --max-workers, " - "--priority-workers is mandatory ")); + "--priority-workers is mandatory")); goto cleanup; } -- 2.39.2

2 1

Release of libvirt-9.2.0
by Jiri Denemark 01 Apr '23

01 Apr '23

The 9.2.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. * New features * qemu: Add support for QCOW2 formatted firmware This type of firmware can be picked up either automatically, if the corresponding JSON descriptor has the highest priority, or manually by using ``<loader format='qcow2'/>`` in the domain XML. * Improvements * qemu: Make firmware selection persistent Up until now, firmware autoselection has been performed at domain startup time: as a result, changes to the JSON firmware descriptors present on the system could have translated to a different firmware being chosen for subsequent startups of the same domain, potentially rendering it unbootable or lowering the security guarantees. Firmware selection now happens once, when the domain is defined, and its results are stored in the domain XML to be reused, unchanged, for all subsequent boots. * qemu: passt now works when SELinux/AppArmor is enabled In the case of SELinux, this requires passt-specific support code to be present in the host policy, so it might only work with upcoming operating systems and not with existing ones. * xen: Support custom UEFI firmware paths The Xen libxl driver now supports specifying a custom UEFI firmware path. Previously the Xen default was used in all cases. * Bug fixes * qemu: Fix validation of the HPET timer Due to a logic bug introduced in libvirt 9.0.0, VM configurations explicitly enabling the HPET timer were rejected. * qemu: Fix thread-context .host-nodes generation With new enough QEMU, libvirt instructs QEMU to set affinity of memory allocation threads. But this may have resulted in QEMU being unable to do so, as affinity to NUMA nodes inaccessible to emulator thread might have been requested. * rpc: fix typo in admin code generation Fix the bug in the remote ``virt-admin`` code generator, that resulted in a crash. Introduced in libvirt 9.1.0. * qemu: relax shared memory check for vhostuser daemons Fix hotplug of virtiofs ``filesystem`` after restarting libvirtd. Before, libvirtd would incorrectly complain about missing shared memory. Enjoy. Jirka

1 0

[libvirt PATCH 00/51] Use permutable format strings in translations
by Jiri Denemark 31 Mar '23

31 Mar '23

See 01/51 for rationale. Enforced by the last two patches of this series. The rest is quite boring mechanical update, partially done using a perl oneliner perl -pe 'for (my $i=1; $i<=12; $i++) { s/(N?_\("[^"]*?%)([^%$ ]*[a-zA-Z][^"]*")/\1$i\$\2/; }' and tuned manually to fix cases not covered by the regexp above and to merge multiline messages into a single line. I merged only those that were touched anyway. Some very long messages consisting of several sentences were merged only partially and split on sentence boundary. I will also update libvirt.pot once this is pushed. Also available via git fetch git@gitlab.com:jirkade/libvirt.git format-strings Jiri Denemark (51): docs: Document requirements on format strings in translated messages access: Update format strings in translated messages admin: Update format strings in translated messages bhyve: Update format strings in translated messages ch: Update format strings in translated messages conf/domain_conf: Update format strings in translated messages conf/domain_validate: Update format strings in translated messages conf/network_conf: Update format strings in translated messages conf/node_device_conf: Update format strings in translated messages conf: Update format strings in translated messages cpu: Update format strings in translated messages esx: Update format strings in translated messages hyperv: Update format strings in translated messages hypervisor: Update format strings in translated messages interface: Update format strings in translated messages libxl: Update format strings in translated messages locking: Update format strings in translated messages logging: Update format strings in translated messages lxc: Update format strings in translated messages network: Update format strings in translated messages node_device: Update format strings in translated messages nwfilter: Update format strings in translated messages openvz: Update format strings in translated messages qemu/qemu_command: Update format strings in translated messages qemu/qemu_domain: Update format strings in translated messages qemu/qemu_driver: Update format strings in translated messages qemu/qemu_hotplug: Update format strings in translated messages qemu/qemu_migration: Update format strings in translated messages qemu/qemu_monitor_json: Update format strings in translated messages qemu/qemu_process: Update format strings in translated messages qemu/qemu_validate: Update format strings in translated messages qemu: Update format strings in translated messages remote: Update format strings in translated messages rpc: Update format strings in translated messages security: Update format strings in translated messages secret: Update format strings in translated messages storage: Update format strings in translated messages storage_file: Update format strings in translated messages test: Update format strings in translated messages util: Update format strings in translated messages (part 1) util: Update format strings in translated messages (part 2) util: Update format strings in translated messages (part 3) vbox: Update format strings in translated messages vmware: Update format strings in translated messages vmx: Update format strings in translated messages vz: Update format strings in translated messages src: Update format strings in translated messages tools: Update format strings in translated messages (part 1) tools: Update format strings in translated messages (part 2) build: Add checks for permutable format strings ci: Run libvirt-pot-check in potfile job .gitlab-ci.yml | 1 + build-aux/syntax-check.mk | 5 + docs/coding-style.rst | 20 +- po/meson.build | 8 + scripts/check-pot.py | 54 ++ src/access/viraccessdriverpolkit.c | 2 +- src/access/viraccessmanager.c | 4 +- src/admin/admin_server_dispatch.c | 10 +- src/admin/libvirt-admin.c | 6 +- src/bhyve/bhyve_command.c | 18 +- src/bhyve/bhyve_domain.c | 2 +- src/bhyve/bhyve_driver.c | 38 +- src/bhyve/bhyve_firmware.c | 4 +- src/bhyve/bhyve_monitor.c | 6 +- src/bhyve/bhyve_parse_command.c | 17 +- src/bhyve/bhyve_process.c | 20 +- src/ch/ch_conf.c | 2 +- src/ch/ch_domain.c | 4 +- src/ch/ch_driver.c | 20 +- src/ch/ch_monitor.c | 27 +- src/ch/ch_process.c | 6 +- src/conf/backup_conf.c | 16 +- src/conf/capabilities.c | 21 +- src/conf/checkpoint_conf.c | 8 +- src/conf/cpu_conf.c | 46 +- src/conf/device_conf.c | 2 +- src/conf/domain_addr.c | 79 +- src/conf/domain_capabilities.c | 3 +- src/conf/domain_conf.c | 874 ++++++++---------- src/conf/domain_event.c | 4 +- src/conf/domain_postparse.c | 30 +- src/conf/domain_validate.c | 138 ++- src/conf/interface_conf.c | 17 +- src/conf/netdev_bandwidth_conf.c | 10 +- src/conf/netdev_vlan_conf.c | 10 +- src/conf/netdev_vport_profile_conf.c | 2 +- src/conf/network_conf.c | 367 +++----- src/conf/networkcommon_conf.c | 64 +- src/conf/node_device_conf.c | 178 ++-- src/conf/node_device_util.c | 6 +- src/conf/numa_conf.c | 67 +- src/conf/nwfilter_conf.c | 23 +- src/conf/nwfilter_params.c | 25 +- src/conf/object_event.c | 10 +- src/conf/secret_conf.c | 8 +- src/conf/snapshot_conf.c | 45 +- src/conf/storage_adapter_conf.c | 6 +- src/conf/storage_conf.c | 26 +- src/conf/storage_encryption_conf.c | 4 +- src/conf/storage_source_conf.c | 15 +- src/conf/virchrdev.c | 13 +- src/conf/virdomainjob.c | 25 +- src/conf/virdomainmomentobjlist.c | 8 +- src/conf/virdomainobjlist.c | 18 +- src/conf/virnetworkobj.c | 24 +- src/conf/virnetworkportdef.c | 14 +- src/conf/virnodedeviceobj.c | 9 +- src/conf/virnwfilterbindingdef.c | 4 +- src/conf/virnwfilterbindingobj.c | 4 +- src/conf/virnwfilterbindingobjlist.c | 8 +- src/conf/virnwfilterobj.c | 12 +- src/conf/virsecretobj.c | 22 +- src/conf/virstorageobj.c | 22 +- src/cpu/cpu.c | 40 +- src/cpu/cpu_arm.c | 23 +- src/cpu/cpu_map.c | 6 +- src/cpu/cpu_ppc64.c | 33 +- src/cpu/cpu_s390.c | 5 +- src/cpu/cpu_x86.c | 68 +- src/driver.c | 6 +- src/esx/esx_driver.c | 106 +-- src/esx/esx_network_driver.c | 21 +- src/esx/esx_storage_backend_iscsi.c | 6 +- src/esx/esx_storage_backend_vmfs.c | 32 +- src/esx/esx_storage_driver.c | 8 +- src/esx/esx_stream.c | 4 +- src/esx/esx_util.c | 29 +- src/esx/esx_vi.c | 189 ++-- src/esx/esx_vi_types.c | 48 +- src/hyperv/hyperv_driver.c | 46 +- src/hyperv/hyperv_network_driver.c | 4 +- src/hyperv/hyperv_util.c | 3 +- src/hyperv/hyperv_wmi.c | 43 +- src/hypervisor/domain_cgroup.c | 4 +- src/hypervisor/domain_driver.c | 20 +- src/hypervisor/virhostdev.c | 53 +- src/interface/interface_backend_netcf.c | 50 +- src/interface/interface_backend_udev.c | 100 +- src/internal.h | 20 +- src/libvirt-domain.c | 44 +- src/libvirt-host.c | 6 +- src/libvirt-lxc.c | 11 +- src/libvirt-network.c | 8 +- src/libvirt-nodedev.c | 4 +- src/libvirt-nwfilter.c | 2 +- src/libvirt-qemu.c | 4 +- src/libvirt-secret.c | 6 +- src/libvirt-storage.c | 13 +- src/libvirt.c | 24 +- src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_conf.c | 61 +- src/libxl/libxl_domain.c | 24 +- src/libxl/libxl_driver.c | 215 +++-- src/libxl/libxl_migration.c | 6 +- src/libxl/xen_common.c | 72 +- src/libxl/xen_xl.c | 28 +- src/libxl/xen_xm.c | 4 +- src/locking/lock_daemon.c | 26 +- src/locking/lock_daemon_dispatch.c | 10 +- src/locking/lock_driver_lockd.c | 12 +- src/locking/lock_driver_sanlock.c | 94 +- src/locking/lock_manager.c | 8 +- src/locking/sanlock_helper.c | 6 +- src/logging/log_cleaner.c | 2 +- src/logging/log_daemon.c | 26 +- src/logging/log_daemon_dispatch.c | 2 +- src/logging/log_handler.c | 4 +- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_container.c | 114 +-- src/lxc/lxc_controller.c | 78 +- src/lxc/lxc_domain.c | 8 +- src/lxc/lxc_driver.c | 104 +-- src/lxc/lxc_fuse.c | 4 +- src/lxc/lxc_hostdev.c | 6 +- src/lxc/lxc_native.c | 26 +- src/lxc/lxc_process.c | 38 +- src/network/bridge_driver.c | 188 ++-- src/network/bridge_driver_conf.c | 2 +- src/network/bridge_driver_linux.c | 12 +- src/network/leaseshelper.c | 12 +- src/node_device/node_device_driver.c | 37 +- src/node_device/node_device_udev.c | 49 +- src/nwfilter/nwfilter_dhcpsnoop.c | 67 +- src/nwfilter/nwfilter_driver.c | 18 +- src/nwfilter/nwfilter_ebiptables_driver.c | 16 +- src/nwfilter/nwfilter_gentech_driver.c | 19 +- src/nwfilter/nwfilter_learnipaddr.c | 9 +- src/openvz/openvz_conf.c | 29 +- src/openvz/openvz_driver.c | 43 +- src/qemu/qemu_agent.c | 41 +- src/qemu/qemu_backup.c | 12 +- src/qemu/qemu_block.c | 39 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 50 +- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_checkpoint.c | 19 +- src/qemu/qemu_command.c | 82 +- src/qemu/qemu_conf.c | 75 +- src/qemu/qemu_dbus.c | 12 +- src/qemu/qemu_domain.c | 188 ++-- src/qemu/qemu_domain_address.c | 26 +- src/qemu/qemu_domainjob.c | 6 +- src/qemu/qemu_driver.c | 428 ++++----- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_fd.c | 2 +- src/qemu/qemu_firmware.c | 42 +- src/qemu/qemu_hotplug.c | 160 ++-- src/qemu/qemu_interface.c | 6 +- src/qemu/qemu_interop_config.c | 4 +- src/qemu/qemu_migration.c | 105 ++- src/qemu/qemu_migration_cookie.c | 34 +- src/qemu/qemu_migration_params.c | 18 +- src/qemu/qemu_monitor.c | 30 +- src/qemu/qemu_monitor_json.c | 91 +- src/qemu/qemu_monitor_text.c | 4 +- src/qemu/qemu_namespace.c | 46 +- src/qemu/qemu_passt.c | 2 +- src/qemu/qemu_process.c | 116 ++- src/qemu/qemu_qapi.c | 4 +- src/qemu/qemu_saveimage.c | 30 +- src/qemu/qemu_slirp.c | 6 +- src/qemu/qemu_snapshot.c | 78 +- src/qemu/qemu_tpm.c | 29 +- src/qemu/qemu_validate.c | 317 +++---- src/qemu/qemu_vhost_user.c | 8 +- src/qemu/qemu_vhost_user_gpu.c | 2 +- src/qemu/qemu_virtiofs.c | 10 +- src/remote/remote_daemon.c | 20 +- src/remote/remote_daemon_config.c | 4 +- src/remote/remote_daemon_dispatch.c | 75 +- src/remote/remote_daemon_stream.c | 4 +- src/remote/remote_driver.c | 88 +- src/remote/remote_sockets.c | 5 +- src/remote/remote_ssh_helper.c | 16 +- src/rpc/gendispatch.pl | 10 +- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclient.c | 4 +- src/rpc/virnetclientprogram.c | 26 +- src/rpc/virnetclientstream.c | 6 +- src/rpc/virnetdaemon.c | 6 +- src/rpc/virnetlibsshsession.c | 57 +- src/rpc/virnetmessage.c | 21 +- src/rpc/virnetsaslcontext.c | 38 +- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverclient.c | 4 +- src/rpc/virnetserverprogram.c | 12 +- src/rpc/virnetsocket.c | 42 +- src/rpc/virnetsshsession.c | 59 +- src/rpc/virnettlscontext.c | 78 +- src/secret/secret_driver.c | 13 +- src/security/security_apparmor.c | 37 +- src/security/security_dac.c | 28 +- src/security/security_driver.c | 4 +- src/security/security_manager.c | 6 +- src/security/security_selinux.c | 114 +-- src/security/security_util.c | 16 +- src/security/virt-aa-helper.c | 10 +- src/storage/parthelper.c | 6 +- src/storage/storage_backend.c | 4 +- src/storage/storage_backend_disk.c | 20 +- src/storage/storage_backend_fs.c | 15 +- src/storage/storage_backend_gluster.c | 31 +- src/storage/storage_backend_iscsi.c | 6 +- src/storage/storage_backend_iscsi_direct.c | 44 +- src/storage/storage_backend_logical.c | 19 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 87 +- src/storage/storage_backend_scsi.c | 17 +- src/storage/storage_backend_vstorage.c | 2 +- src/storage/storage_driver.c | 126 +-- src/storage/storage_util.c | 176 ++-- src/storage_file/storage_file_backend.c | 8 +- src/storage_file/storage_file_backend_fs.c | 6 +- .../storage_file_backend_gluster.c | 16 +- src/storage_file/storage_file_probe.c | 13 +- src/storage_file/storage_source.c | 36 +- .../storage_source_backingstore.c | 47 +- src/test/test_driver.c | 161 ++-- src/util/iohelper.c | 10 +- src/util/viralloc.c | 2 +- src/util/virauth.c | 6 +- src/util/virauthconfig.c | 4 +- src/util/virbitmap.c | 4 +- src/util/virccw.c | 2 +- src/util/vircgroup.c | 42 +- src/util/vircgroupbackend.c | 2 +- src/util/vircgroupbackend.h | 4 +- src/util/vircgroupv1.c | 78 +- src/util/vircgroupv2.c | 80 +- src/util/vircgroupv2devices.c | 4 +- src/util/vircommand.c | 38 +- src/util/virconf.c | 40 +- src/util/vircrypto.c | 14 +- src/util/virdaemon.c | 8 +- src/util/virdevmapper.c | 8 +- src/util/virdnsmasq.c | 15 +- src/util/virerror.c | 212 ++--- src/util/virerror.h | 14 +- src/util/vireventthread.c | 2 +- src/util/virfdstream.c | 30 +- src/util/virfile.c | 184 ++-- src/util/virfilecache.c | 4 +- src/util/virfirewall.c | 4 +- src/util/virfirewalld.c | 6 +- src/util/virfirmware.c | 4 +- src/util/virgdbus.c | 4 +- src/util/virhash.c | 2 +- src/util/virhook.c | 4 +- src/util/virhostcpu.c | 36 +- src/util/virhostmem.c | 32 +- src/util/virhostuptime.c | 4 +- src/util/viridentity.c | 16 +- src/util/virinitctl.c | 6 +- src/util/viriptables.c | 2 +- src/util/viriscsi.c | 16 +- src/util/virjson.c | 24 +- src/util/virlease.c | 4 +- src/util/virlockspace.c | 34 +- src/util/virlog.c | 28 +- src/util/virmacmap.c | 6 +- src/util/virmdev.c | 18 +- src/util/virmodule.c | 10 +- src/util/virnetdev.c | 145 ++- src/util/virnetdevbandwidth.c | 7 +- src/util/virnetdevbridge.c | 64 +- src/util/virnetdevip.c | 28 +- src/util/virnetdevmacvlan.c | 4 +- src/util/virnetdevmidonet.c | 4 +- src/util/virnetdevopenvswitch.c | 28 +- src/util/virnetdevtap.c | 24 +- src/util/virnetdevveth.c | 4 +- src/util/virnetdevvportprofile.c | 39 +- src/util/virnetlink.c | 14 +- src/util/virnodesuspend.c | 2 +- src/util/virnuma.c | 26 +- src/util/virnvme.c | 6 +- src/util/virobject.c | 6 +- src/util/virpci.c | 108 +-- src/util/virperf.c | 8 +- src/util/virpidfile.c | 14 +- src/util/virpolkit.c | 2 +- src/util/virportallocator.c | 10 +- src/util/virprocess.c | 61 +- src/util/virrandom.c | 2 +- src/util/virresctrl.c | 86 +- src/util/virrotatingfile.c | 30 +- src/util/virscsi.c | 6 +- src/util/virscsihost.c | 7 +- src/util/virscsivhost.c | 6 +- src/util/virsecret.c | 5 +- src/util/virsocketaddr.c | 51 +- src/util/virstoragefile.c | 2 +- src/util/virstring.c | 8 +- src/util/virsysinfo.c | 16 +- src/util/virsystemd.c | 2 +- src/util/virthreadjob.c | 4 +- src/util/virtpm.c | 10 +- src/util/virtypedparam-public.c | 25 +- src/util/virtypedparam.c | 29 +- src/util/viruri.c | 11 +- src/util/virusb.c | 16 +- src/util/virutil.c | 35 +- src/util/virvhba.c | 7 +- src/util/virxml.c | 72 +- src/vbox/vbox_XPCOMCGlue.c | 6 +- src/vbox/vbox_common.c | 157 ++-- src/vbox/vbox_network.c | 2 +- src/vbox/vbox_snapshot_conf.c | 12 +- src/vbox/vbox_storage.c | 20 +- src/vbox/vbox_tmpl.c | 16 +- src/vmware/vmware_conf.c | 16 +- src/vmware/vmware_driver.c | 26 +- src/vmx/vmx.c | 264 +++--- src/vz/vz_driver.c | 32 +- src/vz/vz_sdk.c | 74 +- src/vz/vz_utils.c | 31 +- src/vz/vz_utils.h | 2 +- tests/virerrortest.c | 7 +- tools/virsh-checkpoint.c | 28 +- tools/virsh-domain-event.c | 65 +- tools/virsh-domain-monitor.c | 24 +- tools/virsh-domain.c | 312 +++---- tools/virsh-edit.c | 2 +- tools/virsh-host.c | 46 +- tools/virsh-interface.c | 84 +- tools/virsh-network.c | 71 +- tools/virsh-nodedev.c | 62 +- tools/virsh-nwfilter.c | 27 +- tools/virsh-pool.c | 72 +- tools/virsh-secret.c | 22 +- tools/virsh-snapshot.c | 46 +- tools/virsh-util.c | 2 +- tools/virsh-volume.c | 78 +- tools/virsh.c | 40 +- tools/virt-admin.c | 54 +- tools/virt-host-validate-bhyve.c | 4 +- tools/virt-host-validate-common.c | 4 +- tools/virt-host-validate.c | 8 +- tools/virt-login-shell-helper.c | 22 +- tools/virt-pki-query-dn.c | 12 +- tools/vsh.c | 138 ++- tools/vsh.h | 6 +- 352 files changed, 6145 insertions(+), 6762 deletions(-) create mode 100755 scripts/check-pot.py -- 2.39.2

3 67

[PATCH] vircryptotest: Fix cipher test typo aes265cbc -> aes256cbc
by Martin Kletzander 31 Mar '23

31 Mar '23

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Not pushing as trivial since after today I am so unsure and it's pre-release time =) tests/vircryptotest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vircryptotest.c b/tests/vircryptotest.c index 9fbaf2f636e5..9ffe70756e6e 100644 --- a/tests/vircryptotest.c +++ b/tests/vircryptotest.c @@ -150,7 +150,7 @@ mymain(void) ret = -1; \ } while (0) - VIR_CRYPTO_ENCRYPT(VIR_CRYPTO_CIPHER_AES256CBC, "aes265cbc", + VIR_CRYPTO_ENCRYPT(VIR_CRYPTO_CIPHER_AES256CBC, "aes256cbc", secretdata, 7, expected_ciphertext, 16); #undef VIR_CRYPTO_ENCRYPT -- 2.40.0

2 1

[PATCH 0/7] qemu capability testing cleanups and improvements (part 4)
by Peter Krempa 31 Mar '23

31 Mar '23

This series applies on top of 'part3' fetch everything from my repo: git fetch https://gitlab.com/pipo.sk/libvirt.git s390-send In this part tests for the 's390' platform are converted to use real capabilities. Peter Krempa (7): qemuxml2argvtest: Remove obsolete negative tests qemuxml2argvtest: Modernize all s390 'keywrap' tests qemuxml2argvtest: Modernize all s390 'loadparm' tests qemuxml2argvtest: Modernize s390 cpu tests qemuxml2argvtest: Convert rest of s390 tests to real caps qemuxml2xmltest: Convert all s390 test cases to real capabilities testutilsqemu: Drop fake capability testing infrastructure for 's390' tests/qemuxml2argvdata/cpu-s390-features.err | 1 - ...gs => cpu-s390-features.s390x-latest.args} | 6 +- ....args => cpu-s390-zEC12.s390x-latest.args} | 6 +- ...dev-scsi-vhost-scsi-ccw.s390x-latest.args} | 7 +- ...io-ccw-duplicate-address.s390x-latest.err} | 0 ...vfio-ccw-invalid-address.s390x-latest.err} | 0 .../hostdev-subsys-mdev-vfio-ccw.err | 1 - .../hostdev-vfio-zpci-autogenerate-fids.err | 1 - ...ev-vfio-zpci-boundaries.s390x-latest.args} | 7 +- ...tdev-vfio-zpci-duplicate.s390x-latest.err} | 0 ...stdev-vfio-zpci-set-zero.s390x-latest.err} | 0 ...v-vfio-zpci-uid-set-zero.s390x-latest.err} | 0 tests/qemuxml2argvdata/hostdev-vfio-zpci.err | 1 - ...gs => hostdev-vfio-zpci.s390x-latest.args} | 7 +- ...rgs => input-virtio-ccw.s390x-latest.args} | 7 +- ...hine-aeskeywrap-off-cap.s390x-latest.args} | 7 +- ...ine-aeskeywrap-off-caps.s390x-latest.args} | 7 +- ...chine-aeskeywrap-on-cap.s390x-latest.args} | 7 +- ...hine-aeskeywrap-on-caps.s390x-latest.args} | 7 +- ...hine-deakeywrap-off-cap.s390x-latest.args} | 7 +- ...ine-deakeywrap-off-caps.s390x-latest.args} | 7 +- ...chine-deakeywrap-on-cap.s390x-latest.args} | 7 +- ...hine-deakeywrap-on-caps.s390x-latest.args} | 7 +- .../machine-keywrap-none-caps.args | 31 ----- ...achine-keywrap-none-caps.s390x-latest.args | 34 +++++ .../machine-keywrap-none.args | 31 ----- .../machine-keywrap-none.s390x-latest.args | 34 +++++ ...ultiple-disks-nets-s390.s390x-latest.args} | 7 +- ...chine-loadparm-net-s390.s390x-latest.args} | 7 +- ...> machine-loadparm-s390.s390x-latest.args} | 7 +- ....err => s390-no-parallel.s390x-latest.err} | 0 ...rr => s390-panic-address.s390x-latest.err} | 0 ...s => s390-panic-missing.s390x-latest.args} | 7 +- ...> s390-panic-no-address.s390x-latest.args} | 7 +- ...2.args => s390-serial-2.s390x-latest.args} | 7 +- ... => s390-serial-console.s390x-latest.args} | 7 +- ...ial.args => s390-serial.s390x-latest.args} | 7 +- ...=> video-virtio-gpu-ccw.s390x-latest.args} | 7 +- tests/qemuxml2argvtest.c | 130 +++++------------- ...=> disk-virtio-s390-zpci.s390x-latest.xml} | 3 + ...tdev-scsi-vhost-scsi-ccw.s390x-latest.xml} | 4 + ...tdev-subsys-mdev-vfio-ap.s390x-latest.xml} | 4 + ...dev-subsys-mdev-vfio-ccw.s390x-latest.xml} | 4 + ...o-zpci-autogenerate-fids.s390x-latest.xml} | 3 + ...o-zpci-autogenerate-uids.s390x-latest.xml} | 3 + ...v-vfio-zpci-autogenerate.s390x-latest.xml} | 3 + ...dev-vfio-zpci-boundaries.s390x-latest.xml} | 3 + ...vfio-zpci-ccw-memballoon.s390x-latest.xml} | 1 + ...io-zpci-multidomain-many.s390x-latest.xml} | 3 + ...xml => hostdev-vfio-zpci.s390x-latest.xml} | 3 + ....xml => input-virtio-ccw.s390x-latest.xml} | 4 + ...multiple-disks-nets-s390.s390x-latest.xml} | 4 + ...ml => s390-panic-missing.s390x-latest.xml} | 4 + ...=> s390-panic-no-address.s390x-latest.xml} | 4 + ...-panic.xml => s390-panic.s390x-latest.xml} | 2 + ...l-2.xml => s390-serial-2.s390x-latest.xml} | 4 + ...l => s390-serial-console.s390x-latest.xml} | 4 + ...nsole.xml => s390-serial.s390x-latest.xml} | 4 + ... => vhost-vsock-ccw-auto.s390x-latest.xml} | 4 + .../vhost-vsock-ccw.s390x-latest.xml | 37 +++++ tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 - ...ideo-virtio-gpu-ccw-auto.s390x-latest.xml} | 4 + ... => video-virtio-gpu-ccw.s390x-latest.xml} | 4 + tests/qemuxml2xmltest.c | 81 ++++------- tests/testutilsqemu.c | 6 - 65 files changed, 355 insertions(+), 269 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-s390-features.err rename tests/qemuxml2argvdata/{cpu-s390-features.args => cpu-s390-features.s390x-latest.args} (68%) rename tests/qemuxml2argvdata/{cpu-s390-zEC12.args => cpu-s390-zEC12.s390x-latest.args} (67%) rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-ccw.args => hostdev-scsi-vhost-scsi-ccw.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-duplicate-address.err => hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-invalid-address.err => hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-boundaries.args => hostdev-vfio-zpci-boundaries.s390x-latest.args} (75%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-duplicate.err => hostdev-vfio-zpci-duplicate.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-set-zero.err => hostdev-vfio-zpci-set-zero.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-uid-set-zero.err => hostdev-vfio-zpci-uid-set-zero.s390x-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.err rename tests/qemuxml2argvdata/{hostdev-vfio-zpci.args => hostdev-vfio-zpci.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{input-virtio-ccw.args => input-virtio-ccw.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-caps.args => machine-aeskeywrap-off-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-cap.args => machine-aeskeywrap-off-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-cap.args => machine-aeskeywrap-on-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-caps.args => machine-aeskeywrap-on-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-off-cap.args => machine-deakeywrap-off-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-off-caps.args => machine-deakeywrap-off-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-on-cap.args => machine-deakeywrap-on-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-on-caps.args => machine-deakeywrap-on-caps.s390x-latest.args} (77%) delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.args create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.args create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args rename tests/qemuxml2argvdata/{machine-loadparm-multiple-disks-nets-s390.args => machine-loadparm-multiple-disks-nets-s390.s390x-latest.args} (81%) rename tests/qemuxml2argvdata/{machine-loadparm-net-s390.args => machine-loadparm-net-s390.s390x-latest.args} (70%) rename tests/qemuxml2argvdata/{machine-loadparm-s390.args => machine-loadparm-s390.s390x-latest.args} (74%) rename tests/qemuxml2argvdata/{s390-no-parallel.err => s390-no-parallel.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{s390-panic-address.err => s390-panic-address.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{s390-panic-missing.args => s390-panic-missing.s390x-latest.args} (72%) rename tests/qemuxml2argvdata/{s390-panic-no-address.args => s390-panic-no-address.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{s390-serial-2.args => s390-serial-2.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{s390-serial-console.args => s390-serial-console.s390x-latest.args} (69%) rename tests/qemuxml2argvdata/{s390-serial.args => s390-serial.s390x-latest.args} (69%) rename tests/qemuxml2argvdata/{video-virtio-gpu-ccw.args => video-virtio-gpu-ccw.s390x-latest.args} (77%) rename tests/qemuxml2xmloutdata/{disk-virtio-s390-zpci.xml => disk-virtio-s390-zpci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ap.xml => hostdev-subsys-mdev-vfio-ap.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ccw.xml => hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-fids.xml => hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-uids.xml => hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate.xml => hostdev-vfio-zpci-autogenerate.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-boundaries.xml => hostdev-vfio-zpci-boundaries.s390x-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-ccw-memballoon.xml => hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml} (96%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-multidomain-many.xml => hostdev-vfio-zpci-multidomain-many.s390x-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci.xml => hostdev-vfio-zpci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{input-virtio-ccw.xml => input-virtio-ccw.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{machine-loadparm-multiple-disks-nets-s390.xml => machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{s390-panic-missing.xml => s390-panic-missing.s390x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-panic-no-address.xml => s390-panic-no-address.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{s390-panic.xml => s390-panic.s390x-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{s390-serial-2.xml => s390-serial-2.s390x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-serial.xml => s390-serial-console.s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{s390-serial-console.xml => s390-serial.s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{vhost-vsock-ccw-auto.xml => vhost-vsock-ccw-auto.s390x-latest.xml} (87%) create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw-auto.xml => video-virtio-gpu-ccw-auto.s390x-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw.xml => video-virtio-gpu-ccw.s390x-latest.xml} (89%) -- 2.39.2

2 8

[PATCH 00/31] qemu capability testing cleanups and improvements (part 3)
by Peter Krempa 30 Mar '23

30 Mar '23

This series applies on top of 'part2' fetch everything from my repo: git fetch https://gitlab.com/pipo.sk/libvirt.git ppc-send In this part: - caps code is refactored to simplify error paths - vircapstest is removed - qemumemlocktest is converted to use real caps - qemuhotplugtest is converted to use real caps - ppc64 fake caps invocation is dropped from qemuxml2xml/argv tests - always present ppc64 caps are drooped - ppc64 fake emulators are removed Peter Krempa (31): qemu: capabilities: Drop 'kvmVersion' field libxlCapsInitGuests: Rework insane use of ternary operators virCapabilitiesAllocMachines: Use NULL-terminated list as argument and return count virQEMUCapsGetMachineTypesCaps: Remove return value virQEMUCapsInitGuestFromBinary: Refactor cleanup virQEMUCapsInitGuestFromBinary: Remove return value virQEMUCapsInitGuest: Refactor cleanup and remove return value virCapabilitiesFreeMachines: Remove unused function vircapstest: Remove 'qemu' testing tests: vircaps: Remove pointless testing of virCapabilitiesHostNUMAGetCpus tests: Remove 'vircapstest' testutilsqemu: Extract fetching of real virQEMUCaps into testQemuGetRealCaps testQemuGetRealCaps: Integrate fetching of QMP schema qemumemlocktest: Use real capabilities qemuhotplugtest: Don't fetch capabilities when they are not used qemuhotplugtestdomain: Move all i686 test cases to x86_64 qemuhotplugtest: Enable 'lsilogic' SCSI controller qemuhotplugtest: Assert QEMU_CAPS_SET_ACTION qemuhotplugtest: Refactor calling of testQemuHotplugCpuPrepare qemuhotplugtest: Use real 'latest' capabilities for hotplug testing qemuhotplugtest: Make the test more useful by validating used commands against QMP schema qemuxml2argvtest: Modernize all 'ppc64' remaining test cases qemuxml2xmltest: Modernize all remaining 'ppc64' test cases qemuxml2argvtest: Add '4.2.0' version of 'pseries-features' test case qemuxml2argvtest: Drop negative test cases for 'pseries' machine features qemuValidateDomainDefPSeriesFeature: Remove obsolete checks qemu: capabilities: Retire obsolete 'pseries' capabilities qemuValidateDomainDefPSeriesFeature: Simplify machine validation logic qemuValidateDomainDefPSeriesFeature: Simplify feature validation qemuxml2argvtest: Use real capabilities for negative test cases for ppc64 architecture testutilsqemu: Drop fake capability testing infrastructure for 'ppc64' src/conf/capabilities.c | 31 +- src/conf/capabilities.h | 5 +- src/libvirt_private.syms | 1 - src/libxl/libxl_capabilities.c | 39 ++- src/qemu/qemu_capabilities.c | 85 ++---- src/qemu/qemu_capabilities.h | 23 +- src/qemu/qemu_validate.c | 99 +----- tests/meson.build | 18 +- .../caps_4.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 8 - .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - .../caps_4.2.0_x86_64.xml | 1 - .../caps_5.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 8 - .../caps_5.0.0_riscv64.xml | 1 - .../caps_5.0.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 - .../caps_5.1.0_x86_64.xml | 1 - .../caps_5.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 8 - .../caps_5.2.0_riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - .../caps_5.2.0_x86_64.xml | 1 - .../caps_6.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - .../caps_6.0.0_x86_64.xml | 1 - .../caps_6.1.0_x86_64.xml | 1 - .../caps_6.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 8 - .../caps_6.2.0_x86_64.xml | 1 - .../caps_7.0.0_aarch64+hvf.xml | 1 - .../caps_7.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 8 - .../caps_7.0.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 8 - .../caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - .../caps_7.2.0_x86_64+hvf.xml | 1 - .../caps_7.2.0_x86_64.xml | 1 - .../caps_8.0.0_riscv64.xml | 1 - .../caps_8.0.0_x86_64.xml | 1 - tests/qemucaps2xmltest.c | 8 +- tests/qemuhotplugtest.c | 284 +++++++++--------- .../ppc64-modern-bulk-result-conf.xml | 5 +- .../ppc64-modern-bulk-result-live.xml | 5 +- .../ppc64-modern-individual-result-conf.xml | 5 +- .../ppc64-modern-individual-result-live.xml | 5 +- .../x86-modern-bulk-result-conf.xml | 5 +- .../x86-modern-bulk-result-live.xml | 5 +- .../x86-modern-individual-add-result-conf.xml | 5 +- .../x86-modern-individual-add-result-live.xml | 5 +- .../qemuhotplug-disk-scsi-2.xml | 2 +- .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 13 +- ...with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 13 +- ...otplug-base-ccw-live-with-2-ccw-virtio.xml | 13 +- ...-with-ccw-virtio+ccw-virtio-2-explicit.xml | 13 +- ...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 13 +- ...uhotplug-base-ccw-live-with-ccw-virtio.xml | 13 +- .../qemuhotplug-base-ccw-live.xml | 13 +- .../qemuhotplug-base-live+cdrom-scsi.xml | 5 +- .../qemuhotplug-base-live+cdrom-usb.xml | 5 +- ...uhotplug-base-live+disk-scsi-multipath.xml | 5 +- ...+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 5 +- .../qemuhotplug-base-live+disk-scsi.xml | 5 +- .../qemuhotplug-base-live+disk-usb.xml | 5 +- .../qemuhotplug-base-live+disk-virtio.xml | 5 +- .../qemuhotplug-base-live+guestfwd.xml | 5 +- .../qemuhotplug-base-live+hostdev-pci.xml | 5 +- .../qemuhotplug-base-live+interface-vdpa.xml | 5 +- ...qemuhotplug-base-live+ivshmem-doorbell.xml | 5 +- .../qemuhotplug-base-live+ivshmem-plain.xml | 5 +- .../qemuhotplug-base-live+qemu-agent.xml | 5 +- ...uhotplug-base-live+watchdog-user-alias.xml | 5 +- .../qemuhotplug-base-live+watchdog.xml | 5 +- .../qemuhotplug-base-live.xml | 5 +- ...hotplug-base-with-scsi-controller-live.xml | 13 +- ...thout-scsi-controller-live+disk-scsi-2.xml | 17 +- ...g-console-compat-2-live+console-virtio.xml | 5 +- .../qemuhotplug-console-compat-2-live.xml | 5 +- .../qemuhotplug-disk-cdrom.xml | 4 +- ...uhotplug-graphics-spice-listen-network.xml | 4 +- .../qemuhotplug-graphics-spice-timeout.xml | 4 +- .../qemuhotplug-graphics-spice.xml | 4 +- ...uhotplug-pseries-base-live+hostdev-pci.xml | 5 +- .../qemuhotplug-pseries-base-live.xml | 5 +- tests/qemumemlocktest.c | 27 +- ...r => aarch64-gic-not-arm.ppc64-latest.err} | 0 ... cpu-hotplug-granularity.ppc64-latest.err} | 0 ...emory-hotplug-nvdimm-ppc64-abi-update.args | 13 +- ...ry-hotplug-nvdimm-ppc64.ppc64-latest.args} | 13 +- ...emory-hotplug-ppc64-nonuma-abi-update.args | 15 +- ...ry-hotplug-ppc64-nonuma.ppc64-latest.args} | 15 +- ....err => ppc64-tpm-double.ppc64-latest.err} | 0 ...=> ppc64-tpmproxy-double.ppc64-latest.err} | 0 ...4-usb-controller-legacy.ppc64-latest.args} | 11 +- .../ppc64-usb-controller-qemu-xhci.args | 11 +- ...=> ppc64-usb-controller.ppc64-latest.args} | 11 +- .../qemuxml2argvdata/pseries-features-ccf.err | 1 - .../qemuxml2argvdata/pseries-features-ccf.xml | 14 - .../pseries-features-cfpc.err | 1 - .../pseries-features-cfpc.xml | 14 - .../pseries-features-hpt-pagesize.err | 1 - .../pseries-features-hpt-pagesize.xml | 16 - .../qemuxml2argvdata/pseries-features-htm.err | 1 - .../qemuxml2argvdata/pseries-features-htm.xml | 14 - .../qemuxml2argvdata/pseries-features-ibs.err | 1 - .../qemuxml2argvdata/pseries-features-ibs.xml | 14 - .../pseries-features-nested-hv.err | 1 - .../pseries-features-nested-hv.xml | 14 - .../pseries-features-sbbc.err | 1 - .../pseries-features-sbbc.xml | 14 - .../pseries-features.ppc64-4.2.0.args | 30 ++ .../qemuxml2argvdata/pseries-no-parallel.err | 1 - .../pseries-no-parallel.ppc64-latest.err | 1 + ...b-invalid-target-index-1.ppc64-latest.err} | 0 ...b-invalid-target-index-2.ppc64-latest.err} | 0 ...b-invalid-target-index-3.ppc64-latest.err} | 0 .../pseries-spaprvio-invalid.err | 1 - .../pseries-spaprvio-invalid.ppc64-latest.err | 1 + tests/qemuxml2argvtest.c | 97 ++---- ...memory-hotplug-nvdimm-ppc64-abi-update.xml | 3 +- ...ory-hotplug-nvdimm-ppc64.ppc64-latest.xml} | 3 +- ...memory-hotplug-ppc64-nonuma-abi-update.xml | 3 + ...mory-hotplug-ppc64-nonuma.ppc64-latest.xml | 42 +++ .../memory-hotplug-ppc64-nonuma.xml | 1 - ...64-usb-controller-legacy.ppc64-latest.xml} | 3 + ... => ppc64-usb-controller.ppc64-latest.xml} | 5 +- tests/qemuxml2xmltest.c | 24 +- tests/testutilsqemu.c | 171 ++++++----- tests/testutilsqemu.h | 11 +- tests/testutilsxen.c | 26 +- tests/vircapstest.c | 230 -------------- 132 files changed, 705 insertions(+), 1118 deletions(-) rename tests/qemuxml2argvdata/{aarch64-gic-not-arm.err => aarch64-gic-not-arm.ppc64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-hotplug-granularity.err => cpu-hotplug-granularity.ppc64-latest.err} (100%) rename tests/qemuxml2argvdata/{memory-hotplug-nvdimm-ppc64.args => memory-hotplug-nvdimm-ppc64.ppc64-latest.args} (55%) rename tests/qemuxml2argvdata/{memory-hotplug-ppc64-nonuma.args => memory-hotplug-ppc64-nonuma.ppc64-latest.args} (54%) rename tests/qemuxml2argvdata/{ppc64-tpm-double.err => ppc64-tpm-double.ppc64-latest.err} (100%) rename tests/qemuxml2argvdata/{ppc64-tpmproxy-double.err => ppc64-tpmproxy-double.ppc64-latest.err} (100%) rename tests/qemuxml2argvdata/{ppc64-usb-controller-legacy.args => ppc64-usb-controller-legacy.ppc64-latest.args} (58%) rename tests/qemuxml2argvdata/{ppc64-usb-controller.args => ppc64-usb-controller.ppc64-latest.args} (58%) delete mode 100644 tests/qemuxml2argvdata/pseries-features-ccf.err delete mode 100644 tests/qemuxml2argvdata/pseries-features-ccf.xml delete mode 100644 tests/qemuxml2argvdata/pseries-features-cfpc.err delete mode 100644 tests/qemuxml2argvdata/pseries-features-cfpc.xml delete mode 100644 tests/qemuxml2argvdata/pseries-features-hpt-pagesize.err delete mode 100644 tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml delete mode 100644 tests/qemuxml2argvdata/pseries-features-htm.err delete mode 100644 tests/qemuxml2argvdata/pseries-features-htm.xml delete mode 100644 tests/qemuxml2argvdata/pseries-features-ibs.err delete mode 100644 tests/qemuxml2argvdata/pseries-features-ibs.xml delete mode 100644 tests/qemuxml2argvdata/pseries-features-nested-hv.err delete mode 100644 tests/qemuxml2argvdata/pseries-features-nested-hv.xml delete mode 100644 tests/qemuxml2argvdata/pseries-features-sbbc.err delete mode 100644 tests/qemuxml2argvdata/pseries-features-sbbc.xml create mode 100644 tests/qemuxml2argvdata/pseries-features.ppc64-4.2.0.args delete mode 100644 tests/qemuxml2argvdata/pseries-no-parallel.err create mode 100644 tests/qemuxml2argvdata/pseries-no-parallel.ppc64-latest.err rename tests/qemuxml2argvdata/{pseries-phb-invalid-target-index-1.err => pseries-phb-invalid-target-index-1.ppc64-latest.err} (100%) rename tests/qemuxml2argvdata/{pseries-phb-invalid-target-index-2.err => pseries-phb-invalid-target-index-2.ppc64-latest.err} (100%) rename tests/qemuxml2argvdata/{pseries-phb-invalid-target-index-3.err => pseries-phb-invalid-target-index-3.ppc64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/pseries-spaprvio-invalid.err create mode 100644 tests/qemuxml2argvdata/pseries-spaprvio-invalid.ppc64-latest.err rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-ppc64.xml => memory-hotplug-nvdimm-ppc64.ppc64-latest.xml} (93%) create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml rename tests/qemuxml2xmloutdata/{ppc64-usb-controller.xml => ppc64-usb-controller-legacy.ppc64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{ppc64-usb-controller-legacy.xml => ppc64-usb-controller.ppc64-latest.xml} (86%) delete mode 100644 tests/vircapstest.c -- 2.39.2

2 33

[libvirt PATCH 0/3] tests: Don't use GIO_COMPILATION
by Andrea Bolognani 30 Mar '23

30 Mar '23

See patch 3/3 for the rationale. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/823120265 Andrea Bolognani (3): tests: Drop dead code tests: Don't build virgdbusmock on Windows tests: Don't use GIO_COMPILATION tests/meson.build | 11 ++++++----- tests/virfirewalltest.c | 4 ---- 2 files changed, 6 insertions(+), 9 deletions(-) -- 2.39.2

3 6

[PATCH 00/24] qemu capability testing cleanups and improvements (part 2)
by Peter Krempa 30 Mar '23

30 Mar '23

This part focuses on getting rid of the fake-caps infrastructure for testing qemu accelerated via HVF on OSX. Note: The test data that I'm using are based on the linux test data we have in the repository. It'll be great to get a real dump of qemu running on OSX but I don't have such system. Peter Krempa (24): virStringParseVersion: Parse into 'unsigned long long' qemumigrationcookiexmltest: Don't fetch latest caps files without using them domaincapstest: Make construction of filename more extensible domaincapstest: Restructure code to avoid disabling of warnings qemucapabilitiesdata: Separate version from architecture with a '_' testQemuGetLatestCaps: Process capabilities for all architectures in one pass testQemuGetLatestCapsForArch: Rewrite using testQemuGetLatestCaps tests: qemucapabilitiesdata: Add README file tests: Add support for multiple variants of data for the same qemu version+architecture domaincapstest: Propagate variant name into doTestQemuInternal schema: capabilities: Add 'hvf' virt type into list of allowed types domaincapstest: Add testing infrastructure for the '+hvf' variant qemu: capabilities: Fix testing of 'TCG' capabilities probing virQEMUCapsProbeHVF: Factor out setting of the capability tests: Mock virQEMUCapsProbeHVF directly in qemucapabilitiestest qemucapabilitiestest: Add support for '+hvf' variant qemucapabilitiesdata: Add (fake) '+hvf' variant of x86_64 data qemucapabilitiesdata: Add (fake) '+hvf' variant of aarch64 data testutilsqemu: Add support for specifying the variant for qemuxml2(argv|xml)test qemuxml2(argv|xml): Convert "hvf-x86_64-q35-headless" test case to real capapilities qemuxml2(argv|xml): Convert "hvf-aarch64-virt-headless" test case to real capapilities qemuxml2argvtest: Remove infrastructure for fake-caps testing on OSX qemuxml2xmltest: Remove infrastructure for fake-caps testing on OSX testutilsqemu: Remove infrastructure for fake-caps testing of OSX src/bhyve/bhyve_driver.c | 5 +- src/ch/ch_conf.c | 2 +- src/conf/schemas/capability.rng | 1 + src/esx/esx_vi.h | 4 +- src/lxc/lxc_driver.c | 5 +- src/network/bridge_driver_linux.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_capabilities.c | 25 +- src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_capspriv.h | 3 + src/util/virdnsmasq.c | 4 +- src/util/virfirewalld.c | 4 +- src/util/virfirewalld.h | 2 +- src/util/virstring.c | 4 +- src/util/virstring.h | 2 +- src/vbox/vbox_common.c | 5 +- src/vmware/vmware_conf.c | 5 +- src/vz/vz_utils.c | 5 +- .../qemu_7.0.0-hvf.aarch64+hvf.xml | 174 + .../qemu_7.2.0-hvf.x86_64+hvf.xml | 183 + .../qemu_7.2.0-tcg.x86_64+hvf.xml | 264 + tests/domaincapsmock.c | 6 - tests/domaincapstest.c | 128 +- tests/qemucapabilitiesdata/README.rst | 113 + ...h64.replies => caps_4.2.0_aarch64.replies} | 0 ...2.0.aarch64.xml => caps_4.2.0_aarch64.xml} | 0 ...ppc64.replies => caps_4.2.0_ppc64.replies} | 0 ...s_4.2.0.ppc64.xml => caps_4.2.0_ppc64.xml} | 0 ...s390x.replies => caps_4.2.0_s390x.replies} | 0 ...s_4.2.0.s390x.xml => caps_4.2.0_s390x.xml} | 0 ...6_64.replies => caps_4.2.0_x86_64.replies} | 0 ...4.2.0.x86_64.xml => caps_4.2.0_x86_64.xml} | 0 ...h64.replies => caps_5.0.0_aarch64.replies} | 0 ...0.0.aarch64.xml => caps_5.0.0_aarch64.xml} | 0 ...ppc64.replies => caps_5.0.0_ppc64.replies} | 0 ...s_5.0.0.ppc64.xml => caps_5.0.0_ppc64.xml} | 0 ...v64.replies => caps_5.0.0_riscv64.replies} | 0 ...0.0.riscv64.xml => caps_5.0.0_riscv64.xml} | 0 ...6_64.replies => caps_5.0.0_x86_64.replies} | 0 ...5.0.0.x86_64.xml => caps_5.0.0_x86_64.xml} | 0 ...sparc.replies => caps_5.1.0_sparc.replies} | 0 ...s_5.1.0.sparc.xml => caps_5.1.0_sparc.xml} | 0 ...6_64.replies => caps_5.1.0_x86_64.replies} | 0 ...5.1.0.x86_64.xml => caps_5.1.0_x86_64.xml} | 0 ...h64.replies => caps_5.2.0_aarch64.replies} | 0 ...2.0.aarch64.xml => caps_5.2.0_aarch64.xml} | 0 ...ppc64.replies => caps_5.2.0_ppc64.replies} | 0 ...s_5.2.0.ppc64.xml => caps_5.2.0_ppc64.xml} | 0 ...v64.replies => caps_5.2.0_riscv64.replies} | 0 ...2.0.riscv64.xml => caps_5.2.0_riscv64.xml} | 0 ...s390x.replies => caps_5.2.0_s390x.replies} | 0 ...s_5.2.0.s390x.xml => caps_5.2.0_s390x.xml} | 0 ...6_64.replies => caps_5.2.0_x86_64.replies} | 0 ...5.2.0.x86_64.xml => caps_5.2.0_x86_64.xml} | 0 ...h64.replies => caps_6.0.0_aarch64.replies} | 0 ...0.0.aarch64.xml => caps_6.0.0_aarch64.xml} | 0 ...s390x.replies => caps_6.0.0_s390x.replies} | 0 ...s_6.0.0.s390x.xml => caps_6.0.0_s390x.xml} | 0 ...6_64.replies => caps_6.0.0_x86_64.replies} | 0 ...6.0.0.x86_64.xml => caps_6.0.0_x86_64.xml} | 0 ...6_64.replies => caps_6.1.0_x86_64.replies} | 0 ...6.1.0.x86_64.xml => caps_6.1.0_x86_64.xml} | 0 ...h64.replies => caps_6.2.0_aarch64.replies} | 0 ...2.0.aarch64.xml => caps_6.2.0_aarch64.xml} | 0 ...ppc64.replies => caps_6.2.0_ppc64.replies} | 0 ...s_6.2.0.ppc64.xml => caps_6.2.0_ppc64.xml} | 0 ...6_64.replies => caps_6.2.0_x86_64.replies} | 0 ...6.2.0.x86_64.xml => caps_6.2.0_x86_64.xml} | 0 .../caps_7.0.0_aarch64+hvf.replies | 32393 +++++++++++++ .../caps_7.0.0_aarch64+hvf.xml | 502 + ...h64.replies => caps_7.0.0_aarch64.replies} | 0 ...0.0.aarch64.xml => caps_7.0.0_aarch64.xml} | 0 ...ppc64.replies => caps_7.0.0_ppc64.replies} | 0 ...s_7.0.0.ppc64.xml => caps_7.0.0_ppc64.xml} | 0 ...6_64.replies => caps_7.0.0_x86_64.replies} | 0 ...7.0.0.x86_64.xml => caps_7.0.0_x86_64.xml} | 0 ...ppc64.replies => caps_7.1.0_ppc64.replies} | 0 ...s_7.1.0.ppc64.xml => caps_7.1.0_ppc64.xml} | 0 ...6_64.replies => caps_7.1.0_x86_64.replies} | 0 ...7.1.0.x86_64.xml => caps_7.1.0_x86_64.xml} | 0 ...2.0.ppc.replies => caps_7.2.0_ppc.replies} | 0 ...{caps_7.2.0.ppc.xml => caps_7.2.0_ppc.xml} | 0 .../caps_7.2.0_x86_64+hvf.replies | 39399 ++++++++++++++++ .../caps_7.2.0_x86_64+hvf.xml | 3250 ++ ...6_64.replies => caps_7.2.0_x86_64.replies} | 0 ...7.2.0.x86_64.xml => caps_7.2.0_x86_64.xml} | 0 ...v64.replies => caps_8.0.0_riscv64.replies} | 0 ...0.0.riscv64.xml => caps_8.0.0_riscv64.xml} | 0 ...6_64.replies => caps_8.0.0_x86_64.replies} | 0 ...8.0.0.x86_64.xml => caps_8.0.0_x86_64.xml} | 0 tests/qemucapabilitiesnumbering.c | 5 +- tests/qemucapabilitiestest.c | 46 +- .../qemucaps2xmloutdata/caps.aarch64+hvf.xml | 27 + tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml | 28 + tests/qemucaps2xmltest.c | 9 +- tests/qemumigrationcookiexmltest.c | 5 - ...-aarch64-virt-headless.aarch64-latest.args | 53 + .../hvf-aarch64-virt-headless.args | 51 - .../hvf-x86_64-q35-headless.args | 50 - ...hvf-x86_64-q35-headless.x86_64-latest.args | 54 + tests/qemuxml2argvtest.c | 42 +- ...-aarch64-virt-headless.aarch64-latest.xml} | 0 ...hvf-x86_64-q35-headless.x86_64-latest.xml} | 3 + tests/qemuxml2xmltest.c | 45 +- tests/testutilsqemu.c | 307 +- tests/testutilsqemu.h | 13 +- tests/utiltest.c | 8 +- tools/virt-host-validate-common.c | 2 +- 108 files changed, 76757 insertions(+), 486 deletions(-) create mode 100644 tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml create mode 100644 tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml create mode 100644 tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml create mode 100644 tests/qemucapabilitiesdata/README.rst rename tests/qemucapabilitiesdata/{caps_4.2.0.aarch64.replies => caps_4.2.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.aarch64.xml => caps_4.2.0_aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.ppc64.replies => caps_4.2.0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.ppc64.xml => caps_4.2.0_ppc64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.s390x.replies => caps_4.2.0_s390x.replies} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.s390x.xml => caps_4.2.0_s390x.xml} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.x86_64.replies => caps_4.2.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.x86_64.xml => caps_4.2.0_x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.replies => caps_5.0.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.xml => caps_5.0.0_aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.ppc64.replies => caps_5.0.0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.ppc64.xml => caps_5.0.0_ppc64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.riscv64.replies => caps_5.0.0_riscv64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.riscv64.xml => caps_5.0.0_riscv64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.x86_64.replies => caps_5.0.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.x86_64.xml => caps_5.0.0_x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.1.0.sparc.replies => caps_5.1.0_sparc.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.1.0.sparc.xml => caps_5.1.0_sparc.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.1.0.x86_64.replies => caps_5.1.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.1.0.x86_64.xml => caps_5.1.0_x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.aarch64.replies => caps_5.2.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.aarch64.xml => caps_5.2.0_aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.ppc64.replies => caps_5.2.0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.ppc64.xml => caps_5.2.0_ppc64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.riscv64.replies => caps_5.2.0_riscv64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.riscv64.xml => caps_5.2.0_riscv64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.s390x.replies => caps_5.2.0_s390x.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.s390x.xml => caps_5.2.0_s390x.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.x86_64.replies => caps_5.2.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.x86_64.xml => caps_5.2.0_x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.replies => caps_6.0.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.xml => caps_6.0.0_aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.s390x.replies => caps_6.0.0_s390x.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.s390x.xml => caps_6.0.0_s390x.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.x86_64.replies => caps_6.0.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.x86_64.xml => caps_6.0.0_x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.1.0.x86_64.replies => caps_6.1.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.1.0.x86_64.xml => caps_6.1.0_x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.aarch64.replies => caps_6.2.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.aarch64.xml => caps_6.2.0_aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.ppc64.replies => caps_6.2.0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.ppc64.xml => caps_6.2.0_ppc64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.x86_64.replies => caps_6.2.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.x86_64.xml => caps_6.2.0_x86_64.xml} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.replies create mode 100644 tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml rename tests/qemucapabilitiesdata/{caps_7.0.0.aarch64.replies => caps_7.0.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.aarch64.xml => caps_7.0.0_aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.ppc64.replies => caps_7.0.0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.ppc64.xml => caps_7.0.0_ppc64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.x86_64.replies => caps_7.0.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.x86_64.xml => caps_7.0.0_x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.1.0.ppc64.replies => caps_7.1.0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.1.0.ppc64.xml => caps_7.1.0_ppc64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.1.0.x86_64.replies => caps_7.1.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.1.0.x86_64.xml => caps_7.1.0_x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.2.0.ppc.replies => caps_7.2.0_ppc.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.2.0.ppc.xml => caps_7.2.0_ppc.xml} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies create mode 100644 tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml rename tests/qemucapabilitiesdata/{caps_7.2.0.x86_64.replies => caps_7.2.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.2.0.x86_64.xml => caps_7.2.0_x86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_8.0.0.riscv64.replies => caps_8.0.0_riscv64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_8.0.0.riscv64.xml => caps_8.0.0_riscv64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_8.0.0.x86_64.replies => caps_8.0.0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_8.0.0.x86_64.xml => caps_8.0.0_x86_64.xml} (100%) create mode 100644 tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml create mode 100644 tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml create mode 100644 tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args delete mode 100644 tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args create mode 100644 tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args rename tests/qemuxml2xmloutdata/{hvf-aarch64-virt-headless.xml => hvf-aarch64-virt-headless.aarch64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{hvf-x86_64-q35-headless.xml => hvf-x86_64-q35-headless.x86_64-latest.xml} (97%) -- 2.39.2

4 41

[PATCH 0/3] Fix crash when hot-unplugging a hostdev-interface
by Peter Krempa 30 Mar '23

30 Mar '23

Peter Krempa (3): conf: Clear pointer to freed bitmap holding hostdev's 'origstates' conf: Unexport virDomainHostdevDefClear virDomainHostdevDefClear: Fix and shorten comment src/conf/domain_conf.c | 129 +++++++++++++++++++-------------------- src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 1 - 3 files changed, 63 insertions(+), 68 deletions(-) -- 2.39.2

2 6

[libvirt PATCH] ci: Regenerate files
by Andrea Bolognani 30 Mar '23

30 Mar '23

This unbreaks the various $CROSS-$NAME-local-env jobs. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/822671796 ci/buildenv/debian-11-cross-aarch64.sh | 4 ++-- ci/buildenv/debian-11-cross-armv6l.sh | 4 ++-- ci/buildenv/debian-11-cross-armv7l.sh | 4 ++-- ci/buildenv/debian-11-cross-i686.sh | 4 ++-- ci/buildenv/debian-11-cross-mips64el.sh | 4 ++-- ci/buildenv/debian-11-cross-mipsel.sh | 4 ++-- ci/buildenv/debian-11-cross-ppc64le.sh | 4 ++-- ci/buildenv/debian-11-cross-s390x.sh | 4 ++-- ci/buildenv/debian-sid-cross-aarch64.sh | 4 ++-- ci/buildenv/debian-sid-cross-armv6l.sh | 4 ++-- ci/buildenv/debian-sid-cross-armv7l.sh | 4 ++-- ci/buildenv/debian-sid-cross-i686.sh | 4 ++-- ci/buildenv/debian-sid-cross-mips64el.sh | 4 ++-- ci/buildenv/debian-sid-cross-mipsel.sh | 4 ++-- ci/buildenv/debian-sid-cross-ppc64le.sh | 4 ++-- ci/buildenv/debian-sid-cross-s390x.sh | 4 ++-- ci/containers/debian-11-cross-aarch64.Dockerfile | 4 ++-- ci/containers/debian-11-cross-armv6l.Dockerfile | 4 ++-- ci/containers/debian-11-cross-armv7l.Dockerfile | 4 ++-- ci/containers/debian-11-cross-i686.Dockerfile | 4 ++-- ci/containers/debian-11-cross-mips64el.Dockerfile | 4 ++-- ci/containers/debian-11-cross-mipsel.Dockerfile | 4 ++-- ci/containers/debian-11-cross-ppc64le.Dockerfile | 4 ++-- ci/containers/debian-11-cross-s390x.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-aarch64.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-armv6l.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-armv7l.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-i686.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-mips64el.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-mipsel.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-s390x.Dockerfile | 4 ++-- ci/containers/fedora-36.Dockerfile | 4 ++-- ci/containers/fedora-37-cross-mingw32.Dockerfile | 4 ++-- ci/containers/fedora-37-cross-mingw64.Dockerfile | 4 ++-- ci/containers/fedora-37.Dockerfile | 4 ++-- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 4 ++-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 4 ++-- ci/containers/fedora-rawhide.Dockerfile | 4 ++-- ci/gitlab/build-templates.yml | 9 +++++---- 40 files changed, 83 insertions(+), 82 deletions(-) diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11-cross-aarch64.sh index d33d95d965..6b03b2ea59 100644 --- a/ci/buildenv/debian-11-cross-aarch64.sh +++ b/ci/buildenv/debian-11-cross-aarch64.sh @@ -88,7 +88,7 @@ function install_buildenv() { libyajl-dev:arm64 \ systemtap-sdt-dev:arm64 mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -98,7 +98,7 @@ pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'aarch64'\n\ cpu = 'aarch64'\n\ -endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu +endian = 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-cross-armv6l.sh index 00b978b946..51dc4ce88a 100644 --- a/ci/buildenv/debian-11-cross-armv6l.sh +++ b/ci/buildenv/debian-11-cross-armv6l.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:armel \ systemtap-sdt-dev:armel mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip = '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'arm'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi +endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-cross-armv7l.sh index 78f596a96f..ecd1453bff 100644 --- a/ci/buildenv/debian-11-cross-armv7l.sh +++ b/ci/buildenv/debian-11-cross-armv7l.sh @@ -88,7 +88,7 @@ function install_buildenv() { libyajl-dev:armhf \ systemtap-sdt-dev:armhf mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -98,7 +98,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'armhf'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf +endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh index 0c08bb13a3..3922591cd8 100644 --- a/ci/buildenv/debian-11-cross-i686.sh +++ b/ci/buildenv/debian-11-cross-i686.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:i386 \ systemtap-sdt-dev:i386 mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/i686-linux-gnu-gcc'\n\ ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/i686-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'x86'\n\ cpu = 'i686'\n\ -endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu +endian = 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-11-cross-mips64el.sh index 386b67ee08..6a6250ac03 100644 --- a/ci/buildenv/debian-11-cross-mips64el.sh +++ b/ci/buildenv/debian-11-cross-mips64el.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:mips64el \ systemtap-sdt-dev:mips64el mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips64'\n\ cpu = 'mips64el'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 +endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-cross-mipsel.sh index 00138feee3..4b60a97704 100644 --- a/ci/buildenv/debian-11-cross-mipsel.sh +++ b/ci/buildenv/debian-11-cross-mipsel.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:mipsel \ systemtap-sdt-dev:mipsel mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips'\n\ cpu = 'mipsel'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu +endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11-cross-ppc64le.sh index 30c8160f73..c1fd55b55d 100644 --- a/ci/buildenv/debian-11-cross-ppc64le.sh +++ b/ci/buildenv/debian-11-cross-ppc64le.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:ppc64el \ systemtap-sdt-dev:ppc64el mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'ppc64'\n\ cpu = 'powerpc64le'\n\ -endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu +endian = 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh index 1a4a5cf5c3..563eb98ef7 100644 --- a/ci/buildenv/debian-11-cross-s390x.sh +++ b/ci/buildenv/debian-11-cross-s390x.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:s390x \ systemtap-sdt-dev:s390x mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/s390x-linux-gnu-gcc'\n\ ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 's390x'\n\ cpu = 's390x'\n\ -endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index d33d95d965..6b03b2ea59 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -88,7 +88,7 @@ function install_buildenv() { libyajl-dev:arm64 \ systemtap-sdt-dev:arm64 mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -98,7 +98,7 @@ pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'aarch64'\n\ cpu = 'aarch64'\n\ -endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu +endian = 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index 00b978b946..51dc4ce88a 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:armel \ systemtap-sdt-dev:armel mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip = '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'arm'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi +endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 78f596a96f..ecd1453bff 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -88,7 +88,7 @@ function install_buildenv() { libyajl-dev:armhf \ systemtap-sdt-dev:armhf mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -98,7 +98,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'armhf'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf +endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 0c08bb13a3..3922591cd8 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:i386 \ systemtap-sdt-dev:i386 mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/i686-linux-gnu-gcc'\n\ ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/i686-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'x86'\n\ cpu = 'i686'\n\ -endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu +endian = 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 386b67ee08..6a6250ac03 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:mips64el \ systemtap-sdt-dev:mips64el mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips64'\n\ cpu = 'mips64el'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 +endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc diff --git a/ci/buildenv/debian-sid-cross-mipsel.sh b/ci/buildenv/debian-sid-cross-mipsel.sh index 00138feee3..4b60a97704 100644 --- a/ci/buildenv/debian-sid-cross-mipsel.sh +++ b/ci/buildenv/debian-sid-cross-mipsel.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:mipsel \ systemtap-sdt-dev:mipsel mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips'\n\ cpu = 'mipsel'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu +endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index 30c8160f73..c1fd55b55d 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:ppc64el \ systemtap-sdt-dev:ppc64el mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'ppc64'\n\ cpu = 'powerpc64le'\n\ -endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu +endian = 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 1a4a5cf5c3..563eb98ef7 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -87,7 +87,7 @@ function install_buildenv() { libyajl-dev:s390x \ systemtap-sdt-dev:s390x mkdir -p /usr/local/share/meson/cross - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/s390x-linux-gnu-gcc'\n\ ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -97,7 +97,7 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 's390x'\n\ cpu = 's390x'\n\ -endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt mkdir -p /usr/libexec/ccache-wrappers ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index d030a9a9df..429f58b45b 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -101,7 +101,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -111,7 +111,7 @@ pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'aarch64'\n\ cpu = 'aarch64'\n\ -endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ +endian = 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index 5958957aaa..85af350e04 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip = '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'arm'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ +endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index c963657daa..77ff18a513 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -101,7 +101,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -111,7 +111,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'armhf'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ +endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index 9fe55f4f17..bdb4c44a42 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/i686-linux-gnu-gcc'\n\ ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/i686-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'x86'\n\ cpu = 'i686'\n\ -endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ +endian = 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index d4bf055915..6c1fd4ca77 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips64'\n\ cpu = 'mips64el'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ +endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index d9b5aa2798..5b0767f368 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips'\n\ cpu = 'mipsel'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ +endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 3ae70cfc51..600d5b34b2 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'ppc64'\n\ cpu = 'powerpc64le'\n\ -endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ +endian = 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index 4a4a582990..d11c966c27 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/s390x-linux-gnu-gcc'\n\ ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 's390x'\n\ cpu = 's390x'\n\ -endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ +endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index f129d6f3bf..c98ba2f751 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -101,7 +101,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -111,7 +111,7 @@ pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'aarch64'\n\ cpu = 'aarch64'\n\ -endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ +endian = 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index 7fb8b62528..de3ad751d6 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip = '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'arm'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ +endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 105fe3cb93..b271c97950 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -101,7 +101,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -111,7 +111,7 @@ pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'armhf'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ +endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index 74e21c3d06..a12507feca 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/i686-linux-gnu-gcc'\n\ ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/i686-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'x86'\n\ cpu = 'i686'\n\ -endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ +endian = 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 4af1ccd2e5..9a4c8387ce 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips64'\n\ cpu = 'mips64el'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ +endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 3227c9b948..2d18455474 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips'\n\ cpu = 'mipsel'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ +endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 83d7c87ffe..fa646e3d54 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'ppc64'\n\ cpu = 'powerpc64le'\n\ -endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ +endian = 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 735790cbcd..e1d94bd642 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -100,7 +100,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c = '/usr/bin/s390x-linux-gnu-gcc'\n\ ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip = '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -110,7 +110,7 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 's390x'\n\ cpu = 's390x'\n\ -endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ +endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ diff --git a/ci/containers/fedora-36.Dockerfile b/ci/containers/fedora-36.Dockerfile index 3fa19e3c2c..df7a4a6bdc 100644 --- a/ci/containers/fedora-36.Dockerfile +++ b/ci/containers/fedora-36.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:36 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-37-cross-mingw32.Dockerfile b/ci/containers/fedora-37-cross-mingw32.Dockerfile index 14fb25a17e..7e6c16e4b6 100644 --- a/ci/containers/fedora-37-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-37-cross-mingw32.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-37-cross-mingw64.Dockerfile b/ci/containers/fedora-37-cross-mingw64.Dockerfile index c468dd7a6c..d673871516 100644 --- a/ci/containers/fedora-37-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-37-cross-mingw64.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-37.Dockerfile b/ci/containers/fedora-37.Dockerfile index 17f586af59..d8e87bd310 100644 --- a/ci/containers/fedora-37.Dockerfile +++ b/ci/containers/fedora-37.Dockerfile @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index a574acfde4..41221256f8 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -8,14 +8,14 @@ FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf distro-sync -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index b2690b42e1..8737203d83 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -8,14 +8,14 @@ FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf distro-sync -y && \ nosync dnf install -y \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index f903d549b7..a2ca2e9c61 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -8,14 +8,14 @@ FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf distro-sync -y && \ nosync dnf install -y \ diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 82ddd2c650..1f533ec2dd 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -181,7 +181,7 @@ - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' changes: - ci/gitlab/container-templates.yml - - ci/containers/$NAME.Dockerfile + - ci/containers/$NAME-cross-$CROSS.Dockerfile when: never - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual @@ -197,7 +197,7 @@ stage: builds interruptible: true before_script: - - source ci/buildenv/$NAME.sh + - source ci/buildenv/$NAME-cross-$CROSS.sh - install_buildenv - cat /packages.txt rules: @@ -237,13 +237,13 @@ - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' changes: - ci/gitlab/container-templates.yml - - ci/containers/$NAME.Dockerfile + - ci/containers/$NAME-cross-$CROSS.Dockerfile when: manual allow_failure: true - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' changes: - ci/gitlab/container-templates.yml - - ci/containers/$NAME.Dockerfile + - ci/containers/$NAME-cross-$CROSS.Dockerfile when: on_success # upstream+forks: merge requests targeting non-default branches @@ -266,6 +266,7 @@ - source ci/cirrus/$NAME.vars - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g" -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g" + -e "s|[@]CI_MERGE_REQUEST_REF_PATH@|$CI_MERGE_REQUEST_REF_PATH|g" -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g" -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" -- 2.39.2

2 1

[libvirt PATCH 0/2] A few fixes in error messages
by Jiri Denemark 30 Mar '23

30 Mar '23

These fixes were separated from my "Use permutable format strings in translations" series. There are more VIR_PCI_DEVICE_ADDRESS_FMT cases fixed here compared to the format strings series as not all of them were identified by either syntax check or libvirt-pot-check. Jiri Denemark (2): Drop excess whitespace from error messages Do not use VIR_PCI_DEVICE_ADDRESS_FMT in translations src/conf/domain_conf.c | 6 ++---- src/libxl/libxl_driver.c | 15 +++++---------- src/qemu/qemu_hotplug.c | 14 ++++---------- src/util/virnetdevvportprofile.c | 3 +-- src/util/virsocketaddr.c | 3 +-- 5 files changed, 13 insertions(+), 28 deletions(-) -- 2.40.0

2 3

Re: Re: [PATCH RFC 20/21] conf: Add possibility to configure multiple iothreads per disk
by Stefan Hajnoczi 29 Mar '23

29 Mar '23

Hi Peter, > + - The optional ``iothreads`` sub-element allows specifying multiple IOThreads > + via the ``iothread`` sub-element with attribute ``id`` the disk will use > + for I/O operations. Optionally the ``iothread`` element can have multiple > + ``queue`` subelements specifying that given iothread should be used to > + handle given queues. :since:`Since XXXXXX`. Although this says that the ``queue`` sub-elements are optional, it may be clearer to add another sentence that explains the device will automatically assign virtqueues to the given ``iothread`` sub-elements when ``queue`` is not given. That answers the question of "what is the behavior of omitting ``queue``?". > + <driver name='qemu' queues='2'> > + <iothreads> > + <iothread id='1'> > + <queue id='1'/> > + </iothread> > + <iothread id='2'> > + <queue id='1'/> > + </iothread> Each queue can only be assigned to 1 IOThread, so <queue id='1'/> cannot be assigned to multiple IOThreads. Thank you, Stefan

1 0

Plans for the next release
by Jiri Denemark 29 Mar '23

29 Mar '23

We are getting close to the next release of libvirt. To aim for the release on Mar 31 (in the evening since Apr 1 is Saturday) I suggest entering the freeze on Monday Mar 27 and tagging RC2 on Wednesday Mar 29 in the afternoon. I hope this works for everyone. Jirka

1 1

[PATCH] tests: Compile virgdbusmock.c with GIO_COMPILATION enabled
by Michal Privoznik 29 Mar '23

29 Mar '23

There are couple of g_dbus_*() functions we provide an alternative implementation for in our virgdbusmock.c. However, these functions are declared in gio/gdbusconnection.h as: GIO_AVAILABLE_IN_ALL GDBusConnection *g_bus_get_sync (GBusType bus_type, GCancellable *cancellable, GError **error); where GIO_AVAILABLE_IN_ALL is declared as (in /gio/gio-visibility.h): #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(GIO_STATIC_COMPILATION) # define _GIO_EXPORT __declspec(dllexport) # define _GIO_IMPORT __declspec(dllimport) #elif __GNUC__ >= 4 # define _GIO_EXPORT __attribute__((visibility("default"))) # define _GIO_IMPORT #else # define _GIO_EXPORT # define _GIO_IMPORT #endif #ifdef GIO_COMPILATION # define _GIO_API _GIO_EXPORT #else # define _GIO_API _GIO_IMPORT #endif #define _GIO_EXTERN _GIO_API extern #define GIO_AVAILABLE_IN_ALL _GIO_EXTERN Now, on mingw the functions we mock are declared with dllimport attribute which makes the compiler unhappy: ../tests/virgdbusmock.c:25:24: error: 'g_bus_get_sync' redeclared without dllimport attribute: previous dllimport ignored [-Werror=attributes] The solution is to do what glib does when it compiles the gio module: set GIO_COMPILATION macro which in turn annotates the function with dllexport attribute. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 0fd3bc62cf..6be806f4ae 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -65,6 +65,10 @@ else endif +virgdbusmock_dep = declare_dependency( + compile_args: [ '-DGIO_COMPILATION' ] +) + # mock_libs: # each entry is a dictionary with following items: # * name - mock library name which is also used as default source file name (required) @@ -78,7 +82,7 @@ mock_libs = [ { 'name': 'virdnsmasqmock' }, { 'name': 'virfilecachemock' }, { 'name': 'virfirewallmock' }, - { 'name': 'virgdbusmock' }, + { 'name': 'virgdbusmock', 'deps': [ virgdbusmock_dep] }, { 'name': 'virhostcpumock' }, { 'name': 'virhostdevmock' }, { 'name': 'virnetdaemonmock' }, -- 2.39.2

4 10

[PATCH] storage_file_probe: change maximum len value in vmdk4GetBackingStore
by Анастасия Белова 29 Mar '23

29 Mar '23

From: Anastasia Belova <abelova(a)astralinux.ru> desc length should be always less than VIR_STORAGE_MAX_HEADER. If len = VIR_STORAGE_MAX_HEADER, desc may be out of bounds. Fixes: 296032bfb2 ("util: extract storage file probe code into virtstoragefileprobe.c") Signed-off-by: Anastasia Belova <abelova(a)astralinux.ru> --- src/storage_file/storage_file_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/storage_file_probe.c index 9465af5d96..0dcc9c2c54 100644 --- a/src/storage_file/storage_file_probe.c +++ b/src/storage_file/storage_file_probe.c @@ -586,8 +586,8 @@ vmdk4GetBackingStore(char **res, return BACKING_STORE_INVALID; len = buf_size - 0x200; - if (len > VIR_STORAGE_MAX_HEADER) - len = VIR_STORAGE_MAX_HEADER; + if (len >= VIR_STORAGE_MAX_HEADER) + len = VIR_STORAGE_MAX_HEADER - 1; memcpy(desc, buf + 0x200, len); desc[len] = '\0'; start = strstr(desc, prefix); -- 2.30.2

2 1

[PATCH 0/5] Consistently use 'libvirt.org' instead of 'www.libvirt.org' and update links to subprojects
by Peter Krempa 29 Mar '23

29 Mar '23

Note that the required DNS changes for the subproject pages are not live yet. Peter Krempa (5): Use 'libvirt.org' instead of 'www.libvirt.org' docs: Update link to the php bindings project webpage docs: Update links to the libvirt-ocaml bindings project webpage docs: Update links to the libvirt-ruby bindings project webpage docs: java: Use new hostname for the sub-project docs/apps.rst | 2 +- docs/bindings.rst | 8 ++++---- docs/docs.rst | 6 +++--- docs/downloads.rst | 2 +- docs/java.rst | 2 +- docs/manpages/libvirtd.rst | 2 +- docs/manpages/virt-admin.rst | 2 +- docs/manpages/virt-pki-query-dn.rst | 2 +- docs/manpages/virt-pki-validate.rst | 2 +- docs/manpages/virt-qemu-sev-validate.rst | 2 +- docs/manpages/virtbhyved.rst | 4 ++-- docs/manpages/virtinterfaced.rst | 4 ++-- docs/manpages/virtlxcd.rst | 4 ++-- docs/manpages/virtnetworkd.rst | 4 ++-- docs/manpages/virtnodedevd.rst | 4 ++-- docs/manpages/virtnwfilterd.rst | 4 ++-- docs/manpages/virtproxyd.rst | 2 +- docs/manpages/virtqemud.rst | 4 ++-- docs/manpages/virtsecretd.rst | 4 ++-- docs/manpages/virtstoraged.rst | 4 ++-- docs/manpages/virtvboxd.rst | 4 ++-- docs/manpages/virtvzd.rst | 4 ++-- docs/manpages/virtxend.rst | 4 ++-- docs/meson.build | 1 - docs/php.rst | 23 ----------------------- docs/styleguide.rst | 2 +- docs/testapi.rst | 2 +- src/libvirt-domain-checkpoint.c | 2 +- src/libvirt-domain.c | 2 +- 29 files changed, 44 insertions(+), 68 deletions(-) delete mode 100644 docs/php.rst -- 2.39.2

3 8

[libvirt PATCH] cpu-data.py: Filter out apic current logical processor
by Tim Wiederhake 29 Mar '23

29 Mar '23

Commit 10b5e789c5 attempts to filter out the logical processor id in the generated data to remove noise and irrelevant changes in the output. cpuid-leaf 0x0B may have more than two sub-leaves though. Filter out logical processor id from all sub-leaves of 0x0B and 0x1F (superset of the information in 0x0B). Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- tests/cputestdata/cpu-data.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/cputestdata/cpu-data.py b/tests/cputestdata/cpu-data.py index 498e07b2f7..b5641f7c16 100755 --- a/tests/cputestdata/cpu-data.py +++ b/tests/cputestdata/cpu-data.py @@ -107,11 +107,14 @@ def gather_cpuid_leaves_kcpuid(output): def gather_cpuid_leaves(args): def mask(regs, eax_in, ecx_in, eax_mask, ebx_mask, ecx_mask, edx_mask): - if regs["eax_in"] == eax_in and regs["ecx_in"] == ecx_in: - regs["eax"] &= eax_mask - regs["ebx"] &= ebx_mask - regs["ecx"] &= ecx_mask - regs["edx"] &= edx_mask + if eax_in != regs["eax_in"]: + return + if ecx_in != regs["ecx_in"] and ecx_in is not None: + return + regs["eax"] &= eax_mask + regs["ebx"] &= ebx_mask + regs["ecx"] &= ecx_mask + regs["edx"] &= edx_mask cpuid = args.path_to_cpuid or "cpuid" try: @@ -132,8 +135,8 @@ def gather_cpuid_leaves(args): for regs in reglist: # local apic id. Pretend to always run on logical processor #0. mask(regs, 0x01, 0x00, 0xffffffff, 0x00ffffff, 0xffffffff, 0xffffffff) - mask(regs, 0x0b, 0x00, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffff00) - mask(regs, 0x0b, 0x01, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffff00) + mask(regs, 0x0b, None, 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000) + mask(regs, 0x1f, None, 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000) yield regs -- 2.39.2

2 1

[PATCH] qemu: Add vhost-user-blk unix socket to support server mode
by Zhenguo Yao 28 Mar '23

28 Mar '23

qemu support server mode when using vhost-user-blk disk. Let libvirt to support this. Signed-off-by: Zhenguo Yao <yaozhenguo1(a)gmail.com> --- src/conf/domain_conf.c | 14 ++++++++++++++ src/conf/schemas/domaincommon.rng | 8 ++++++++ .../disk-vhostuser-numa.x86_64-4.2.0.args | 6 ++++-- .../disk-vhostuser-numa.x86_64-latest.args | 6 ++++-- tests/qemuxml2argvdata/disk-vhostuser-numa.xml | 9 +++++++-- .../disk-vhostuser.x86_64-latest.args | 6 ++++-- tests/qemuxml2argvdata/disk-vhostuser.xml | 9 +++++++-- .../disk-vhostuser.x86_64-latest.xml | 12 +++++++++--- 8 files changed, 57 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a5578324b9..61addbe222 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7283,6 +7283,7 @@ virDomainDiskSourceVHostUserParse(xmlNodePtr node, { g_autofree char *type = virXMLPropString(node, "type"); g_autofree char *path = virXMLPropString(node, "path"); + g_autofree char *mode = virXMLPropString(node, "mode"); if (!type) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -7313,6 +7314,17 @@ virDomainDiskSourceVHostUserParse(xmlNodePtr node, ctxt) < 0) { return -1; } + if (mode && STREQ(mode, "server")) { + src->vhostuser->data.nix.listen = true; + if (src->vhostuser->data.nix.reconnect.enabled == VIR_TRISTATE_BOOL_YES) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'reconnect' attribute unsupported " + "'server' mode for `<disk type='vhostuser'>`")); + return -1; + } + } else if (mode && STREQ(mode, "client")) { + src->vhostuser->data.nix.listen = false; + } return 0; } @@ -22121,6 +22133,8 @@ virDomainDiskSourceVhostuserFormat(virBuffer *attrBuf, virBufferAddLit(attrBuf, " type='unix'"); virBufferAsprintf(attrBuf, " path='%s'", vhostuser->data.nix.path); + if (vhostuser->data.nix.listen) + virBufferAsprintf(attrBuf, " mode='%s'", "server"); virDomainChrSourceReconnectDefFormat(childBuf, &vhostuser->data.nix.reconnect); } diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index a57dd212ab..d926195d69 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -2359,6 +2359,14 @@ <attribute name="path"> <ref name="absFilePath"/> </attribute> + <optional> + <attribute name="mode"> + <choice> + <value>server</value> + <value>client</value> + </choice> + </attribute> + </optional> <optional> <ref name="reconnect"/> </optional> diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args index 4480266e75..afd0be4ea5 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args @@ -31,9 +31,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -chardev socket,id=chr-vu-virtio-disk0,path=/tmp/vhost1.sock \ -device vhost-user-blk-pci,bus=pci.0,addr=0x2,chardev=chr-vu-virtio-disk0,id=virtio-disk0,bootindex=1 \ --chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \ +-chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,server=on,wait=off \ -device vhost-user-blk-pci,iommu_platform=on,ats=on,packed=on,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,id=virtio-disk1 \ +-chardev socket,id=chr-vu-virtio-disk2,path=/tmp/vhost1.sock,reconnect=10 \ +-device vhost-user-blk-pci,iommu_platform=on,ats=on,packed=on,bus=pci.0,addr=0x4,chardev=chr-vu-virtio-disk2,id=virtio-disk2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args index 75b3232dad..ea4b227328 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args @@ -31,9 +31,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -chardev socket,id=chr-vu-virtio-disk0,path=/tmp/vhost1.sock \ -device '{"driver":"vhost-user-blk-pci","bus":"pci.0","addr":"0x2","chardev":"chr-vu-virtio-disk0","id":"virtio-disk0","bootindex":1}' \ --chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \ +-chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,server=on,wait=off \ -device '{"driver":"vhost-user-blk-pci","iommu_platform":true,"ats":true,"packed":true,"bus":"pci.0","addr":"0x3","chardev":"chr-vu-virtio-disk1","id":"virtio-disk1"}' \ +-chardev socket,id=chr-vu-virtio-disk2,path=/tmp/vhost1.sock,reconnect=10 \ +-device '{"driver":"vhost-user-blk-pci","iommu_platform":true,"ats":true,"packed":true,"bus":"pci.0","addr":"0x4","chardev":"chr-vu-virtio-disk2","id":"virtio-disk2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.xml b/tests/qemuxml2argvdata/disk-vhostuser-numa.xml index 49efbae0a2..1135b51b8a 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser-numa.xml +++ b/tests/qemuxml2argvdata/disk-vhostuser-numa.xml @@ -23,10 +23,15 @@ </disk> <disk type='vhostuser' device='disk'> <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> - <source type='unix' path='/tmp/vhost1.sock'> + <source type='unix' path='/tmp/vhost1.sock' mode='server'/> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='vhostuser' device='disk'> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> + <source type='unix' path='/tmp/vhost1.sock' mode='client'> <reconnect enabled='yes' timeout='10'/> </source> - <target dev='vdb' bus='virtio'/> + <target dev='vdc' bus='virtio'/> </disk> </devices> </domain> diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args index 31428fc697..4391776b88 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -30,9 +30,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -chardev socket,id=chr-vu-virtio-disk0,path=/tmp/vhost1.sock \ -device '{"driver":"vhost-user-blk-pci","bus":"pci.0","addr":"0x2","chardev":"chr-vu-virtio-disk0","id":"virtio-disk0","bootindex":1}' \ --chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \ +-chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,server=on,wait=off \ -device '{"driver":"vhost-user-blk-pci","iommu_platform":true,"ats":true,"packed":true,"bus":"pci.0","addr":"0x3","chardev":"chr-vu-virtio-disk1","id":"virtio-disk1"}' \ +-chardev socket,id=chr-vu-virtio-disk2,path=/tmp/vhost1.sock,reconnect=10 \ +-device '{"driver":"vhost-user-blk-pci","iommu_platform":true,"ats":true,"packed":true,"bus":"pci.0","addr":"0x4","chardev":"chr-vu-virtio-disk2","id":"virtio-disk2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-vhostuser.xml b/tests/qemuxml2argvdata/disk-vhostuser.xml index a0a3df4dd0..33fc0b885e 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.xml +++ b/tests/qemuxml2argvdata/disk-vhostuser.xml @@ -21,10 +21,15 @@ </disk> <disk type='vhostuser' device='disk'> <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> - <source type='unix' path='/tmp/vhost1.sock'> + <source type='unix' path='/tmp/vhost1.sock' mode='server'/> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='vhostuser' device='disk'> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> + <source type='unix' path='/tmp/vhost1.sock' mode='client'> <reconnect enabled='yes' timeout='10'/> </source> - <target dev='vdb' bus='virtio'/> + <target dev='vdc' bus='virtio'/> </disk> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml index c64621fe93..cd955570f3 100644 --- a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml @@ -27,13 +27,19 @@ <boot order='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </disk> + <disk type='vhostuser' device='disk' snapshot='no'> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> + <source type='unix' path='/tmp/vhost1.sock' mode='server'/> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> <disk type='vhostuser' device='disk' snapshot='no'> <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> <source type='unix' path='/tmp/vhost1.sock'> <reconnect enabled='yes' timeout='10'/> </source> - <target dev='vdb' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + <target dev='vdc' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> @@ -43,7 +49,7 @@ <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> -- 2.32.0

2 3

[libvirt PATCH 0/3] qemu: Fix firmware selection backwards compatibility
by Andrea Bolognani 28 Mar '23

28 Mar '23

Andrea Bolognani (3): tests: Introduce DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE() tests: Add firmware-auto-efi-abi-update-aarch64 test case qemu: Default to raw firmware for existing domains src/qemu/qemu_domain.c | 17 +++++++++++++++++ ...irmware-auto-efi-aarch64.aarch64-latest.args | 8 ++++---- ...-efi-abi-update-aarch64.aarch64-latest.args} | 0 .../firmware-auto-efi-abi-update-aarch64.xml | 17 +++++++++++++++++ .../pvpanic-pci-aarch64.aarch64-latest.args | 8 ++++---- ...c-pci-no-address-aarch64.aarch64-latest.args | 8 ++++---- .../virtio-iommu-aarch64.aarch64-latest.args | 8 ++++---- tests/qemuxml2argvtest.c | 6 ++++++ ...firmware-auto-efi-aarch64.aarch64-latest.xml | 4 ++-- ...o-efi-abi-update-aarch64.aarch64-latest.xml} | 0 .../pvpanic-pci-aarch64.aarch64-latest.xml | 4 ++-- ...ic-pci-no-address-aarch64.aarch64-latest.xml | 4 ++-- .../virtio-iommu-aarch64.aarch64-latest.xml | 4 ++-- tests/qemuxml2xmltest.c | 6 ++++++ 14 files changed, 70 insertions(+), 24 deletions(-) copy tests/qemuxml2argvdata/{firmware-auto-efi-aarch64.aarch64-latest.args => firmware-auto-efi-abi-update-aarch64.aarch64-latest.args} (100%) create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xml copy tests/qemuxml2xmloutdata/{firmware-auto-efi-aarch64.aarch64-latest.xml => firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml} (100%) -- 2.39.2

2 7

[PATCH] virauth: Report error on empty auth result
by Michal Privoznik 28 Mar '23

28 Mar '23

When opening a connection, it may be necessary to provide user credentials, or some additional info (e.g. whether to trust an ssh key). We have a special API for that: virConnectOpenAuth() where and additional callback can be passed. This callback is then called with _virConnectCredential struct filled partially and it's callback's responsibility to get desired data (e.g. by prompting user) and store it into .result member of the struct. But we document the callback behaviour as: If an interaction cannot be filled, fill in NULL and 0. (meaning fill in NULL and return 0) But this does not really fly with the way callback is called. So far, we have three places where the callback is called: 1) remoteAuthInteract() 2) virAuthGetUsernamePath() 3) virAuthAskCredential() Now, 1) just grabs whatever the client side provided and sends it to the other side via RPC. All interesting work takes place at 2) and 3). And the usual pattern in which these two are called is: if (!(cred = wrapper())) return -1; where wrapper() is a function that firstly tries to get data from a config file or URI itself. The wrappers are named virAuthGetUsername() for virAuthGetUsernamePath() and virAuthGetPassword() for virAuthAskCredential(). All wrappers do report error on failure. Except, when the user provided callback set the struct member to NULL. Then they both return NULL without setting any error. This then leads to the generic error message: error : An error occurred, but the cause is unknown Since we failed to get desired credential data, we can't proceed (what data should we pass down to the auth layer, say ssh?) and have to fail. But, we can produce an error message that'll hopefully point users in the right direction. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2181235 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virauth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virauth.c b/src/util/virauth.c index 7b4a1bd8a5..d1f32f8e6d 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -176,7 +176,8 @@ virAuthGetUsernamePath(const char *path, cred.result = NULL; cred.resultlen = 0; - if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { + if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0 || + !cred.result) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed")); VIR_FREE(cred.result); @@ -310,7 +311,8 @@ virAuthAskCredential(virConnectAuthPtr auth, ret->prompt = prompt; - if (auth->cb(ret, 1, auth->cbdata) < 0) { + if (auth->cb(ret, 1, auth->cbdata) < 0 || + !ret->result) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to retrieve user response for authentication callback")); return NULL; -- 2.39.2

2 1

[RFC] Seeking advice on support for generic vDPA device
by jiangdongxu 28 Mar '23

28 Mar '23

vDPA devices allow high-performance devices in a virtual machine by providing a wire-speed data path. These devices require a vendor-specific host driver but the data path follows the virtio specification. The support for generic-vdpa device was recently added to qemu in v8.0.0-rc version. https://gitlab.com/qemu-project/qemu/-/commit/b430a2bd2303b9940cc80ec746887… This allows libvirt to support these deviecs regardless of device type. Currently, libvirt supports vDPA network devices, We need a new solution to support generic-vdpa devices. At present, we have considered several options. Solution A: Add type vdpa under the hostdev device，the device xml looks like <devices> <hostdev mode='subsystem' type='vdpa'> <source dev='/dev/vhost-vdpa-0'/> </hostdev> </devices> This solution is recommended. This configuration requires only that the device supports the vDPA framework, easy for future expansion and same as the qemu solution design idea. Solution B: The current libvirt mode is used to add vDPA devices under different devices. device xml looks like: network: <devices> <interface type='generic-vdpa'> <source dev='/dev/vhost-vdpa-0'/> </interface> </devices> storage: <devices> <disk type='generic-vdpa’> <source dev='/dev/vhost-vdpa-0'/> </disk> </devices> The network interface has the vdpa type. Therefore, a new type is required to distinguish the "generic-vdpa" type. However, this method differentiates device types, which is not convenient for the expansion of other types of vDPA devices. Not recommended. Solution C: Referring to PCI passthrough, Add the driver type (appropriate vendor-specific driver) to the driver of the PCI device. The unbind/bind of the vDPA device driver and the creation of VDPA device are implemented by libvirt. device xml looks like: <devices> <hostdev mode='subsystem' type='pci' managed='yes'> <driver name='vp-vdpa'/> <source> <address domain='0x0000' bus='0x04' slot='0x01' function='0x01'/> </source> </hostdev> </devices> This solution is related to the vendor-specific driver and supports only the vdpa created by the PCI device. vdpa devices created in vduse mode are not supported. This solution is not universal and is not recommended. What's your proposal?

2 1

Possible Bug in Libvirt::StorageVol in ruby-libvirt?
by dateirunner 27 Mar '23

27 Mar '23

Dear Support Team I want to kindly ask for help I am running almalinux with the packages libvirt libvirt-devel I installed the gem 'libvirt-ruby' When running the following script the execution breaks with: ./libvirt-test.rb:25:in `name': Expected Connection object (ArgumentError) from ./libvirt-test.rb:25:in `<main>' #!/usr/bin/env ruby require 'bundler/inline' gemfile do source 'https://rubygems.org' gem 'ruby-libvirt' end require 'libvirt' #Starts connection #works conn = Libvirt::open() # Lists all pools #works pools = conn.list_all_storage_pools # Saves all volumes of all pools # volumes = pools.map {|p| p.list_all_volumes}.flatten # Gets first volume first_volume = volumes.first puts volumes.first #Breaks Should return the name of the volume as string first_volume.name #Breaks Should return the path of the volume as string first_volume.path -------------- Can someone confirm this issue? Is there a possible fix or did I misread the documentation? Thank you for your help Regards R. Koch

1 0

[PATCH v1 0/4] Introduce virsh hypervisor-cpu-models
by Collin Walling 27 Mar '23

27 Mar '23

Allows for the query of hypervisor-known CPU models via the simple command: virsh hypervisor-cpu-models. For the QEMU driver, the models are queried via the capabilities file. Each model is printed to the terminal on its own line similar to the cpu-models command, and there is no order to the listing. The models "qemu", "host", and "max" have been excluded from this list since they are not architecture specific. The code can be easily modified to include them if desired. Collin Walling (4): Introduce virConnectGetHypervisorCPUNames public API remote: Implement virConnectGetHypervisorCPUNames virsh: Introduce new hypervisor-cpu-models command qemu_driver: Implement qemuConnectGetHypervisorCPUNames docs/manpages/virsh.rst | 20 ++++++++++ include/libvirt/libvirt-host.h | 6 +++ src/driver-hypervisor.h | 9 +++++ src/libvirt-host.c | 54 ++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 62 ++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 20 +++++++++- src/remote_protocol-structs | 11 ++++++ tools/virsh-host.c | 70 ++++++++++++++++++++++++++++++++++ 10 files changed, 257 insertions(+), 1 deletion(-) -- 2.39.0

4 11

[libvirt PATCH] NEWS: document my user-visible bugfixes
by Ján Tomko 27 Mar '23

27 Mar '23

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- NEWS.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index c187d35d3b..cc32fb948e 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -60,6 +60,17 @@ v9.2.0 (unreleased) so, as affinity to NUMA nodes inaccessible to emulator thread might have been requested. + * rpc: fix typo in admin code generation + + Fix the bug in the remote `virt-admin` code generator, that resulted + in a crash. Introduced in libvirt 9.1.0. + + * qemu: relax shared memory check for vhostuser daemons + + Fix hotplug of virtiofs `filesystem` after restarting libvirtd. + Before, libvirtd would incorrectly complain about missing shared + memory. + v9.1.0 (2023-03-01) =================== -- 2.39.2

2 1

[libvirt PATCH] qemu_snapshot: external: don't error out when updating metadata
by Pavel Hrdina 27 Mar '23

27 Mar '23

Attaching disk into running VM the offilne definition may not be updated and we will end up with that disk existing only in live definition. Creating snapshot with this state saves both live and offline definition into snapshot metadata. When we are deleting an external snapshot we are updating these definitions in the snapshot metadata so we should just skip over non-existing disks instead of reporting error. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2174700 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_snapshot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 14353c6f0d..e36d6288ac 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2464,8 +2464,8 @@ qemuSnapshotUpdateDisksSingle(virDomainMomentObj *snap, { virDomainDiskDef *disk = NULL; - if (!(disk = qemuDomainDiskByName(def, snapDisk->name))) - return -1; + if (!(disk = virDomainDiskByName(def, snapDisk->name, true))) + return 0; if (virDomainSnapshotIsExternal(snap)) { virDomainDiskDef *parentDisk = NULL; -- 2.39.2

2 1

libvirt-shim: libvirt to run qemu in a different container
by Itamar Holder 27 Mar '23

27 Mar '23

Hey all, I'm Itamar Holder, a Kubevirt developer. Lately we came across a problem w.r.t. properly supporting VMs with dedicated CPUs on Kubernetes. The full details can be seen in this PR <https://github.com/kubevirt/kubevirt/pull/8869> [1], but to make a very long story short, we would like to use two different containers in the virt-launcher pod that is responsible to run a VM: - "Managerial container": would be allocated with a shared cpuset. Would run all of the virtualization infrastructure, such as libvirtd and its dependencies. - "Emulator container": would be allocated with a dedicated cpuset. Would run the qemu process. There are many reasons for choosing this design, but in short, the main reasons are that it's impossible to allocate both shared and dedicated cpus to a single container, and that it would allow finer-grained control and isolation for the different containers. Since there is no way to start the qemu process in a different container, I tried to start qemu in the "managerial" container, then move it into the "emulator" container. This fails however, since libvirt uses sched_setaffinity to pin the vcpus into the dedicated cpuset, which is not allocated to the managerial container, resulting in an EINVAL error. Therefore, I thought about discussing a new approach - introducing a small shim that could communicate with libvirtd in order to start and control the qemu process that would run on a different container. As I see it, the main workflow could be described as follows: - The emulator container would start with the shim. - libvirtd, running in the managerial container, would ask for some information from the target, e.g. cpuset. - libvirtd would create the domain xml and would transfer to the shim everything needed in order to launch the guest. - The shim, running in the emulator container, would run the qemu-process. What do you think? Feedback is much appreciated. Best Regards, Itamar Holder. [1] https://github.com/kubevirt/kubevirt/pull/8869

3 2

Entering freeze for libvirt-9.2.0
by Jiri Denemark 27 Mar '23

27 Mar '23

I have just tagged v9.2.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 0

[PATCH] Revert "ci: Disable optimization on macos-12"
by Martin Kletzander 24 Mar '23

24 Mar '23

This reverts commit 1f76b5365ec78b1e9a36038db8e13ec0025bbe7a. There were two issues with this commit. First is the missing propagation of CFLAGS into the build environment and second is the fact that this is not enough to disable the check for -fsemantic-interposition. The proper fix would require setting MESON_OPTS or similar and also add the propagation of such variable into the cirrus builds etc., but at this point I burned so much time on this trivial piece of rubbish that I think it's easier to just wait for macos to gain a newer clang =D Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- ci/gitlab/builds.yml | 1 - ci/manifest.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index f070db637c80..545478d3516d 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -865,7 +865,6 @@ aarch64-macos-12: needs: [] allow_failure: false variables: - CFLAGS: -O0 CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance diff --git a/ci/manifest.yml b/ci/manifest.yml index 2f631376b24b..b68c7361abb4 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -179,8 +179,6 @@ targets: variables: PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - # Remove once macos has clang with -fsemantic-interposition - CFLAGS: -O0 ubuntu-2004: jobs: -- 2.40.0

2 1

[PATCH] virt-host-validate: Detect SMMU support on ARMs
by Michal Privoznik 24 Mar '23

24 Mar '23

In vir-host-validate we do two checks related to IOMMU: 1) hardware support, and 2) kernel support. While users are usually interested in the latter, the former also makes sense. And for the former (hardware support) we have this huge if-else block for nearly every architecture, except ARM. Now, IOMMU is called SMMU in ARM world, and while there's certainly a definitive way of detecting SMMU support (e.g. via dumping some registers in asm), we can work around this - just like we do for Intel and AMD - and check for an ACPI table presence. In ARM world, there's I/O Remapping Table (IORT) which describes SMMU capabilities on given host and is exposed in sysfs (regardless of arm_smmu module). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2178885 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virt-host-validate-common.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index a41bb346d2..49d3c4083b 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -388,6 +388,15 @@ int virHostValidateIOMMU(const char *hvname, return VIR_HOST_VALIDATE_FAILURE(VIR_HOST_VALIDATE_NOTE); } virHostMsgPass(); + } else if (ARCH_IS_ARM(arch)) { + if (access("/sys/firmware/acpi/tables/IORT", F_OK) == 0) { + virHostMsgPass(); + } else { + virHostMsgFail(level, + "No ACPI IORT table found, IOMMU not " + "supported by this hardware platform"); + return VIR_HOST_VALIDATE_FAILURE(level); + } } else { virHostMsgFail(level, "Unknown if this platform has IOMMU support"); -- 2.39.2

2 1

[PATCH] ci: Disable optimization on macos-12
by Martin Kletzander 24 Mar '23

24 Mar '23

This enables our CI to run tests on on macos-12 after commit 7944700b4037. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- The pipeline can be seen here: https://gitlab.com/nertpinx/libvirt/-/pipelines/816876889 ci/gitlab/builds.yml | 1 + ci/manifest.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 545478d3516d..f070db637c80 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -865,6 +865,7 @@ aarch64-macos-12: needs: [] allow_failure: false variables: + CFLAGS: -O0 CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance diff --git a/ci/manifest.yml b/ci/manifest.yml index b68c7361abb4..2f631376b24b 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -179,6 +179,8 @@ targets: variables: PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + # Remove once macos has clang with -fsemantic-interposition + CFLAGS: -O0 ubuntu-2004: jobs: -- 2.40.0

2 1

[PATCH] esx: Change the default username when connecting to VCenter
by Michal Privoznik 24 Mar '23

24 Mar '23

While it's true that the default username is: administrator@${SSO-Domain} in majority of cases the ${SSO-Domain} is "vsphere.local". But our code (and what virsh displays then) says it's just "administrator". This is wrong also from a different POV: the username must contain the suffix no matter what and our default suggests otherwise. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2181234 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/esx/esx_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 9dc5489411..2443e6e88a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -701,7 +701,8 @@ esxConnectToVCenter(esxPrivate *priv, if (conn->uri->user) { username = g_strdup(conn->uri->user); } else { - if (!(username = virAuthGetUsername(conn, auth, "esx", "administrator", + if (!(username = virAuthGetUsername(conn, auth, "esx", + "administrator(a)vsphere.local", hostname))) return -1; } -- 2.39.2

2 1

Re: [PATCH] vfio/pci: Propagate ACPI notifications to the user-space
by Alex Williamson 24 Mar '23

24 Mar '23

[Cc +libvir-list] On Wed, 8 Mar 2023 12:41:24 +0100 Grzegorz Jaszczyk <jaz(a)semihalf.com> wrote: > śr., 8 mar 2023 o 00:42 Alex Williamson <alex.williamson(a)redhat.com> napisał(a): > > > > On Tue, 7 Mar 2023 22:05:53 +0000 > > Grzegorz Jaszczyk <jaz(a)semihalf.com> wrote: > > > > > From: Dominik Behr <dbehr(a)chromium.org> > > > > > > Hitherto there was no support for propagating ACPI notifications to the > > > guest drivers. In order to provide such support, install a handler for > > > notifications on an ACPI device during vfio-pci device registration. The > > > handler role is to propagate such ACPI notifications to the user-space > > > via acpi netlink events, which allows VMM to receive and propagate them > > > further to the VMs. > > > > > > Thanks to the above, the actual driver for the pass-through device, > > > which belongs to the guest, can receive and react to device specific > > > notifications. > > > What consumes these events? > > Those events are consumed by the VMM, which can have a built-in ACPI > event listener. > > > Has this been proposed to any VM management tools like libvirt? > > This patch was evaluated and tested with crosvm VMM (but since the > kernel part is not in the tree the implementation is marked as WIP). Adding libvirt folks. This intentionally designs the interface in a way that requires a privileged intermediary to monitor netlink on the host, associate messages to VMs based on an attached device, and re-inject the event to the VMM. Why wouldn't we use a channel associated with the device for such events, such that the VMM has direct access? The netlink path seems like it has more moving pieces, possibly scalability issues, and maybe security issues? > > What sort of ACPI events are we expecting to see here and what does user space do with them? > > With this patch we are expecting to see and propagate any device > specific notifications, which are aimed to notify the proper device > (driver) which belongs to the guest. > > Here is the description how propagating such notification could be > implemented by VMM: > > 1) VMM could upfront generate proper virtual ACPI description for > guest per vfio-pci device (more precisely it could be e.g. ACPI GPE > handler, which aim is only to notify relevant device): The proposed interface really has no introspection, how does the VMM know which devices need ACPI tables added "upfront"? How do these events factor into hotplug device support, where we may not be able to dynamically inject ACPI code into the VM? > > Scope (_GPE) > { > Method (_E00, 0, NotSerialized) // _Exx: Edge-Triggered > GPE, xx=0x00-0xFF > { > Local0 = \_SB.PC00.PE08.NOTY > Notify (\_SB.PC00.PE08, Local0) > } > } > > 2) Now, when the VMM receives ACPI netlink event (thanks to VMM > builtin ACPI event listener, which is able to receive any event > generated through acpi_bus_generate_netlink_event) VMM classifies it > based on device_class ("vfio_pci" in this case) and parses it further > to get device name and the notification value for it. This > notification value is stored in a virtual register and VMM triggers > GPE associated with the pci-vfio device. Each VMM is listening for netlink events and sees all the netlink traffic from the host, including events destined for other VMMs? This doesn't seem terribly acceptable from a security perspective. > 3) Guest kernel upon handling GPE, thanks to generated AML (ad 1.), > triggers Notify on required pass-through device and therefore > replicates the ACPI Notification on the guest side (Accessing > \_SB.PC00.PE08.NOTY from above example, result with trap to VMM, which > returns previously stored notify value). The acpi_bus_generate_netlink_event() below really only seems to form a u8 event type from the u32 event. Is this something that could be provided directly from the vfio device uAPI with an ioeventfd, thus providing introspection that a device supports ACPI event notifications and the ability for the VMM to exclusively monitor those events, and only those events for the device, without additional privileges? Thanks, Alex > With above the ACPI notifications are actually replicated on the guest > side and from a guest driver perspective they don't differ from native > ones. > > > > > > Signed-off-by: Dominik Behr <dbehr(a)chromium.org> > > > Co-developed-by: Grzegorz Jaszczyk <jaz(a)semihalf.com> > > > Signed-off-by: Grzegorz Jaszczyk <jaz(a)semihalf.com> > > > --- > > > drivers/vfio/pci/vfio_pci_core.c | 33 ++++++++++++++++++++++++++++++++ > > > 1 file changed, 33 insertions(+) > > > > > > diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c > > > index a5ab416cf476..92b8ed8d087c 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> > > > @@ -2120,10 +2121,20 @@ void vfio_pci_core_release_dev(struct vfio_device *core_vdev) > > > } > > > EXPORT_SYMBOL_GPL(vfio_pci_core_release_dev); > > > > > > +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 device *dev = &vdev->pdev->dev; > > > + > > > + acpi_bus_generate_netlink_event("vfio_pci", dev_name(dev), event, 0); > > > > Who listens to this? Should there be an in-band means to provide > > notifies related to the device? How does a userspace driver know to > > look for netlink events for a particular device? > > VMM which has implemented logic responsible for listening on acpi > netlink events. This netlink message already passes the device name so > VMM will associate it with a particular device. I've elaborated a bit > more in my previous answer. > > > > > > +} > > > + > > > int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev) > > > { > > > + acpi_status status; > > > struct pci_dev *pdev = vdev->pdev; > > > struct device *dev = &pdev->dev; > > > + struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); > > > int ret; > > > > > > /* Drivers must set the vfio_pci_core_device to their drvdata */ > > > @@ -2201,8 +2212,24 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev) > > > ret = vfio_register_group_dev(&vdev->vdev); > > > if (ret) > > > goto out_power; > > > + > > > + if (!adev) { > > > + pci_info(pdev, "No ACPI companion"); > > > > This would be a log message generated for 99.99% of devices. > > Sure - I will remove that. > > > > > > + return 0; > > > + } > > > + > > > + status = acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, > > > + vfio_pci_core_acpi_notify, (void *)vdev); > > > > vfio-pci supports non-ACPI platforms, I don't see any !CONFIG_ACPI > > prototypes for this function. Thanks, > > Good point, I will address this in the next version. > > Thank you, > Grzegorz > > > > > Alex > > > > > + > > > + if (ACPI_FAILURE(status)) { > > > + pci_err(pdev, "Failed to install notify handler"); > > > + goto out_group_register; > > > + } > > > + > > > return 0; > > > > > > +out_group_register: > > > + vfio_unregister_group_dev(&vdev->vdev); > > > out_power: > > > if (!disable_idle_d3) > > > pm_runtime_get_noresume(dev); > > > @@ -2216,6 +2243,12 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_register_device); > > > > > > void vfio_pci_core_unregister_device(struct vfio_pci_core_device *vdev) > > > { > > > + struct acpi_device *adev = ACPI_COMPANION(&vdev->pdev->dev); > > > + > > > + if (adev) > > > + acpi_remove_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, > > > + vfio_pci_core_acpi_notify); > > > + > > > vfio_pci_core_sriov_configure(vdev, 0); > > > > > > vfio_unregister_group_dev(&vdev->vdev); > > >

5 10

[PATCH] ci: Refresh CI files with current lcitool
by Martin Kletzander 24 Mar '23

24 Mar '23

This updates to FreeBSD 12.4 which has clang that supports -fsemantic-interposition, plus of course updates the system. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- ci/gitlab/builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index d982824b65ad..545478d3516d 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -837,7 +837,7 @@ x86_64-freebsd-12: needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: freebsd-12-3 + CIRRUS_VM_IMAGE_NAME: freebsd-12-4 CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_INSTANCE_TYPE: freebsd_instance INSTALL_COMMAND: pkg install -y -- 2.40.0

2 1

[PATCH] meson: Don't build tests when CLang lacks -fsemantic-interposition
by Michal Privoznik 24 Mar '23

24 Mar '23

There are some CLang versions that do not support -fsemantic-interposition. If that's the case, the code is optimized so much that our mocking no longer works. Therefore, disable tests and produce a warning. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Technically, this is a v2 of: https://listman.redhat.com/archives/libvir-list/2023-March/238943.html but a different approach is implemented, so I'm sending it anew. meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index a0682e8d0b..c15003ce02 100644 --- a/meson.build +++ b/meson.build @@ -2035,8 +2035,18 @@ subdir('src') subdir('tools') -build_tests = not get_option('tests').disabled() -if build_tests +build_tests = [ not get_option('tests').disabled() ] +if build_tests[0] and \ + cc.get_id() == 'clang' and \ + not supported_cc_flags.contains('-fsemantic-interposition') \ + and get_option('optimization') != '0' + # If CLang doesn't support -fsemantic-interposition then our + # mocking doesn't work. The best we can do is to not run the + # test suite. + build_tests = [ false, '!!! Forcibly disabling tests because CLang lacks -fsemantic-interposition. Update CLang or disable optimization !!!' ] +endif + +if build_tests[0] subdir('tests') endif -- 2.39.2

3 3

[PATCH] ci: Add OpenSUSE leap 15.4 job
by Peter Krempa 23 Mar '23

23 Mar '23

As a precursor to dropping the EOL OpenSUSE 15.3 job add first the definitions for the replacement version. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Posting this one separately so that we validate that the container images can be built successfully before converting any jobs. I've witnessed some failures in the libvirt-ci repo regarding building the 15.4 container. ci/buildenv/opensuse-leap-154.sh | 96 +++++++++++++++++++++ ci/containers/opensuse-leap-154.Dockerfile | 97 ++++++++++++++++++++++ ci/gitlab/builds.yml | 20 +++++ ci/gitlab/containers.yml | 7 ++ ci/manifest.yml | 6 ++ 5 files changed, 226 insertions(+) create mode 100644 ci/buildenv/opensuse-leap-154.sh create mode 100644 ci/containers/opensuse-leap-154.Dockerfile diff --git a/ci/buildenv/opensuse-leap-154.sh b/ci/buildenv/opensuse-leap-154.sh new file mode 100644 index 0000000000..93cb99c83b --- /dev/null +++ b/ci/buildenv/opensuse-leap-154.sh @@ -0,0 +1,96 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + zypper update -y + zypper install -y \ + audit-devel \ + augeas \ + augeas-lenses \ + bash-completion \ + ca-certificates \ + ccache \ + clang \ + codespell \ + cpp \ + cppi \ + cyrus-sasl-devel \ + device-mapper-devel \ + diffutils \ + dwarves \ + ebtables \ + fuse-devel \ + gcc \ + gettext-runtime \ + git \ + glib2-devel \ + glibc-devel \ + glibc-locale \ + glusterfs-devel \ + grep \ + iproute2 \ + iptables \ + kmod \ + libacl-devel \ + libapparmor-devel \ + libattr-devel \ + libblkid-devel \ + libcap-ng-devel \ + libcurl-devel \ + libgnutls-devel \ + libiscsi-devel \ + libnl3-devel \ + libnuma-devel \ + libpcap-devel \ + libpciaccess-devel \ + librbd-devel \ + libselinux-devel \ + libssh-devel \ + libssh2-devel \ + libtirpc-devel \ + libudev-devel \ + libwsman-devel \ + libxml2 \ + libxml2-devel \ + libxslt \ + libyajl-devel \ + lvm2 \ + make \ + meson \ + nfs-utils \ + ninja \ + numad \ + open-iscsi \ + parted-devel \ + perl-base \ + pkgconfig \ + polkit \ + python3-base \ + python3-docutils \ + python3-flake8 \ + qemu-tools \ + readline-devel \ + rpcgen \ + rpm-build \ + sanlock-devel \ + scrub \ + sed \ + systemd-rpm-macros \ + systemtap-sdt-devel \ + wireshark-devel \ + xen-devel + rpm -qa | sort > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + 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 +} + +export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +export LANG="en_US.UTF-8" +export MAKE="/usr/bin/make" +export NINJA="/usr/bin/ninja" +export PYTHON="/usr/bin/python3" diff --git a/ci/containers/opensuse-leap-154.Dockerfile b/ci/containers/opensuse-leap-154.Dockerfile new file mode 100644 index 0000000000..ca11edf808 --- /dev/null +++ b/ci/containers/opensuse-leap-154.Dockerfile @@ -0,0 +1,97 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.opensuse.org/opensuse/leap:15.4 + +RUN zypper update -y && \ + zypper install -y \ + audit-devel \ + augeas \ + augeas-lenses \ + bash-completion \ + ca-certificates \ + ccache \ + clang \ + codespell \ + cpp \ + cppi \ + cyrus-sasl-devel \ + device-mapper-devel \ + diffutils \ + dwarves \ + ebtables \ + fuse-devel \ + gcc \ + gettext-runtime \ + git \ + glib2-devel \ + glibc-devel \ + glibc-locale \ + glusterfs-devel \ + grep \ + iproute2 \ + iptables \ + kmod \ + libacl-devel \ + libapparmor-devel \ + libattr-devel \ + libblkid-devel \ + libcap-ng-devel \ + libcurl-devel \ + libgnutls-devel \ + libiscsi-devel \ + libnl3-devel \ + libnuma-devel \ + libpcap-devel \ + libpciaccess-devel \ + librbd-devel \ + libselinux-devel \ + libssh-devel \ + libssh2-devel \ + libtirpc-devel \ + libudev-devel \ + libwsman-devel \ + libxml2 \ + libxml2-devel \ + libxslt \ + libyajl-devel \ + lvm2 \ + make \ + meson \ + nfs-utils \ + ninja \ + numad \ + open-iscsi \ + parted-devel \ + perl-base \ + pkgconfig \ + polkit \ + python3-base \ + python3-docutils \ + python3-flake8 \ + qemu-tools \ + readline-devel \ + rpcgen \ + rpm-build \ + sanlock-devel \ + scrub \ + sed \ + systemd-rpm-macros \ + systemtap-sdt-devel \ + wireshark-devel \ + xen-devel && \ + zypper clean --all && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + 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 + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 89c15fa28d..0f60ba89ce 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -305,6 +305,26 @@ x86_64-opensuse-leap-153-local-env: RPM: skip +x86_64-opensuse-leap-154-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-opensuse-leap-154-container + optional: true + allow_failure: false + variables: + NAME: opensuse-leap-154 + RPM: skip + +x86_64-opensuse-leap-154-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 + RPM: skip + + x86_64-opensuse-tumbleweed-prebuilt-env: extends: .native_build_job_prebuilt_env needs: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index fa426bd3a6..241475b5e3 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -84,6 +84,13 @@ x86_64-opensuse-leap-153-container: NAME: opensuse-leap-153 +x86_64-opensuse-leap-154-container: + extends: .container_job + allow_failure: false + variables: + NAME: opensuse-leap-154 + + x86_64-opensuse-tumbleweed-container: extends: .container_job allow_failure: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 2aa9ce9952..3270be85fe 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -166,6 +166,12 @@ targets: variables: RPM: skip + opensuse-leap-154: + jobs: + - arch: x86_64 + variables: + RPM: skip + opensuse-tumbleweed: jobs: - arch: x86_64 -- 2.39.2

2 1

[PATCH] ci: Switch to OpenSUSE leap 15.4
by Peter Krempa 23 Mar '23

23 Mar '23

The '15.3' version is EOL now: https://get.opensuse.org/leap/15.3/ Also switch the 'codestyle' job to the appropriate container image. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .gitlab-ci.yml | 8 ++++---- .../{opensuse-leap-153.sh => opensuse-leap-154.sh} | 5 +---- ...p-153.Dockerfile => opensuse-leap-154.Dockerfile} | 8 ++------ ci/gitlab/builds.yml | 12 ++++++------ ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 6 files changed, 16 insertions(+), 23 deletions(-) rename ci/buildenv/{opensuse-leap-153.sh => opensuse-leap-154.sh} (95%) rename ci/containers/{opensuse-leap-153.Dockerfile => opensuse-leap-154.Dockerfile} (93%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b72ebc493..8bf6e5c6b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,18 +118,18 @@ codestyle_prebuilt_env: - .codestyle_job - .gitlab_native_build_job_prebuilt_env needs: - - job: x86_64-opensuse-leap-153-container + - job: x86_64-opensuse-leap-154-container optional: true variables: - NAME: opensuse-leap-153 + NAME: opensuse-leap-154 codestyle_local_env: extends: - .codestyle_job - .gitlab_native_build_job_local_env variables: - IMAGE: registry.opensuse.org/opensuse/leap:15.3 - NAME: opensuse-leap-153 + IMAGE: registry.opensuse.org/opensuse/leap:15.4 + NAME: opensuse-leap-154 # This artifact published by this job is downloaded to push to Weblate diff --git a/ci/buildenv/opensuse-leap-153.sh b/ci/buildenv/opensuse-leap-154.sh similarity index 95% rename from ci/buildenv/opensuse-leap-153.sh rename to ci/buildenv/opensuse-leap-154.sh index b78382470c..93cb99c83b 100644 --- a/ci/buildenv/opensuse-leap-153.sh +++ b/ci/buildenv/opensuse-leap-154.sh @@ -59,6 +59,7 @@ function install_buildenv() { libyajl-devel \ lvm2 \ make \ + meson \ nfs-utils \ ninja \ numad \ @@ -70,9 +71,6 @@ function install_buildenv() { python3-base \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-tools \ readline-devel \ rpcgen \ @@ -89,7 +87,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 meson==0.56.0 } export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" diff --git a/ci/containers/opensuse-leap-153.Dockerfile b/ci/containers/opensuse-leap-154.Dockerfile similarity index 93% rename from ci/containers/opensuse-leap-153.Dockerfile rename to ci/containers/opensuse-leap-154.Dockerfile index 49e0c98c8a..ca11edf808 100644 --- a/ci/containers/opensuse-leap-153.Dockerfile +++ b/ci/containers/opensuse-leap-154.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.opensuse.org/opensuse/leap:15.3 +FROM registry.opensuse.org/opensuse/leap:15.4 RUN zypper update -y && \ zypper install -y \ @@ -60,6 +60,7 @@ RUN zypper update -y && \ libyajl-devel \ lvm2 \ make \ + meson \ nfs-utils \ ninja \ numad \ @@ -71,9 +72,6 @@ RUN zypper update -y && \ python3-base \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-tools \ readline-devel \ rpcgen \ @@ -92,8 +90,6 @@ RUN zypper update -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 meson==0.56.0 - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 89c15fa28d..d982824b65 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-153-prebuilt-env: +x86_64-opensuse-leap-154-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-opensuse-leap-153-container + - job: x86_64-opensuse-leap-154-container optional: true allow_failure: false variables: - NAME: opensuse-leap-153 + NAME: opensuse-leap-154 RPM: skip -x86_64-opensuse-leap-153-local-env: +x86_64-opensuse-leap-154-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: registry.opensuse.org/opensuse/leap:15.3 - NAME: opensuse-leap-153 + IMAGE: registry.opensuse.org/opensuse/leap:15.4 + NAME: opensuse-leap-154 RPM: skip diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index fa426bd3a6..150df26519 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-153-container: +x86_64-opensuse-leap-154-container: extends: .container_job allow_failure: false variables: - NAME: opensuse-leap-153 + NAME: opensuse-leap-154 x86_64-opensuse-tumbleweed-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 2aa9ce9952..b68c7361ab 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -160,7 +160,7 @@ targets: freebsd-13: x86_64 - opensuse-leap-153: + opensuse-leap-154: jobs: - arch: x86_64 variables: -- 2.39.2

3 2

[PATCH] virnettlscontext: allow client/server cert chains
by matoro_mailinglist_libvirt＠matoro.tk 22 Mar '23

22 Mar '23

From: matoro <11910244-matoro3(a)users.noreply.gitlab.com> The existing implementation assumes that client/server certificates are single individual certificates. If using publicly-issued certificates, or internal CAs that use an intermediate issuer, this is unlikely to be the case, and they will instead be certificate chains. While this can be worked around by moving the intermediate certificates to the CA certificate, which DOES currently support multiple certificates, this instead allows the issued certificate chains to be used as-is, without requiring the overhead of shuffling certificates around. See: https://gitlab.com/libvirt/libvirt/-/merge_requests/222 Signed-off-by: matoro <matoro_github(a)matoro.tk> --- src/rpc/virnettlscontext.c | 97 +++++++++++++----------------------- tests/virnettlscontexttest.c | 72 +++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 65 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index cfd26f0701..78b4b0f187 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -424,7 +424,8 @@ static int virNetTLSContextCheckCert(gnutls_x509_crt_t cert, } -static int virNetTLSContextCheckCertPair(gnutls_x509_crt_t cert, +static int virNetTLSContextCheckCertPair(gnutls_x509_crt_t *certs, + size_t ncerts, const char *certFile, gnutls_x509_crt_t *cacerts, size_t ncacerts, @@ -433,7 +434,7 @@ static int virNetTLSContextCheckCertPair(gnutls_x509_crt_t cert, { unsigned int status; - if (gnutls_x509_crt_list_verify(&cert, 1, + if (gnutls_x509_crt_list_verify(certs, ncerts, cacerts, ncacerts, NULL, 0, 0, &status) < 0) { @@ -469,57 +470,18 @@ static int virNetTLSContextCheckCertPair(gnutls_x509_crt_t cert, } -static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile, - bool isServer) -{ - gnutls_datum_t data; - gnutls_x509_crt_t cert = NULL; - g_autofree char *buf = NULL; - int ret = -1; - - VIR_DEBUG("isServer %d certFile %s", - isServer, certFile); - - if (gnutls_x509_crt_init(&cert) < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, "%s", - _("Unable to initialize certificate")); - goto cleanup; - } - - if (virFileReadAll(certFile, (1<<16), &buf) < 0) - goto cleanup; - - data.data = (unsigned char *)buf; - data.size = strlen(buf); - - if (gnutls_x509_crt_import(cert, &data, GNUTLS_X509_FMT_PEM) < 0) { - virReportError(VIR_ERR_SYSTEM_ERROR, isServer ? - _("Unable to import server certificate %s") : - _("Unable to import client certificate %s"), - certFile); - goto cleanup; - } - - ret = 0; - - cleanup: - if (ret != 0) { - g_clear_pointer(&cert, gnutls_x509_crt_deinit); - } - return cert; -} - - -static int virNetTLSContextLoadCACertListFromFile(const char *certFile, - gnutls_x509_crt_t *certs, - unsigned int certMax, - size_t *ncerts) +static int virNetTLSContextLoadCertListFromFile(const char *certFile, + gnutls_x509_crt_t *certs, + unsigned int certMax, + size_t *ncerts, + bool isServer, + bool isCA) { gnutls_datum_t data; g_autofree char *buf = NULL; *ncerts = 0; - VIR_DEBUG("certFile %s", certFile); + VIR_DEBUG("isCA %d isServer %d certFile %s", isCA, isServer, certFile); if (virFileReadAll(certFile, (1<<16), &buf) < 0) return -1; @@ -527,9 +489,13 @@ static int virNetTLSContextLoadCACertListFromFile(const char *certFile, data.data = (unsigned char *)buf; data.size = strlen(buf); - if (gnutls_x509_crt_list_import(certs, &certMax, &data, GNUTLS_X509_FMT_PEM, 0) < 0) { + if (gnutls_x509_crt_list_import(certs, &certMax, &data, GNUTLS_X509_FMT_PEM, + isCA ? GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED : + GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED | GNUTLS_X509_CRT_LIST_FAIL_IF_UNSORTED) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to import CA certificate list %s"), + isCA ? _("Unable to import CA certificate list %s") : + (isServer ? _("Unable to import server certificate %s") : + _("Unable to import client certificate %s")), certFile); return -1; } @@ -539,44 +505,49 @@ static int virNetTLSContextLoadCACertListFromFile(const char *certFile, } -#define MAX_CERTS 16 +// Limited by frame size of 4096 bytes. +// Typical system CA bundle contains 140-ish CAs. +#define MAX_CERTS 200 static int virNetTLSContextSanityCheckCredentials(bool isServer, const char *cacertFile, const char *certFile) { - gnutls_x509_crt_t cert = NULL; + gnutls_x509_crt_t certs[MAX_CERTS]; gnutls_x509_crt_t cacerts[MAX_CERTS]; - size_t ncacerts = 0; + size_t ncerts = 0, ncacerts = 0; size_t i; int ret = -1; + memset(certs, 0, sizeof(certs)); memset(cacerts, 0, sizeof(cacerts)); if ((access(certFile, R_OK) == 0) && - !(cert = virNetTLSContextLoadCertFromFile(certFile, isServer))) + virNetTLSContextLoadCertListFromFile(certFile, certs, + MAX_CERTS, &ncerts, isServer, false) < 0) goto cleanup; if ((access(cacertFile, R_OK) == 0) && - virNetTLSContextLoadCACertListFromFile(cacertFile, cacerts, - MAX_CERTS, &ncacerts) < 0) + virNetTLSContextLoadCertListFromFile(cacertFile, cacerts, + MAX_CERTS, &ncacerts, isServer, true) < 0) goto cleanup; - if (cert && - virNetTLSContextCheckCert(cert, certFile, isServer, false) < 0) - goto cleanup; + for (i = 0; i < ncerts; i++) { + if (virNetTLSContextCheckCert(certs[i], certFile, isServer, (i != 0)) < 0) + goto cleanup; + } for (i = 0; i < ncacerts; i++) { if (virNetTLSContextCheckCert(cacerts[i], cacertFile, isServer, true) < 0) goto cleanup; } - if (cert && ncacerts && - virNetTLSContextCheckCertPair(cert, certFile, cacerts, ncacerts, cacertFile, isServer) < 0) + if (ncerts && ncacerts && + virNetTLSContextCheckCertPair(certs, ncerts, certFile, cacerts, ncacerts, cacertFile, isServer) < 0) goto cleanup; ret = 0; cleanup: - if (cert) - gnutls_x509_crt_deinit(cert); + for (i = 0; i < ncerts; i++) + gnutls_x509_crt_deinit(certs[i]); for (i = 0; i < ncacerts; i++) gnutls_x509_crt_deinit(cacerts[i]); return ret; diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 2311524db8..918ff04134 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -517,6 +517,12 @@ mymain(void) true, true, GNUTLS_KEY_KEY_CERT_SIGN, false, false, NULL, NULL, 0, 0); + TLS_ROOT_REQ(someotherrootreq, + "UK", "some other random CA", NULL, NULL, NULL, NULL, + true, true, true, + true, true, GNUTLS_KEY_KEY_CERT_SIGN, + false, false, NULL, NULL, + 0, 0); TLS_CERT_REQ(cacertlevel1areq, cacertrootreq, "UK", "libvirt level 1a", NULL, NULL, NULL, NULL, true, true, true, @@ -555,15 +561,72 @@ mymain(void) cacertlevel2areq.crt, }; + gnutls_x509_crt_t cabundle[] = { + someotherrootreq.crt, + cacertrootreq.crt, + }; + + gnutls_x509_crt_t servercertchain[] = { + servercertlevel3areq.crt, + cacertlevel2areq.crt, + cacertlevel1areq.crt, + }; + + gnutls_x509_crt_t servercertchain_incomplete[] = { + servercertlevel3areq.crt, + cacertlevel2areq.crt, + }; + + gnutls_x509_crt_t servercertchain_unsorted[] = { + servercertlevel3areq.crt, + cacertlevel1areq.crt, + cacertlevel2areq.crt, + }; + + gnutls_x509_crt_t clientcertchain[] = { + clientcertlevel2breq.crt, + cacertlevel1breq.crt, + }; + testTLSWriteCertChain("cacertchain-ctx.pem", certchain, G_N_ELEMENTS(certchain)); - VIR_WARNINGS_RESET - DO_CTX_TEST(true, "cacertchain-ctx.pem", servercertlevel3areq.filename, false); DO_CTX_TEST(false, "cacertchain-ctx.pem", clientcertlevel2breq.filename, false); + testTLSWriteCertChain("servercertchain-ctx.pem", + servercertchain, + G_N_ELEMENTS(servercertchain)); + + DO_CTX_TEST(true, cacertrootreq.filename, "servercertchain-ctx.pem", false); + + testTLSWriteCertChain("cabundle-ctx.pem", + cabundle, + G_N_ELEMENTS(cabundle)); + + DO_CTX_TEST(true, "cabundle-ctx.pem", "servercertchain-ctx.pem", false); + + testTLSWriteCertChain("servercertchain_incomplete-ctx.pem", + servercertchain_incomplete, + G_N_ELEMENTS(servercertchain_incomplete)); + + DO_CTX_TEST(true, cacertrootreq.filename, "servercertchain_incomplete-ctx.pem", true); + + testTLSWriteCertChain("servercertchain_unsorted-ctx.pem", + servercertchain_unsorted, + G_N_ELEMENTS(servercertchain_unsorted)); + + DO_CTX_TEST(true, cacertrootreq.filename, "servercertchain_unsorted-ctx.pem", true); + + testTLSWriteCertChain("clientcertchain-ctx.pem", + clientcertchain, + G_N_ELEMENTS(clientcertchain)); + + VIR_WARNINGS_RESET + + DO_CTX_TEST(false, cacertrootreq.filename, "clientcertchain-ctx.pem", false); + DO_CTX_TEST(false, "cacertdoesnotexist.pem", "servercertdoesnotexist.pem", true); testTLSDiscardCert(&cacertreq); @@ -620,7 +683,12 @@ mymain(void) testTLSDiscardCert(&cacertlevel2areq); testTLSDiscardCert(&servercertlevel3areq); testTLSDiscardCert(&clientcertlevel2breq); + testTLSDiscardCert(&someotherrootreq); unlink("cacertchain-ctx.pem"); + unlink("servercertchain-ctx.pem"); + unlink("servercertchain_incomplete-ctx.pem"); + unlink("servercertchain_unsorted-ctx.pem"); + unlink("clientcertchain.pem"); testTLSCleanup(KEYFILE); -- 2.39.1

2 1

[PATCH] qemu_domain: Drop ATTRIBUTE_NONNULL() for non-existent arguments
by Michal Privoznik 22 Mar '23

22 Mar '23

After cleanup done in v8.2.0-rc1~47 the qemuDomainObjExitMonitor() and after v8.7.0-rc1~176 the qemuDomainObjEnterMonitor() lost the @driver argument. But corresponding ATTRIBUTE_NONNULL() annotation was not removed and both functions are still annotated as ATTRIBUTE_NONNULL(2) even though they accept just one argument (@obj). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c716e64ccc..eaa75de3e5 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -579,9 +579,9 @@ void qemuDomainEventFlush(int timer, void *opaque); qemuMonitor *qemuDomainGetMonitor(virDomainObj *vm) ATTRIBUTE_NONNULL(1); void qemuDomainObjEnterMonitor(virDomainObj *obj) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + ATTRIBUTE_NONNULL(1); void qemuDomainObjExitMonitor(virDomainObj *obj) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + ATTRIBUTE_NONNULL(1); int qemuDomainObjEnterMonitorAsync(virDomainObj *obj, virDomainAsyncJob asyncJob) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; -- 2.39.2

2 1

[PATCH] qemu_shim: Require absolute path for root directory
by Michal Privoznik 22 Mar '23

22 Mar '23

The virConnectOpen(), well virConnectOpenInternal() reports an error if embed root is not an absolute path. This is a fair requirement, but our qemu_shim doesn't check this requirement and instead mkdir()-s passed path only to fail later on, leaving the empty directory behind: $ ls -d asd ls: cannot access 'asd': No such file or directory $ virt-qemu-run -r asd whatever.xml virt-qemu-run: cannot open qemu:///embed?root=asd: unsupported configuration: root path must be absolute $ ls -d asd asd Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_shim.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index 7b58583074..33a6aa7d94 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -209,10 +209,18 @@ int main(int argc, char **argv) } tmproot = true; - } else if (g_mkdir_with_parents(root, 0755) < 0) { - g_printerr("%s: cannot create dir: %s\n", - argv[0], g_strerror(errno)); - goto cleanup; + } else { + if (!g_path_is_absolute(root)) { + g_printerr("%s: the root directory must be an absolute path\n", + argv[0]); + goto cleanup; + } + + if (g_mkdir_with_parents(root, 0755) < 0) { + g_printerr("%s: cannot create dir: %s\n", + argv[0], g_strerror(errno)); + goto cleanup; + } } if (chmod(root, 0755) < 0) { -- 2.39.2

2 1

[libvirt PATCH] qemu_shim: set system identity
by Ján Tomko 22 Mar '23

22 Mar '23

Otherwise looking up a secret fails when we try to elevate the identity in qemuDomainSecretInfoSetupFromSecret. https://bugzilla.redhat.com/show_bug.cgi?id=2000410 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_shim.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index 7b58583074..b642f6175a 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -26,6 +26,7 @@ #include "virfile.h" #include "virgettext.h" +#include "viridentity.h" #include "virthread.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -133,6 +134,7 @@ qemuShimQuench(void *userData G_GNUC_UNUSED, int main(int argc, char **argv) { + g_autoptr(virIdentity) sysident = NULL; GThread *eventLoopThread = NULL; virConnectPtr conn = NULL; virConnectPtr sconn = NULL; @@ -191,6 +193,9 @@ int main(int argc, char **argv) virSetErrorFunc(NULL, qemuShimQuench); + sysident = virIdentityGetSystem(); + virIdentitySetCurrent(sysident); + if (verbose) g_printerr("%s: %lld: initializing signal handlers\n", argv[0], deltams()); -- 2.39.2

2 1

[PATCH v2 0/6] Introduce active RBD disk snapshot support
by Or Ozeri 22 Mar '23

22 Mar '23

Internal disk snapshots are currently only supported on non-active VMs. For RBD disks only, this patch series extends this support for active VMs running with qemu. We also add the option to set a name for each RBD snapshot, and allow taking them alongside other external disk snapshots (mixing). Deletion and reverting to snapshots containing RBD snapshots is not allowed, and is validated. Note that taking RBD snapshots on a non-active VM is still unsupported. Changes in v2: - reduce patch to RBD use-case only (e.g. not including qcow2 internal snapshots) - add validation to disallow RBD snapshots deletion / reverting Or Ozeri (6): conf: Add snapshotName attribute for internal disk snapshot qemu: Block deletion and reverting on non-full internal snapshots qemu: Add internal support for active disk internal snapshots qemu: Allow active disk snapshots for RBD disks qemu: Allow setting per-disk snapshot name for RBD disks qemu: Allow mixing active internal and external active disk snapshots docs/formatsnapshot.rst | 5 + src/conf/schemas/domainsnapshot.rng | 4 + src/conf/snapshot_conf.c | 56 ++++++++++ src/conf/snapshot_conf.h | 5 + src/libvirt_private.syms | 1 + src/qemu/qemu_monitor.c | 9 ++ src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_monitor_json.c | 14 +++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_snapshot.c | 105 ++++++++++++------ .../disk_snapshot.xml | 2 +- .../disk_snapshot.xml | 2 +- .../disk_snapshot_redefine.xml | 2 +- tests/qemumonitorjsontest.c | 1 + 14 files changed, 181 insertions(+), 35 deletions(-) -- 2.25.1

3 14

[libvirt PATCH 0/1] qemu: Fix memory leaks in firmware selection code
by Andrea Bolognani 22 Mar '23

22 Mar '23

Reported when building with gcc and clang both. ==10909==ERROR: LeakSanitizer: detected memory leaks Direct leak of 128 byte(s) in 4 object(s) allocated from: #0 0x7f191d4a2808 in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cc:144 #1 0x7f191987ae98 in g_malloc (/lib/x86_64-linux-gnu/libglib-2.0.so.0+0x57e98) SUMMARY: AddressSanitizer: 128 byte(s) leaked in 4 allocation(s). This patch is a requirement for pushing my recent improvements to firmware selection[1] without further degrading the CI pipeline. [1] https://listman.redhat.com/archives/libvir-list/2023-March/238890.html Andrea Bolognani (1): qemu: Fix memory leaks in firmware selection code src/qemu/qemu_firmware.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.39.2

2 2

[libvirt PATCH 00/15] qemu: Further improvements to firmware selection
by Andrea Bolognani 22 Mar '23

22 Mar '23

More information in the commit message for 11/15. Ideally this would make it into 9.2.0 along with the other changes to firmware selection I've made in this cycle[1]. [1] https://listman.redhat.com/archives/libvir-list/2023-February/237806.html Andrea Bolognani (15): tests: Rename a few firmware tests tests: Fix firmware-auto-efi-loader-path-nonstandard tests: Add firmware-auto-efi-loader-path tests: Add more tests for manual Secure Boot configuration tests: Fix firmware descriptor masking test qemu: Introduce qemuFirmwareMatchesPaths() qemu: Discard requires-smm firmware when loader.secure=no qemu: Always go through firmware autoselection conf: Remove some firmware validation checks conf: Don't format firmware type/features when migrating qemu: Don't drop firmware type/features information qemu: Automatically add firmware type/features information conf: Don't explicitly set the secure-boot feature conf: Move validation check out of postparse qemu: Move validation check out of postparse src/conf/domain_conf.c | 5 +- src/conf/domain_postparse.c | 16 -- src/conf/domain_validate.c | 42 +--- src/qemu/qemu_domain.c | 6 - src/qemu/qemu_firmware.c | 186 +++++++++++++----- src/qemu/qemu_validate.c | 6 + .../{60-ovmf-sb.json => 42-masked.json} | 0 .../usr/share/qemu/firmware/42-masked.json | 37 ++++ tests/qemufirmwaretest.c | 2 + ...to-efi-loader-insecure.x86_64-latest.args} | 0 ...auto-efi-loader-insecure.x86_64-latest.err | 1 - ...-loader-path-nonstandard.x86_64-latest.err | 1 + ...ware-auto-efi-loader-path-nonstandard.xml} | 2 +- ...e-auto-efi-loader-path.x86_64-latest.args} | 0 ...are-auto-efi-loader-path.x86_64-latest.err | 1 - .../firmware-auto-efi-loader-path.xml | 2 +- ...to-efi-no-enrolled-keys.x86_64-latest.args | 5 +- ...nual-efi-loader-no-path.x86_64-latest.err} | 0 ...=> firmware-manual-efi-loader-no-path.xml} | 0 ...nual-efi-loader-secure.x86_64-latest.args} | 0 ... => firmware-manual-efi-loader-secure.xml} | 0 ...l-efi-no-enrolled-keys.x86_64-latest.args} | 0 ... firmware-manual-efi-no-enrolled-keys.xml} | 2 +- ...-manual-efi-no-secboot.x86_64-latest.args} | 4 +- ...xml => firmware-manual-efi-no-secboot.xml} | 5 +- ...are-manual-efi-secboot.x86_64-latest.args} | 0 ...re.xml => firmware-manual-efi-secboot.xml} | 2 +- tests/qemuxml2argvtest.c | 12 +- ...ware-auto-bios-stateless.x86_64-latest.xml | 6 +- .../firmware-auto-bios.x86_64-latest.xml | 6 +- ...rmware-auto-efi-aarch64.aarch64-latest.xml | 6 +- ...e-auto-efi-enrolled-keys.x86_64-latest.xml | 6 +- ...-efi-format-loader-qcow2.x86_64-latest.xml | 6 +- ...o-efi-format-loader-raw.aarch64-latest.xml | 6 +- ...-nvram-qcow2-network-nbd.x86_64-latest.xml | 5 +- ...-format-nvram-qcow2-path.x86_64-latest.xml | 6 +- ...o-efi-format-nvram-qcow2.x86_64-latest.xml | 6 +- ...uto-efi-loader-insecure.x86_64-latest.xml} | 8 +- ...loader-path-nonstandard.x86_64-latest.xml} | 4 +- ...re-auto-efi-loader-path.x86_64-latest.xml} | 6 +- ...e-auto-efi-loader-secure.x86_64-latest.xml | 6 +- ...uto-efi-no-enrolled-keys.x86_64-latest.xml | 9 +- ...ware-auto-efi-no-secboot.x86_64-latest.xml | 6 +- ...ware-auto-efi-nvram-file.x86_64-latest.xml | 6 +- ...-efi-nvram-network-iscsi.x86_64-latest.xml | 5 +- ...to-efi-nvram-network-nbd.x86_64-latest.xml | 5 +- .../firmware-auto-efi-nvram.x86_64-latest.xml | 6 +- ...irmware-auto-efi-secboot.x86_64-latest.xml | 6 +- ...irmware-auto-efi-smm-off.x86_64-latest.xml | 6 +- ...mware-auto-efi-stateless.x86_64-latest.xml | 6 +- .../firmware-auto-efi.x86_64-latest.xml | 6 +- ...manual-efi-acpi-aarch64.aarch64-latest.xml | 6 +- ...ware-manual-efi-acpi-q35.x86_64-latest.xml | 6 +- ...anual-efi-loader-secure.x86_64-latest.xml} | 6 +- ...al-efi-no-enrolled-keys.x86_64-latest.xml} | 8 +- ...e-manual-efi-no-secboot.x86_64-latest.xml} | 6 +- ...nual-efi-noacpi-aarch64.aarch64-latest.xml | 6 +- ...re-manual-efi-nvram-file.x86_64-latest.xml | 6 +- ...-efi-nvram-network-iscsi.x86_64-latest.xml | 5 +- ...al-efi-nvram-network-nbd.x86_64-latest.xml | 5 +- ...anual-efi-nvram-template.x86_64-latest.xml | 6 +- ...ware-manual-efi-secboot.x86_64-latest.xml} | 6 +- .../firmware-manual-efi.x86_64-latest.xml | 6 +- .../pvpanic-pci-aarch64.aarch64-latest.xml | 6 +- ...-pci-no-address-aarch64.aarch64-latest.xml | 6 +- .../virtio-iommu-aarch64.aarch64-latest.xml | 6 +- tests/qemuxml2xmltest.c | 8 +- 67 files changed, 409 insertions(+), 164 deletions(-) rename tests/qemufirmwaredata/etc/qemu/firmware/{60-ovmf-sb.json => 42-masked.json} (100%) create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/42-masked.json copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-auto-efi-loader-insecure.x86_64-latest.args} (100%) delete mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err copy tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.xml => firmware-auto-efi-loader-path-nonstandard.xml} (86%) copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-auto-efi-loader-path.x86_64-latest.args} (100%) delete mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.err rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.x86_64-latest.err => firmware-manual-efi-loader-no-path.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.xml => firmware-manual-efi-loader-no-path.xml} (100%) copy tests/qemuxml2argvdata/{firmware-manual-efi-secure.x86_64-latest.args => firmware-manual-efi-loader-secure.x86_64-latest.args} (100%) copy tests/qemuxml2argvdata/{firmware-manual-efi-secure.xml => firmware-manual-efi-loader-secure.xml} (100%) copy tests/qemuxml2argvdata/{firmware-manual-efi-secure.x86_64-latest.args => firmware-manual-efi-no-enrolled-keys.x86_64-latest.args} (100%) copy tests/qemuxml2argvdata/{firmware-manual-efi-secure.xml => firmware-manual-efi-no-enrolled-keys.xml} (87%) copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-manual-efi-no-secboot.x86_64-latest.args} (90%) copy tests/qemuxml2argvdata/{firmware-manual-efi-secure.xml => firmware-manual-efi-no-secboot.xml} (72%) rename tests/qemuxml2argvdata/{firmware-manual-efi-secure.x86_64-latest.args => firmware-manual-efi-secboot.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-secure.xml => firmware-manual-efi-secboot.xml} (86%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-loader-insecure.x86_64-latest.xml} (82%) copy tests/qemuxml2xmloutdata/{firmware-auto-bios-stateless.x86_64-latest.xml => firmware-auto-efi-loader-path-nonstandard.x86_64-latest.xml} (92%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-loader-path.x86_64-latest.xml} (89%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-secure.x86_64-latest.xml => firmware-manual-efi-loader-secure.x86_64-latest.xml} (89%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-secure.x86_64-latest.xml => firmware-manual-efi-no-enrolled-keys.x86_64-latest.xml} (83%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-acpi-q35.x86_64-latest.xml => firmware-manual-efi-no-secboot.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{firmware-manual-efi-secure.x86_64-latest.xml => firmware-manual-efi-secboot.x86_64-latest.xml} (89%) -- 2.39.2

2 17

[PATCH] meson: Disable optimizations if CLang doesn't support -fsemantic-interposition
by Michal Privoznik 21 Mar '23

21 Mar '23

For some older CLang (or in combination with !intel arch) the -fsemantic-interposition might be not present. But in that case, we still want our mocking in test suite to work properly. Disable optimizations as that seems to be the only way. Also, don't forget to drop this when FreeBSD 11 and macOS 12 are dropped. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This still doesn't work when somebody overrides CFLAGS as those are placed AFTER our supported_cc_flags: $ export CFLAGS="-O2 -ggdb" $ meson setup _build $ ninja -v -C _build/ [1/1202] clang ... -O2 -g ... -O0 -O2 -ggdb -fPIC ... -c ../src/util/glibcompat.c meson.build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meson.build b/meson.build index a0682e8d0b..249505d474 100644 --- a/meson.build +++ b/meson.build @@ -492,6 +492,13 @@ if get_option('warning_level') == '2' endif endif + +if cc.get_id() == 'clang' and not supported_cc_flags.contains('-fsemantic-interposition') + # If CLang is old enough to not support -fsemantic-interposition + # then this is our best bet to make mocking in tests working properly. + supported_cc_flags += [ '-O0' ] +endif + add_project_arguments(supported_cc_flags, language: 'c') if cc.has_argument('-Wsuggest-attribute=format') -- 2.39.2

4 7

[PATCH 0/2] Work around broken clang. Again.
by Michal Privoznik 21 Mar '23

21 Mar '23

We ran into so many clang bugs recently, that I'm strongly in favor of making it optional and aim on gcc only. Debugging these issues burns our time needlessly. Just consider what's happening here. I've pushed patches recently that call some virNuma*() APIs during QEMU cmd line generation. And while at it, I removed virNuma*() mocks from qemuxml2argvmock.c (v9.1.0-213-g95ae91fdd4). Andrea told me in review to make sure our CI works. So I've fired up my freebsd VM and compiled my code there. It worked. Except, I'm compiling with -O0 and our CI compiles with the default (-O2). And of course this is the source of the current build breakage. Long story short, clang is so eager to produce the fastest code that it simply ignores written code and generates what it *assumes* behaves the same. Well, it doesn't and this breaks our mocking and thus our tests. And of course it's happening only with optimizations. In this particular case, I've noticed that while virNumaNodesetIsAvailable() calls virNumaNodeIsAvailable(), it disregards the return value and virReportError()-s immediately. This is because the !WITH_NUMACTL variant of virNumaNodeIsAvailable() calls virNumaGetMaxNode() which fails and thus false is returned. WORSE, then I stepped in gdb into the mock, I've seen random numbers as integers. This is because the function from virnumamock.c wasn't optimized as much and followed standard calling convention (it grabbed the integer argument from the stack). But the caller (virNumaNodesetIsAvailable()) was so optimized that it did not even bothered to push anything onto stack. After these patches, there is still one qemuxml2argvtest case failing, and it's simply because no matter how hard I try, I can't stop clang from optimizing the function. Consider the following code: virNumaCPUSetToNodeset(virBitmap *cpuset, virBitmap **nodeset) { g_autoptr(virBitmap) nodes = virBitmapNew(0); ssize_t pos = -1; while ((pos = virBitmapNextSetBit(cpuset, pos)) >= 0) { int node = virNumaGetNodeOfCPU(pos); if (node < 0) { virReportSystemError(errno, _("Unable to get NUMA node of cpu %zd"), pos); return -1; } ... } ... } And this is the assembly code that clang generates (even after VIR_OPTNONE treatment): 116f5f: e8 0c b7 f9 ff call b2670 <virBitmapNew@plt> 116f64: 48 89 44 24 40 mov %rax,0x40(%rsp) 116f69: 48 c7 44 24 18 ff ff movq $0xffffffffffffffff,0x18(%rsp) 116f70: ff ff 116f72: 48 8b 7c 24 38 mov 0x38(%rsp),%rdi 116f77: 48 8b 74 24 18 mov 0x18(%rsp),%rsi 116f7c: e8 0f 74 f9 ff call ae390 <virBitmapNextSetBit@plt> 116f81: eb 00 jmp 116f83 <virNumaCPUSetToNodeset+0x43> 116f83: 48 89 44 24 18 mov %rax,0x18(%rsp) 116f88: 48 83 f8 00 cmp $0x0,%rax 116f8c: 0f 8c b2 00 00 00 jl 117044 <virNumaCPUSetToNodeset+0x104> 116f92: 48 8b 7c 24 18 mov 0x18(%rsp),%rdi 116f97: e8 d4 a1 f9 ff call b1170 <virNumaGetNodeOfCPU@plt> 116f9c: c7 44 24 10 ff ff ff movl $0xffffffff,0x10(%rsp) 116fa3: ff 116fa4: 83 7c 24 10 00 cmpl $0x0,0x10(%rsp) 116fa9: 7d 74 jge 11701f <virNumaCPUSetToNodeset+0xdf> 116fab: e8 80 72 f9 ff call ae230 <__errno_location@plt> 116fb0: 8b 18 mov (%rax),%ebx 116fb2: 48 8d 3d 27 35 2b 00 lea 0x2b3527(%rip),%rdi # 3ca4e0 <vmdk4GetBackingStore.prefix+0xf260> 116fb9: 48 8d 35 8c e3 25 00 lea 0x25e38c(%rip),%rsi # 37534c <modeMap+0x215c> 116fc0: ba 05 00 00 00 mov $0x5,%edx 116fc5: e8 e6 a7 f9 ff call b17b0 <dcgettext@plt> 116fca: 48 8b 4c 24 18 mov 0x18(%rsp),%rcx 116fcf: 48 89 0c 24 mov %rcx,(%rsp) 116fd3: 48 8d 15 ea e0 25 00 lea 0x25e0ea(%rip),%rdx # 3750c4 <modeMap+0x1ed4> 116fda: 48 8d 0d 54 e3 25 00 lea 0x25e354(%rip),%rcx # 375335 <modeMap+0x2145> 116fe1: 31 ff xor %edi,%edi 116fe3: 89 de mov %ebx,%esi 116fe5: 41 b8 10 04 00 00 mov $0x410,%r8d 116feb: 49 89 c1 mov %rax,%r9 116fee: 31 c0 xor %eax,%eax 116ff0: e8 8b c1 f9 ff call b3180 <virReportSystemErrorFull@plt> My assembler is a bit rusty, but at virNumaGetNodeOfCPU@plt is called 116f97, after which, -1 is stored on a stack (which corresponds to @pos variable), after which comparison against 0 is made and the jump happens iff the value (-1) is greater or equal than zero. Otherwise virReportSystemError() is called. To reproduce this issue even on Linux, configure with: export CC=clang meson setup -Dsystem=true -Dexpensive_tests=enabled -Dnumactl=disabled _build At this point, I think we can call clang broken and focus our time on developing libvirt. Not coming up with hacks around broken compilers. Michal Prívozník (2): internal.h: Invent VIR_OPTNONE virnuma: Annotate some functions as VIR_OPTNONE src/internal.h | 20 ++++++++++++++++++++ src/util/virnuma.c | 20 ++++++++++---------- 2 files changed, 30 insertions(+), 10 deletions(-) -- 2.39.2

4 15

[PATCH v2] meson: Stop detecting -Wl,--version-script=
by Michal Privoznik 21 Mar '23

21 Mar '23

With its version 16.0, the LLVM's linker turned on --no-undefined-version by default [1]. This breaks how we detect --version-script= detection, because at the compile time there's no library built yet that we can use to make --version-script= happy. Unfortunately, meson does not provide a way to detect this either [2]. But there's not much sense in detecting the argument either. We already special case some systems (windows, darwin) and do the check for others, which are expected to support versioned symbols, because of ELF. Worst case scenario - the error is reported during compile time rather than configure time. 1: https://reviews.llvm.org/D135402 2: https://github.com/mesonbuild/meson/issues/3047 Resolves: https://bugs.gentoo.org/902211 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2023-March/238923.html diff to v1: - Instead of fixing the detection, drop it completely. meson.build | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meson.build b/meson.build index c35823a79a..a0682e8d0b 100644 --- a/meson.build +++ b/meson.build @@ -534,12 +534,7 @@ elif host_machine.system() == 'darwin' # macOS libraries don't support symbol versioning version_script_flags = '' else - test_file = '@0@/src/libvirt_qemu.syms'.format(meson.project_source_root()) - if cc.has_link_argument('-Wl,--version-script=@0@'.format(test_file)) - version_script_flags = '-Wl,--version-script=' - else - error('No supported version script link argument found.') - endif + version_script_flags = '-Wl,--version-script=' endif libvirt_flat_namespace = [] -- 2.39.2

2 1

[PATCH] meson: Work around too strict lld
by Michal Privoznik 21 Mar '23

21 Mar '23

With its version 16.0, the LLVM's linker turned on --no-undefined-version by default [1]. This breaks how we detect --version-script= detection, because at the compile time there's no library built yet that we can use to make --version-script= happy. To cancel their choice of defaults, pass --undefined-version. Unfortunately, this flag is LLVM's invention and is not supported by GNU's ld. This all could be avoided if meson provided proper detection of supported linker arguments, but we are far away from that [2]. 1: https://reviews.llvm.org/D135402 2: https://github.com/mesonbuild/meson/issues/3047 Resolves: https://bugs.gentoo.org/902211 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Compile Libvirt? Absolutely Not Gonna. The choice of defaults for LLVM and related subprojects continues to surprise me. meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c35823a79a..df0d75449a 100644 --- a/meson.build +++ b/meson.build @@ -535,9 +535,13 @@ elif host_machine.system() == 'darwin' version_script_flags = '' else test_file = '@0@/src/libvirt_qemu.syms'.format(meson.project_source_root()) + version_script_flags = '' if cc.has_link_argument('-Wl,--version-script=@0@'.format(test_file)) version_script_flags = '-Wl,--version-script=' - else + elif cc.has_multi_link_arguments('-Wl,--undefined-version', '-Wl,--version-script=@0@'.format(test_file)) + version_script_flags = '-Wl,--version-script=' + endif + if version_script_flags == '' error('No supported version script link argument found.') endif endif -- 2.39.2

3 2

[PATCH 0/2] Fix clang build without numactl and without any code/optimization changes
by Martin Kletzander 20 Mar '23

20 Mar '23

See 1/2 for details, pipeline for this is here: https://gitlab.com/nertpinx/libvirt/-/pipelines/811802916 Martin Kletzander (2): util: Separate numactl and stubs into different source files Revert "meson: stop CLang doing inter-procedural analysis" meson.build | 20 -- po/POTFILES | 2 + src/util/meson.build | 10 + src/util/virnuma.c | 427 +------------------------------------ src/util/virnuma_common.h | 57 +++++ src/util/virnuma_numactl.c | 357 +++++++++++++++++++++++++++++++ src/util/virnuma_stubs.c | 124 +++++++++++ 7 files changed, 551 insertions(+), 446 deletions(-) create mode 100644 src/util/virnuma_common.h create mode 100644 src/util/virnuma_numactl.c create mode 100644 src/util/virnuma_stubs.c -- 2.40.0

2 4

[PATCH 1/1] capabilities: reduce scope in virCapabilitiesInitCaches()
by Shaleen Bathla 20 Mar '23

20 Mar '23

over-writing a variable in inner while-loop without freeing previous memory leaks it over time. To fix this, we can just change scope of bank variable to the inner loop. Signed-off-by: Shaleen Bathla <shaleen.bathla(a)oracle.com> --- src/conf/capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 34770fc4165f..9144ced4984f 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -2178,7 +2178,6 @@ virCapabilitiesInitCaches(virCaps *caps) int rv = -1; g_autoptr(DIR) dirp = NULL; g_autofree char *path = g_strdup_printf("%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos); - g_autoptr(virCapsHostCacheBank) bank = NULL; rv = virDirOpenIfExists(&dirp, path); if (rv < 0) @@ -2189,6 +2188,7 @@ virCapabilitiesInitCaches(virCaps *caps) while ((rv = virDirRead(dirp, &ent, path)) > 0) { g_autofree char *type = NULL; + g_autoptr(virCapsHostCacheBank) bank = NULL; int kernel_type; unsigned int level; int ret; -- 2.31.1

2 1

[libvirt PATCH 0/8] Slightly reduce the number of translatable strings
by Ján Tomko 19 Mar '23

19 Mar '23

*** BLURB HERE *** Ján Tomko (8): bhyve: fix typo in error message src: unify symlink creation error message bhyve: unify error message for UUID generation vbox: remove unreachable error in virVBoxSnapshotConfLoadVboxFile vbox: remove unreachable error in virVBoxSnapshotConfSaveVboxFile util: xml: remove function names from error messages Unify error message when namespaces are unsupported vbox: unify "unable to get hard disk id" message src/bhyve/bhyve_parse_command.c | 2 +- src/bhyve/bhyve_process.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_namespace.c | 2 +- src/util/virprocess.c | 6 +++--- src/util/virxml.c | 6 +++--- src/vbox/vbox_common.c | 4 ++-- src/vbox/vbox_snapshot_conf.c | 11 ----------- 10 files changed, 15 insertions(+), 26 deletions(-) -- 2.39.2

2 10