virt-aa-helper: Avoid duplicate when append rule

when a device is dynamically attached to a VM, and it needs a special
system access for apparmor, libvirt calls virt-aa-helper (with argument -F)
to append a new rule to the apparmor profile of the VM. virt-aa-helper does
not check for duplicate and blindly appends the rule to the profile. since
there is no rule removal when a device is detached, this can make the profile
grow in size if a big number of attach/detach operations are done and the
profile might hit the size limit and futur attach operations might dysfunction
because no rule can be added into the apparmor profile.

this patch tries to mitigate this issue by doing a duplicate check
when rules are appended into the profile. this fix does not guarantee
the absence of duplicates but should be enough to prevent the profile
to grow significantly in size and reach its size limit.

Signed-off-by: Hector CAO <hector.cao@canonical.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

.mailmap

@@ -48,6 +48,7 @@
 <shi_lei@massclouds.com> <shilei.massclouds@gmx.com>
 <adrian.brzezinski@eo.pl> <redhat@adrb.pl>
 <matt@datto.com> <mcoleman@datto.com>
+<dbarboza@ventanamicro.com> <danielhb413@gmail.com>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>
@@ -70,6 +71,7 @@ Wang Yufei (James) <james.wangyufei@huawei.com>
 Deepak C Shetty <dpkshetty@gmail.com>
 Dave Allan <dallan@redhat.com>
 Richard W.M. Jones <rjones@redhat.com>
+Daniel Henrique Barboza <dbarboza@ventanamicro.com>
 
 # Non-trivial consolidation:
 # see git documentation for information about the format

NEWS.rst

@@ -8,6 +8,718 @@ the changes introduced by each of them.
 For a more fine-grained view, use the `git log`_.
 
 
+v11.7.0 (unreleased)
+====================
+
+* **Security**
+
+* **Removed features**
+
+* **New features**
+
+  * Allow setting the log level of Cloud Hypervisor
+
+    Users can now configure the verbosity of Cloud Hypervisor by setting
+    the "log_level" option in ch.conf
+
+* **Improvements**
+
+* **Bug fixes**
+
+
+v11.6.0 (2025-08-01)
+====================
+
+* **New features**
+
+  * Introduce VIR_CONNECT_BASELINE_CPU_IGNORE_HOST flag
+
+    This new flag for virConnectBaselineHypervisorCPU can be used for computing
+    a baseline CPU on any host. Without the VIR_CONNECT_BASELINE_CPU_IGNORE_HOST
+    flag the baseline API would return reasonable output only when run on one of
+    the hosts that the input CPU definitions were collected from.
+
+  * Allow control over QEMU TLS priority strings
+
+    The qemu.conf file now has multiple settings allowing control over the
+    QEMU TLS priority strings, for the different subsystems in QEMU that
+    can support TLS. This can be used to workaround a current bug in GNUTLS
+    that is liable to cause crashes of the source QEMU when performing long
+    running live migration operations with TLS enabled.
+
+  * Add support for disabling deprecated CPU model features by default for s390 domains
+
+    Starting an s390 domain with host-model will now default to setting the
+    ``deprecated_features`` attribute to ``off``, ensuring the domain starts
+    with a migration-compatible CPU model to newer systems. This behavior can
+    be modified by setting the ``default_cpu_deprecated_features`` option in
+    the qemu.conf file.
+
+  * bhyve: Add TCP console support
+
+    TCP serial devices can now be configured with ``<serial type='tcp'>``::
+
+      <serial type='tcp'>
+        <source mode='bind' host='127.0.0.1' service='12345'/>
+        <target type='serial' port='0'/>
+      </serial>
+
+    Additionally, number of supported consoles increased to 4.
+
+  * qemu: Add support for RBD namespaces
+
+    Allow specifying the 'namespace' within a RBD image pool.
+
+* **Improvements**
+
+  * qemu: Change default SCSI controller model to ``virtio-scsi`` for ARM and RISC-V
+
+    The previous default of ``lsilogic`` is unsupported by modern operating
+    systems. ``virtio-scsi`` is a more suitable default for ARM and RISC-V
+    ``virt`` machine types.
+
+  * Clarify documentation of virConnectBaselineHypervisorCPU
+
+    The documentation makes it clear virConnectBaselineHypervisorCPU is
+    supposed to be called on one of the hosts represented in the input CPU
+    definitions. Otherwise the API will give unexpected results.
+
+  * Allow specifying zero discard granularity for block devices
+
+    This can be used to tell some guest operating systems (notably Windows) to
+    not trim the disk.
+
+  * bhyve: Add timeout handling for bhyveload
+
+    It is now possible to run ``bhyveload`` with the ``timeout`` tool, which
+    can send ``SIGTERM`` and ``SIGKILL`` signals when timeout is reached.
+    Timeout values are set using the ``bhyveload_timeout`` and
+    ``bhyveload_timeout_kill`` configuration options in ``bhyve.conf``.
+
+  * nss: Improve debugging
+
+    Debugging messages from NSS modules can be now enabled by setting the
+    ``LIBVIRT_NSS_DEBUG`` environment variable. So far, there is no special
+    meaning to its value.
+
+  * rpc: Removed requirement for TLS certificates to support 'key encipherment'
+
+    With TLS 1.3, key encipherment is not required even for RSA keys. Other key
+    types didn't even support it so they were wrongly refused even in cases when
+    they would work with libvirt. The TLS certificate validation now no longer
+    requires 'key encipherment' to be enabled.
+
+* **Bug fixes**
+
+  * bhyve: Fix resetting of the autostart flag of the domain on destroy.
+
+  * The nwfilter driver no longer recreates the base iptable/ip6tables chains
+
+    The nwfilter driver had a impl mistake causing it to recreate the
+    base chains for iptables/ip6tables every time a VM was started.
+    This allowed a small window where traffic might not be fully
+    filtered. It now handles iptables/ip6tables the same way as
+    ebtables, creating the base chains only if they did not already
+    exist.
+
+  * Fix systemd unit ordering for auto-shutdown of domains via the daemon
+
+    The ordering of systemd units created by libvirt for individual machines
+    needed to be adapted when the shutdown of VMs on host shutdown is done
+    via the virt daemon itself (rather than ``libvirt-guests.service``) to
+    ensure that the VMs are not terminated before the virt daemon can deal with
+    them.
+
+
+v11.5.0 (2025-07-01)
+====================
+
+* **Removed features**
+
+  * qemu: Don't accept VIR_DUMP_LIVE flag in virDomainCoreDumpWithFormat()
+
+    Unfortunately, QEMU always pauses vCPUs when doing a core dump. Therefore,
+    there is no way for Libvirt to honor VIR_DUMP_LIVE flag semantics. Instead
+    of silently pretending the flag works, an appropriate error is now
+    reported.
+
+* **New features**
+
+  * vmx: Add support for reporting NVMe disks in the domain XML
+
+  * qemu: Add support for NVMe disks
+
+    NVMe disks can now be emulated by using an ``nvme`` bus, but require a
+    serial due to the hypervisor::
+
+      <target dev='nvme0n1' bus='nvme'/>
+      <serial>qwertyuiop</serial>
+
+    Multiple disks can be represented as different namespaces on the same
+    controller, but they cannot have a different serial number due to the fact
+    that it is the controller which ultimately has the serial number attached to
+    it, but for ease of use it is automatically copied from the disk serial.
+
+  * esx: Add support for specifying alternative CA bundle for remote peer verification
+
+    Users can now use ``cacert`` parameter in the URI to specify a file path
+    with CA certificate(s) that will be used for remote peer certificate
+    validation.
+
+  * qemu: add support for AMD IOMMU device
+
+    The ``amd`` model for the ``<iommu>`` device is now supported.
+    New attributes ``passtrhough`` and ``xtsup`` are also supported for this
+    model.
+
+* **Improvements**
+
+  * Include supported console types in domain capabilities
+
+    Domain capabilities now include information about supported console types, such as::
+
+      <console supported='yes'>
+        <enum name='type'>
+          <value>pty</value>
+          <value>tcp</value>
+        </enum>
+      </console>
+
+  * virsh: Add waiting for domain state via ``virsh await``
+
+    The new helper command ``virsh await`` simplifies waiting on domain state
+    which is normally announced via events. Currently two waiting conditions are
+    implemented: ``domain-inactive``, and ``guest-agent-available``.
+
+* **Bug fixes**
+
+  * qemu: Be more forgiving when acquiring QUERY job when formatting domain XML
+
+    Since ``libvirt-11.0.0`` the ``virDomainGetXMLDesc()`` API used to format
+    domain XML acquires QUERY job. But this caused a regression when the API
+    might timeout for incoming migration. This is now fixed.
+
+  * qemu: Fix shared filesystem detection on nonexistent paths
+
+    Since ``libvirt-11.1.0`` nonexistent paths within directories marked as
+    shared filesystem (via the ``shared_filesystems`` option in ``qemu.conf``
+    would not be properly detected as being on a shared filesystem.
+
+  * qemu: Properly emulate USB cdrom device
+
+    CD-ROM devices on USB bus are now properly emulated as such which was not
+    the case since libvirt switched to the modern qemu commandline syntax for
+    storage backends.
+
+
+v11.4.0 (2025-06-02)
+====================
+
+* **New features**
+
+  * qemu: ppc64 POWER11 processor support
+
+    Support for the recently released IBM POWER11 processor was added.
+
+* **Packaging changes**
+
+  * All helper programs are now detected from ``$PATH`` during runtime
+
+    All of the code was now converted to dynamically look up helper programs
+    in ``$PATH`` rather than doing the lookup at build time and then compiling
+    in the result.
+
+    Programs ``mount``, ``umount``, ``mkfs``, ``modprobe``, ``rmmod``,
+    ``numad``, ``dmidecode``, ``ip``, ``tc``, ``mdevctl``, ``mm-ctl``,
+    ``iscsiadm``, ``ovs-vsctl``, ``pkttyagent``, ``bhyveload``, ``bhyvectl``,
+    ``bhyve``, ``ifconfig``, ``vzlist``, ``vzctl``, ``vzmigrate``, and the
+    tools from the lvm suite (``vgchange``, ``lvcreate``, etc..) are now not
+    needed during build and will still work properly if placed in ``$PATH``.
+
+    This also ensures that libvirt works correctly on distros that are
+    transitioning ``/sbin`` into ``/bin`` and upgraded installations have
+    a different layout from fresh installations.
+
+* **Improvements**
+
+  * virsh: Add option ``--no-pkttyagent``
+
+    That option suppresses registration of pkttyagent with polkitd.
+
+  * bhyve: support NVRAM configuration for UEFI firmwares
+
+    The bhyve driver now supports specifying NVRAM store file, such as::
+
+      <os firmware='efi'>
+        <nvram/>
+      </os>
+
+  * qemu: Improve accuracy of FDC/floppy device support statement in capabilities XML
+
+    The data is now based on the presence of the controller in qemu rather than
+    just a denylist of machine types where floppies not work.
+
+* **Bug fixes**
+
+  * qemu: Fix failure when reverting to internal snapshots
+
+    A regression in ``libvirt-11.2`` and ``libvirt-11.3`` prevents reverting to
+    an internal snapshot. Attempts to revert would produce the following error::
+
+      error: operation failed: load of internal snapshot 'foo1' job failed: Device 'libvirt-1-format' is writable but does not support snapshots
+
+    The only workaround is to avoid the broken versions.
+
+  * qemu: Fix virtqemud crash when resuming failed post-copy migration
+
+    A regression introduced in ``libvirt-11.2.0`` caused virtqemud on the
+    destination host to crash when trying to resume failed post-copy
+    migration.
+
+  * qemu: Treat the ``queues`` configuration of ``virtio-net`` as guest ABI
+
+    The queue count itself isn't a device frontend property but libvirt uses
+    it to calculate ``vectors`` option of the device which is a guest OS visible
+    property, thus ``queues`` must not change during migration. The ABI stability
+    check now handles this properly.
+
+
+v11.3.0 (2025-05-02)
+====================
+
+* **Removed features**
+
+  * Support for AppArmor versions prior to 3.0.0 has been dropped.
+
+* **New features**
+
+  * xen: Support configuration of ``<hyperv/>`` flags for Xen domains.
+
+    The following flags are now configurable for Xen: ``vapic``, ``synic``,
+    ``stimer``, ``frequencies``, ``tlbflush`` and ``ipi``.
+
+  * bhyve: Support virtio random number generator devices
+
+    Domain XMLs can now include virtio random number generator devices.
+    They are configured with::
+
+     <rng model='virtio'>
+       <backend model='random'/>
+     </rng>
+
+  * bhyve: Support ``<interface type='network'>``
+
+    At the moment it doesn't provide any new features compared to
+    ``<interface type='bridge'>``, but allows a more flexible configuration.
+
+* **Bug fixes**
+
+  * cpu_map: Install Ampere-1 ARM CPU models
+
+    The Ampere-1 CPU models added in the previous release were not properly
+    installed and thus every attempt to start an ARM domain with custom
+    CPU definition would fail.
+
+  * storage: Fix new volume creation
+
+    No more errors occur when new storage volume is being created using ``virsh
+    vol-create`` with ``--validate`` option and/or ``virStorageVolCreateXML()``
+    with ``VIR_VOL_XML_PARSE_VALIDATE`` flag.
+
+  * Don't spam logs with error about ``qemu-rdp`` when starting a qemu VM
+
+    On hosts where the ``qemu-rdp`` binary is not installed a start of a VM
+    would cause an error such as ::
+
+      error : qemuRdpNewForHelper:103 : 'qemu-rdp' is not a suitable qemu-rdp helper name: No such file or directory
+
+    to be logged in the system log. It is safe to ignore the error. The code
+    was fixed to avoid the message when probing for support.
+
+  * Fix libvirt daemon crash on failure to hotplug a disk into a ``qemu`` VM
+
+    Some failures of disk hotplug could cause the libvirt daemon to crash due
+    to a bug when rolling back disk throttling filters.
+
+
+v11.2.0 (2025-04-01)
+====================
+
+* **Removed features**
+
+  * Remove support for qemu-6.1 and older
+
+    Libvirt now requires *qemu-6.2* or newer based on our platform support
+    policy.
+
+* **New features**
+
+  * qemu: Add new 'image_format' parameter to virDomainSaveParams
+
+    ``virDomainSaveParams`` now supports an ``image_format`` parameter for
+    specifying the save image format on a per-domain basis. The parameter
+    accepts the same values as the driver-wide ``save_image_format`` setting
+    in ``qemu.conf``. An image format specified via ``virDomainSaveParams``
+    takes precedence over the driver-wide setting.
+
+  * qemu: Added guest load averages to the output of virDomainGetGuestInfo
+
+    This feature will be available with qemu guest agent 10.0 onwards.
+
+  * qemu: Add support for multiple iothreads for ``virtio-scsi`` controller
+
+    It's now possible to map multiple iothreads to the ``virtio-scsi`` controller
+    or even map them to specific virtqueues similarly to the ``virtio-blk``
+    device allowing for better performance in certain scenarios.
+
+  * qemu: integrate support for VM shutdown on host shutdown
+
+    It is now possible to instruct the QEMU driver to automatically perform
+    managed save, graceful shutdown, or hard poweroff on running VMs, when a
+    host shutdown is requested. This feature is intended to eventually replace
+    usage of the libvirt-guests script. The new approach improves on the
+    libvirt-guests script, by proactively monitoring logind for a signal that
+    a host shutdown has been requested. It will initiate the chosen action on
+    running guests immediately, allowing shutdown inhibitors to be released
+    sooner. The new solution is also able to iteratively try multiple actions
+    until one of them succeeds in shutting down the VM.
+
+    Since it must be mutually exclusive with the libvirt-guests script, this
+    feature currently requires a manual opt-in through editing of the
+    /etc/libvirt/qemu.conf configuration file. The libvirt-guests script must
+    be disabled before doing this.
+
+  * qemu: Add 'sparse' as a new save image format
+
+    QEMU's ``file`` migration has been supplemented with the new stream format
+    ``mapped-ram``, where RAM pages are mapped directly to offsets in the
+    migration file. ``mapped-ram`` is now supported by augmenting the existing
+    save image formats with the ``sparse`` format.
+
+  * qemu: Add support for parallel save/restore
+
+    The ``sparse`` image format can support reading and writing by multiple
+    channels. ``virDomainSaveParams`` and ``virDomainRestoreParams`` now
+    support specifying the number of IO channels used for parallel save and
+    restore. Using multiple channels can reduce the time required to save
+    and restore domains.
+
+  * virsh: Introduce new hypervisor-cpu-models command
+
+    Added a new virsh command ``hypervisor-cpu-models``. The command pulls from
+    the existing domcapabilities XML and uses xpath to parse CPU model strings.
+    By default, only models reported as usable by the hypervisor on the host
+    system are printed. A user may specify ``--all`` to also print models which
+    are not supported on the host.
+
+  * qemu: Introduce os/shim element
+
+    For secure boot environments where ``<loader/>`` is signed, it may be
+    unfeasible to keep the binary up to date (esp. when revoking certificates
+    contained within). To address that, new ``<shim/>`` element is introduced
+    which allows hypervisor to side load another UEFI binary, which can then
+    contain new certification authorities and/or list of revocations.
+
+  * ch: Enable SEV SNP support
+
+    Cloud Hypervisor guests can be now started with SEV SNP enabled.
+
+  * qemu: Support for Block Disk Along with Throttle Filters
+
+    Introduce support for multiple throttle groups per block disk in QEMU,
+    enhancing I/O control and performance optimization. This update builds
+    on the existing throttling functionality by allowing more granular control
+    with the ability to assign different throttle groups to multiple block
+    devices, improving shared throttling across devices.
+
+* **Improvements**
+
+  * qemu: Improved guest agent corner case error reporting
+
+    The APIs using the guest agent now report two specific error codes aimed at
+    helping management applications/users to differentiate between timeout
+    while libvirt was synchronizing with the guest agent and timeout after a
+    command was already sent.
+
+    The new error codes are ``VIR_ERR_AGENT_COMMAND_TIMEOUT`` and
+    ``VIR_ERR_AGENT_COMMAND_FAILED``.
+
+  * qemu: Use common check for shared memory use for ``vhost-user`` network devices
+
+    Historically libvirt printed only a warning if the ``vhost-user`` network
+    was misconfigured. Since we enforce proper configuration for other device
+    types using ``vhost-user`` it is now enforced also for network devices and
+    prints an actual error on misconfiguration.
+
+  * Introduce constants for discoverability of entries in bulk stats APIs
+
+    Libvirt introduced constants exposed by our API description XML which allows
+    discoverability of new entries in typed parameter names returned by
+    ``virConnectGetAllDomainStats``, ``virDomainListGetStats``, and
+    ``virDomainGetGuestInfo``.
+
+  * qemu: Reflect MAC address change in live domain XML
+
+    When a guest changes MAC address on one of its vNICs the new MAC address is
+    now visible in the live XML under ``currentAddress`` attribute of
+    ``<mac/>`` element. At the same time,
+    ``VIR_DOMAIN_EVENT_ID_NIC_MAC_CHANGE`` event is emitted so that management
+    applications can update their internal state.
+
+* **Bug fixes**
+
+  * qemu: attach virtio-mem with CCW address
+
+    Attaching a virtio-mem device on s390 without an address type now gets a
+    default type CCW address assigned. A specified CCW address is now used for
+    the virtio-mem device instead of getting overwritten by a PCI address.
+
+  * ch: Various memory leak fixes
+
+    There were some memory leaks identified in the Cloud Hypervisor driver.
+    They are fixed now.
+
+
+v11.1.0 (2025-03-03)
+====================
+
+* **Packaging changes**
+
+  * De-modularize the 'fs' storage file backend
+
+    The storage file backend for local files uses only code which we compile
+    into the internal libraries anyways so there's no point in having it
+    as a loadable module. The ``storage-file/libvirt_storage_file_fs.so`` module
+    no longer exists and its functionality is embedded directly.
+
+* **Removed features**
+
+  * vbox: removed support for version 6.1 APIs
+
+    Libvirt no longer supports use of VirtualBox 6.1 since this version reached
+    its end of life on 2024/01.
+
+* **New features**
+
+  * nodedev: Support ccwgroup based qeth devices
+
+    CCW group devices are devices that use multiple subchannels on the
+    mainframe's channel subsystem. A qeth group device maps to subchannels and
+    their corresponding device numbers and device bus-IDs. The ``ccwgroup``
+    device nodes are placed besides the subchannel nodes under computer and list
+    the group members within a new ``ccwgroup`` capability. A new capability
+    ``ccwgroup_member`` is added into capability ``ccw`` to represent a device
+    membership to a ccwgroup. Filters are added to find ccwgroups as well as
+    ccwgroup members.
+
+  * ch: Support handling events from cloud-hypervisor
+
+    The ch driver now supports handling events from the cloud-hypervisor.
+    Events include VM lifecycle operations such as  shutdown, pause, resume,
+    etc. Libvirt will now read these events and take actions such as
+    updating domain state, etc.
+
+  * Introduce virtio-mem ``<memory/>`` model for s390 guests
+
+    The virtio-mem model of ``<memory/>`` device can now be used with s390
+    guests.
+
+  * Support using passt as the backend for interface type='vhostuser'
+
+    The combination of vhostuser transport with passt as the backend
+    provides high performance, fully featured networking without the
+    need for libvirt or QEMU to have any elevated privileges or
+    capabilities. Configuration and features are identical to the
+    configuration for type='user' with the passt backend.
+
+* **Improvements**
+
+  * qemu: I/O error messages can be queried via ``virDomainGetMessages()``
+
+    The qemu hypervisor driver now preserves the last I/O error message along
+    with the timestamp when it was recorded and preserves it to be queried via
+    ``virDomainGetMessages()``.
+
+* **Bug fixes**
+
+  * tools: ssh-proxy: Check if domain is running before connecting to it
+
+    If domain is not running but has a static CID configured for its VSOCK then
+    the ssh-proxy parsed it anyways. This may have resulted in mistakenly
+    connecting to a different domain. Domain status is checked before parsing
+    its CID.
+
+  * apparmor: Allow SGX if configured
+
+    If domain has ``<memory model='sgx-epc'\>`` configured then libvirt now
+    adds corresponding devices into a per-domain profile so that AppArmor does
+    not deny QEMU access to them.
+
+  * qemu: Fix crash when starting a domain on a host with unknown host CPU
+
+    On hosts where we cannot detect a host CPU model (mostly aarch64 hosts)
+    starting a domain with a custom CPU model caused a crash of virtqemud.
+
+    The bug was introduced in libvirt-10.9.0
+
+
+v11.0.0 (2025-01-15)
+====================
+
+* **New features**
+
+  * network/qemu/lxc: support vlans on standard Linux host bridges
+
+    The network, qemu, and lxc drivers now support (using the
+    ``<vlan>`` subelement) vlan tagging and trunking on network
+    interfaces connected to a standard Linux host bridge.
+
+  * qemu: Add support for direct and extended tlbflush features
+
+    Domains can now utilise more tlbflush hyperv features.
+
+* **Improvements**
+
+  * ch: Enable user aliases
+
+    User can now specify custom aliases for devices in domain XML
+
+  * qemu: Grab a QUERY job when formatting domain XML
+
+    Under some specific conditions it might have happened that domain XML did
+    not contain runtime information or returned an XML that's in process of
+    changing (e.g. by a thread that's hotplugging a device). Formatting domain
+    XML now serializes properly with other threads.
+
+  * virtiofs: Allow read only mode
+
+    The ``<filesystem/>`` with `virtiofsd` backend can now use ``<readonly/>``
+    tag to export underlying filesystem in read only mode.
+
+  * qemu: allow migration of vGPU from mdev device <-> SRIOV VF device
+
+    Some GPU vendors are switching from using vGPUs creating using
+    mdev and identified with a uuid, to vGPUs created as SRIOV VFs and
+    identified by their PCI address, and want to support live
+    migration from a host using one type of vGPU to the other
+    type. This is now possible.
+
+* **Bug fixes**
+
+  * qemu: tpm: do not update profile name for transient domains
+
+    Fix a possible crash when starting a transient domain which was
+    introduced in the previous release.
+
+  * qemu: Fix snapshot to not delete disk image with internal snapshot
+
+    When a VM has internal snapshot that is parent to external snapshot and user
+    reverts to the internal snapshot and deletes the external snapshot libvirt
+    would delete the disk image containing the internal snapshot. This would
+    result in data loss.
+
+  * qemu: Do not format invalid XML with hyperv features in passthrough mode
+
+    When hyperv features were specified together with ``mode="passthrough"``
+    libvirt parsed and formatted such features in the domain XML even though
+    they were not used at all, resulting in XML that is not valid based on our
+    schema.  This is now fixed by not parsing any specified features when the
+    passthrough mode is used.
+
+  * qemu: Fix a crash when starting a domain with ovs bridge and QOS
+
+  * cpu: Add missing -v1 variants for CPU models
+
+    Some CPU models (mostly old ones) were missed when versioned CPU model
+    names were introduced in the previous release.
+
+  * qemu: Fix false error when recovering failed post-copy migration
+
+    In some cases libvirt would report a failure to recover post-copy migration
+    even though the recovery started just fine and migration would eventually
+    successfully finish.
+
+
+v10.10.0 (2024-12-02)
+=====================
+
+* **New features**
+
+  * qemu: add multi boot device support on s390x
+
+    For classical mainframe guests (i.e. LPAR or z/VM installations), you
+    always have to explicitly specify the disk where you want to boot from (or
+    "IPL" from, in s390x-speak -- IPL means "Initial Program Load").
+
+    In the past QEMU only used the first device in the boot order to IPL from.
+    With the new multi boot device support on s390x that is available with QEMU
+    version 9.2 and newer, this limitation is lifted. If the IPL fails for the
+    first device with the lowest boot index, the device with the second lowest
+    boot index will be tried and so on until IPL is successful or there are no
+    remaining boot devices to try.
+
+    Limitation: The s390x BIOS will try to IPL up to 8 total devices, any
+    number of which may be disks or network devices.
+
+  * qemu: Add support for versioned CPU models
+
+    Updates to QEMU CPU models with -vN suffix can now be used in libvirt just
+    like any other CPU model.
+
+  * qemu: Support for the 'data-file' QCOW2 image feature
+
+    The QEMU hypervisor driver now supports QCOW2 images with 'data-file'
+    feature present (both when probing from the image itself and when specified
+    explicitly via ``<dataStore>`` element). This can be useful when it's
+    required to keep data "raw" on disk, but the use case requires features
+    of the QCOW2 format such as incremental backups.
+
+  * swtpm: Add support for profiles
+
+    Upcoming swtpm release will have TPM profile support that allows to
+    restrict a TPM's provided set of crypto algorithms and commands. Users can
+    now select profile by using ``<profile/>`` in their TPM XML definition.
+
+* **Improvements**
+
+  * qemu: Support UEFI NVRAM images on block storage
+
+    Libvirt now allows users to use block storage as backend for UEFI NVRAM
+    images and allows them to be in format different than the template. When
+    qcow2 is used as the format, the images are now also auto-populated from the
+    template.
+
+  * qemu: Automatically add IOMMU when needed
+
+    When domain of 'qemu' or 'kvm' type has more than 255 vCPUs IOMMU with EIM
+    mode is required. Starting with this release libvirt automatically adds one
+    (or turns on the EIM mode if there's IOMMU without it).
+
+  * ch: allow hostdevs in domain definition
+
+    The Cloud Hypervisor driver (ch) now supports ``<hostdev/>``-s.
+
+  * ch: Enable callbacks for ch domain events
+
+    The Cloud Hypervisor driver (ch) now supports emitting events on domain
+    define, undefine, start, boot, stop and destroy.
+
+* **Bug fixes**
+
+  * qemu: Fix reversion and inactive deletion of internal snapshots with UEFI NVRAM
+
+    In `v10.9.0 (2024-11-01)`_ creation of internal snapshots of VMs with UEFI
+    firmware was allowed, but certain operations such as reversion or inactive
+    deletion didn't work properly as they didn't consider the NVRAM qcow2 file.
+
+  * virnetdevopenvswitch: Warn on unsupported QoS settings
+
+    For OpenVSwitch vNICs libivrt does not set QoS directly using 'tc' but
+    offloads setting to OVS. But OVS is not as feature full as libvirt in this
+    regard and setting different 'peak' than 'average' results in vNIC always
+    sticking with 'peak'. Produce a warning if that's the case.
+
+
 v10.9.0 (2024-11-01)
 ====================
 
@@ -39,7 +751,7 @@ v10.9.0 (2024-11-01)
 
       warning : qemuSnapshotActiveInternalDeleteGetDevices:3841 : inconsistent internal snapshot state (deletion): VM='snap' snapshot='1727959843' missing='vda ' unexpected='' extra=''
 
-    Users are encouraged to report any occurence of the above message along
+    Users are encouraged to report any occurrence of the above message along
     with steps they took to the upstream tracker.
 
   * qemu: improve documentation of image format settings
@@ -56,6 +768,7 @@ v10.9.0 (2024-11-01)
     ``<blockers model='...'>`` element is added for that CPU model listing
     features required by the CPU model, but not supported on the host.
 
+
 v10.8.0 (2024-10-01)
 ====================
 
@@ -74,7 +787,7 @@ v10.8.0 (2024-10-01)
     the bridge interface (normally it would not be set, as is done
     with other forward modes).
 
-  * storage: Lessen dependancy on the ``showmount`` program
+  * storage: Lessen dependency on the ``showmount`` program
 
     Libvirt now automatically detects presence of ``showmount`` during runtime
     as we do with other helper programs and also the
@@ -121,7 +834,7 @@ v10.8.0 (2024-10-01)
   * qemu: backup: Fix possible crashes when running monitoring commands during backup job
 
     The qemu monitor code was fixed to not crash in specific cases when
-    monitoing APIs are called during a backup job.
+    monitoring APIs are called during a backup job.
 
   * Fix various memleaks and overflows
 
@@ -168,6 +881,17 @@ v10.7.0 (2024-09-02)
     domain XML for descendants of the generic PC machine type (``i440fx``,
     ``q35``, ``xenfv`` and ``isapc``).
 
+  * qemu: Add support for hyperv enlightenment feature ``hv-emsr-bitmap``
+
+    It is introduced since ``QEMU 7.10``, allowing L0 (KVM) and L1 (Hyper-V)
+    hypervisors to collaborate to avoid unnecessary updates to L2 MSR-Bitmap
+    upon vmexits.
+
+  * qemu: Add support for hyperv enlightenment feature ``hv-xmm-input``
+
+    It is introduced since ``QEMU 7.10``, allowing to pass parameters for
+    certain hypercalls using XMM registers (“XMM Fast Hypercall Input”).
+
 * **Improvements**
 
   * ch: support restore with network devices
@@ -180,6 +904,7 @@ v10.7.0 (2024-09-02)
     Cloud-Hypervisor driver now supports Ethernet, Network (NAT) and Bridge
     networking modes.
 
+
 v10.6.0 (2024-08-05)
 ====================
 
@@ -297,6 +1022,18 @@ v10.5.0 (2024-07-01)
 v10.4.0 (2024-06-03)
 ====================
 
+* **Security**
+
+  * ``CVE-2024-4418``: Fix stack use-after-free in virNetClientIOEventLoop()
+
+    Fix race condition leading to a stack use-after-free bug was found in libvirt.
+    Due to a bad assumption in the virNetClientIOEventLoop() method, the data
+    pointer to a stack-allocated virNetClientIOEventData structure ended up being
+    used in the virNetClientIOEventFD callback while the data pointer's stack frame
+    was concurrently being "freed" when returning from virNetClientIOEventLoop().
+    This flaw allows a local, unprivileged user to access virtproxyd without
+    authenticating.
+
 * **New features**
 
   * qemu: Support for ras feature for virt machine type
@@ -450,6 +1187,18 @@ v10.3.0 (2024-05-02)
 v10.2.0 (2024-04-02)
 ====================
 
+* **Security**
+
+  * ``CVE-2024-2494``: remote: check for negative array lengths before allocation
+
+   Fix the flaw of the RPC library APIs of libvirt. The RPC server
+   de-serialization code allocates memory for arrays before the non-negative
+   length check is performed by the C API entry points. Passing a negative length
+   to the g_new0 function results in a crash due to the negative length being
+   treated as a huge positive number. A local unprivileged user could use this
+   flaw to perform a denial of service attack by causing the libvirt daemon to
+   crash.
+
 * **New features**
 
   * ch: Basic save and restore support for ch driver
@@ -593,7 +1342,7 @@ v10.1.0 (2024-03-01)
 
     ``virt-admin`` doesn't try to guess the URI of the daemon to manage so a
     failure to connect may be confusing for users if modular daemons are used.
-    Add a hint to use the URI of the dameon to manage.
+    Add a hint to use the URI of the daemon to manage.
 
 * **Bug fixes**
 
@@ -639,7 +1388,7 @@ v10.1.0 (2024-03-01)
 
   * qemu: Fix reservation of manually specified port for disk migration
 
-    A manually specified port would not be relased after disk migration making
+    A manually specified port would not be released after disk migration making
     it impossible to use it again.
 
 
@@ -840,6 +1589,10 @@ v9.8.0 (2023-10-02)
         <source dev='/dev/vhost-vdpa-0'>
         ...
 
+  * cpu_map: Add the EPYC-Genoa cpu model
+
+    This model is introduced since ``QEMU 8.1``.
+
 * **Improvements**
 
   * qemu: add nbdkit backend for network disks
@@ -988,7 +1741,8 @@ v9.5.0 (2023-07-03)
 
 * **Bug fixes**
 
-  * lxc: Allow seeking in ``/proc/meminfo`` to resove failure with new ``procps`` package
+  * lxc: Allow seeking in ``/proc/meminfo`` to resolve failure with new
+    ``procps`` package
 
     New version of the ``free`` command from ``procps`` package seeks into the
     ``/proc/meminfo`` file, which was not supported by the instance of the file
@@ -5230,7 +5984,7 @@ v4.5.0 (2018-07-02)
   * qemu: Fix a potential libvirtd crash on VM reconnect
 
     Initialization of the driver worker pool needs to come before libvirtd
-    trying to reconnect to all machines, since one of the QEMU processes migh
+    trying to reconnect to all machines, since one of the QEMU processes might
     have already emitted events which need to be handled prior to us getting to
     the worker pool initialization.
 
@@ -6570,7 +7324,7 @@ v3.0.0 (2017-01-17)
 
   * Event notifications for the secret object
 
-    The secret object now supports event notifications, covering lifcycle
+    The secret object now supports event notifications, covering lifecycle
     changes and secret value changes.
 
   * New localPtr attribute for "ip" element in network XML

build-aux/Makefile.in

@@ -6,6 +6,7 @@ FLAKE8 = @flake8_path@
 BLACK = @black_path@
 RUNUTF8 = @runutf8@
 PYTHON = @PYTHON3@
+PERL = @PERL@
 GREP = @GREP@
 SED = @SED@
 AWK = @AWK@

build-aux/meson.build

@@ -13,23 +13,10 @@ if git and tests_enabled[0]
   if host_machine.system() == 'freebsd' or host_machine.system() == 'darwin'
     make_prog = find_program('gmake')
     sed_prog = find_program('gsed')
+    grep_prog = find_program('ggrep')
   else
     make_prog = find_program('make')
     sed_prog = find_program('sed')
-  endif
-
-  if host_machine.system() == 'freebsd'
-    grep_prog = find_program('grep')
-    grep_cmd = run_command(grep_prog, '--version', check: true)
-    if grep_cmd.stdout().startswith('grep (BSD grep')
-      grep_prog = find_program('/usr/local/bin/grep', required: false)
-      if not grep_prog.found()
-        error('GNU grep not found')
-      endif
-    endif
-  elif host_machine.system() == 'darwin'
-    grep_prog = find_program('ggrep')
-  else
     grep_prog = find_program('grep')
   endif
 
@@ -42,6 +29,7 @@ if git and tests_enabled[0]
     'black_path': black_path,
     'runutf8': ' '.join(runutf8),
     'PYTHON3': python3_prog.full_path(),
+    'PERL': perl_prog.full_path(),
     'GREP': grep_prog.full_path(),
     'SED': sed_prog.full_path(),
     'AWK': awk_prog.full_path(),

build-aux/syntax-check.mk

@@ -92,8 +92,8 @@ sc_prohibit_raw_virclassnew:
 
 # Avoid raw malloc and free, except in documentation comments.
 sc_prohibit_raw_allocation:
-	@prohibit='^.[^*].*\<((m|c|re)alloc|free) *\([^)]' \
+	@prohibit='^.[^*].*\<((m|c|re)alloc|free|g_malloc) *\([^)]' \
-	halt='use VIR_ macros from viralloc.h instead of malloc/free' \
+	halt='use g_new0/g_malloc0/g_free instead of malloc/free/g_malloc' \
 	  $(_sc_search_regexp)
 
 # Avoid functions that can lead to double-close bugs.
@@ -247,6 +247,12 @@ sc_prohibit_canonicalize_file_name:
 	halt='use virFileCanonicalizePath() instead of canonicalize_file_name()' \
 	  $(_sc_search_regexp)
 
+sc_prohibit_realpath:
+	@prohibit='\<realpath\(' \
+	exclude='exempt from syntax-check' \
+	halt='use virFileCanonicalizePath() instead of realpath()' \
+	  $(_sc_search_regexp)
+
 # qsort from glibc has unstable sort ordering for "equal" members
 sc_prohibit_qsort:
 	@prohibit='\<(qsort|qsort_r) *\(' \
@@ -401,6 +407,8 @@ msg_gen_function += virReportError
 msg_gen_function += virReportErrorHelper
 msg_gen_function += virReportSystemError
 msg_gen_function += virLastErrorPrefixMessage
+msg_gen_function += vshError
+msg_gen_function += vshWarn
 
 # Uncomment the following and run "ninja test" to see diagnostics
 # that are not yet marked for translation, but that need to be rewritten
@@ -408,7 +416,6 @@ msg_gen_function += virLastErrorPrefixMessage
 # msg_gen_function += fprintf
 # msg_gen_function += testError
 # msg_gen_function += vshPrint
-# msg_gen_function += vshError
 
 space = $(null) $(null)
 func_re= ($(subst $(space),|,$(msg_gen_function)))
@@ -1135,7 +1142,7 @@ sc_prohibit_backup_files:
 sc_avoid_remote_reference_to_local_file:
 	@prohibit='<#' \
 	in_vc_files='\.rst$$' \
-	halt='use local reference within a file' \
+	halt='use `section`_ or `here <section_>`__ instead of `here <#section>`__' \
 	  $(_sc_search_regexp)
 
 # This Perl code is slightly obfuscated.  Not only is each "$" doubled
@@ -1273,9 +1280,10 @@ po_file ?= $(top_srcdir)/po/POTFILES
 # This is all generated files for RPC code.
 generated_files = \
   $(top_builddir)/src/*.[ch] \
-  $(top_builddir)/src/*/*.[ch]
+  $(top_builddir)/src/*/*.[ch] \
+  $(top_builddir)/src/*/*.policy.in
 
-_gl_translatable_string_re ?= \b(N?_|gettext *)\([^)"]*("|$$)
+_gl_translatable_string_re ?= (^<policyconfig>|\b(N?_|gettext *)\([^)"]*("|$$))
 
 # sc_po_check can fail if generated files are not built first
 sc_po_check:
@@ -1324,9 +1332,9 @@ sc_spacing-check:
 	$(PERL) $(top_srcdir)/build-aux/check-spacing.pl || \
 	  { echo 'incorrect formatting' 1>&2; exit 1; }
 
-sc_mock-noinline:
+sc_mockable-attribute:
 	$(AM_V_GEN)$(VC_LIST_EXCEPT) | $(GREP) '\.[ch]$$' | $(RUNUTF8) \
-	$(PYTHON) $(top_srcdir)/scripts/mock-noinline.py
+	$(PYTHON) $(top_srcdir)/scripts/mockable-attribute.py
 
 sc_header-ifdef:
 	$(AM_V_GEN)$(VC_LIST_EXCEPT) | $(GREP) '\.[h]$$' | $(RUNUTF8) xargs \
@@ -1347,6 +1355,13 @@ sc_rst_since:
 	halt='format :since: correctly' \
 	  $(_sc_search_regexp)
 
+sc_prohibit_inline_functions:
+	@prohibit='\binline\b' \
+	in_vc_files='\.c$$' \
+	exclude='exempt from syntax-check' \
+	halt='avoid inline functions in .c files' \
+	  $(_sc_search_regexp)
+
 
 ## ---------- ##
 ## Exceptions ##
@@ -1411,8 +1426,11 @@ exclude_file_name_regexp--sc_prohibit_nonreentrant = \
 exclude_file_name_regexp--sc_prohibit_canonicalize_file_name = \
   ^(build-aux/syntax-check\.mk|tests/virfilemock\.c)$$
 
+exclude_file_name_regexp--sc_prohibit_realpath = \
+  ^(build-aux/syntax-check\.mk|src/cpu_map/sync_qemu_features_i386\.py|tests/virfilemock\.c)$$
+
 exclude_file_name_regexp--sc_prohibit_raw_allocation = \
-  ^(docs/advanced-tests\.rst|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c|tools/nss/libvirt_nss(_leases|_macs)?\.c)$$
+  ^(docs/advanced-tests\.rst|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c|tools/nss/libvirt_nss(_leases|_log|_macs)?\.[ch])$$
 
 exclude_file_name_regexp--sc_prohibit_readlink = \
   ^src/(util/virutil|lxc/lxc_container)\.c$$
@@ -1437,7 +1455,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \
 	^(examples/|tools/virsh-edit\.c$$|tests/virmockstathelpers\.c$$|scripts/rpcgen/tests/test_demo\.c$$)
 
 exclude_file_name_regexp--sc_trailing_blank = \
-  /sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|tests/virshtestdata/.*$$
+  /sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|tests/virshtestdata/.*|docs/fonts|scripts/rpcgen/tests/.*\.bin|tests/viracpidata/.*|tests/virpcitestdata/*|tests/virstoragetestdata/images/.*\.qcow2$$
 
 exclude_file_name_regexp--sc_unmarked_diagnostics = \
   ^(scripts/apibuild.py|tests/virt-aa-helper-test|docs/js/.*\.js)$$
@@ -1504,6 +1522,9 @@ exclude_file_name_regexp--sc_black = \
 exclude_file_name_regexp--sc_spacing-check = \
   ^scripts/rpcgen/tests/test_demo\.[ch]$$
 
+exclude_file_name_regexp--sc_prohibit_inline_functions = \
+  ^src/storage_file/storage_source.*.c$$
+
 ## -------------- ##
 ## Implementation ##
 ## -------------- ##

ci/buildenv/almalinux-9.sh

@@ -33,12 +33,7 @@ function install_buildenv() {
         glibc-langpack-en \
         gnutls-devel \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
         json-c-devel \
-        kmod \
         libacl-devel \
         libattr-devel \
         libblkid-devel \
@@ -58,17 +53,13 @@ function install_buildenv() {
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
         numactl-devel \
-        numad \
         parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         python3 \
         python3-docutils \
         python3-flake8 \

ci/buildenv/alpine-322.sh

@@ -29,10 +29,8 @@ function install_buildenv() {
         glib-dev \
         gnutls-dev \
         grep \
-        iproute2 \
         iptables \
         json-c-dev \
-        kmod \
         libcap-ng-dev \
         libnl3-dev \
         libpcap-dev \
@@ -44,19 +42,15 @@ function install_buildenv() {
         libxml2-dev \
         libxml2-utils \
         libxslt \
-        lvm2 \
         lvm2-dev \
         make \
         meson \
         musl-dev \
         netcf-dev \
-        nfs-utils \
         numactl-dev \
-        open-iscsi \
         parted-dev \
         perl \
         pkgconf \
-        polkit \
         py3-docutils \
         py3-flake8 \
         py3-pytest \

ci/buildenv/alpine-edge.sh

@@ -29,10 +29,8 @@ function install_buildenv() {
         glib-dev \
         gnutls-dev \
         grep \
-        iproute2 \
         iptables \
         json-c-dev \
-        kmod \
         libcap-ng-dev \
         libnl3-dev \
         libpcap-dev \
@@ -44,19 +42,15 @@ function install_buildenv() {
         libxml2-dev \
         libxml2-utils \
         libxslt \
-        lvm2 \
         lvm2-dev \
         make \
         meson \
         musl-dev \
         netcf-dev \
-        nfs-utils \
         numactl-dev \
-        open-iscsi \
         parted-dev \
         perl \
         pkgconf \
-        polkit \
         py3-docutils \
         py3-flake8 \
         py3-pytest \

ci/buildenv/centos-stream-9.sh

@@ -34,12 +34,7 @@ function install_buildenv() {
         glibc-langpack-en \
         gnutls-devel \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
         json-c-devel \
-        kmod \
         libacl-devel \
         libattr-devel \
         libblkid-devel \
@@ -59,17 +54,13 @@ function install_buildenv() {
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
         numactl-devel \
-        numad \
         parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         python3 \
         python3-docutils \
         python3-flake8 \

ci/buildenv/debian-11-cross-aarch64.sh

@@ -1,117 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            black \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libclang-dev \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pytest \
-            qemu-utils \
-            sed \
-            xsltproc
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
-    dpkg-reconfigure locales
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-    export DEBIAN_FRONTEND=noninteractive
-    dpkg --add-architecture arm64
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y dpkg-dev
-    apt-get install --no-install-recommends -y \
-            gcc-aarch64-linux-gnu \
-            libacl1-dev:arm64 \
-            libapparmor-dev:arm64 \
-            libattr1-dev:arm64 \
-            libaudit-dev:arm64 \
-            libblkid-dev:arm64 \
-            libc6-dev:arm64 \
-            libcap-ng-dev:arm64 \
-            libcurl4-gnutls-dev:arm64 \
-            libdevmapper-dev:arm64 \
-            libfuse-dev:arm64 \
-            libglib2.0-dev:arm64 \
-            libglusterfs-dev:arm64 \
-            libgnutls28-dev:arm64 \
-            libiscsi-dev:arm64 \
-            libjson-c-dev:arm64 \
-            libnl-3-dev:arm64 \
-            libnl-route-3-dev:arm64 \
-            libnuma-dev:arm64 \
-            libparted-dev:arm64 \
-            libpcap0.8-dev:arm64 \
-            libpciaccess-dev:arm64 \
-            librbd-dev:arm64 \
-            libreadline-dev:arm64 \
-            libsanlock-dev:arm64 \
-            libsasl2-dev:arm64 \
-            libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
-            libssh2-1-dev:arm64 \
-            libtirpc-dev:arm64 \
-            libudev-dev:arm64 \
-            libxen-dev:arm64 \
-            libxml2-dev:arm64 \
-            systemtap-sdt-dev:arm64
-    mkdir -p /usr/local/share/meson/cross
-    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\
-pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'aarch64'\n\
-cpu = 'aarch64'\n\
-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
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-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"
-
-export ABI="aarch64-linux-gnu"
-export MESON_OPTS="--cross-file=aarch64-linux-gnu"

ci/buildenv/debian-11-cross-armv6l.sh

@@ -1,116 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            black \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libclang-dev \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pytest \
-            qemu-utils \
-            sed \
-            xsltproc
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
-    dpkg-reconfigure locales
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-    export DEBIAN_FRONTEND=noninteractive
-    dpkg --add-architecture armel
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y dpkg-dev
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabi \
-            libacl1-dev:armel \
-            libapparmor-dev:armel \
-            libattr1-dev:armel \
-            libaudit-dev:armel \
-            libblkid-dev:armel \
-            libc6-dev:armel \
-            libcap-ng-dev:armel \
-            libcurl4-gnutls-dev:armel \
-            libdevmapper-dev:armel \
-            libfuse-dev:armel \
-            libglib2.0-dev:armel \
-            libglusterfs-dev:armel \
-            libgnutls28-dev:armel \
-            libiscsi-dev:armel \
-            libjson-c-dev:armel \
-            libnl-3-dev:armel \
-            libnl-route-3-dev:armel \
-            libnuma-dev:armel \
-            libparted-dev:armel \
-            libpcap0.8-dev:armel \
-            libpciaccess-dev:armel \
-            librbd-dev:armel \
-            libreadline-dev:armel \
-            libsanlock-dev:armel \
-            libsasl2-dev:armel \
-            libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
-            libssh2-1-dev:armel \
-            libtirpc-dev:armel \
-            libudev-dev:armel \
-            libxml2-dev:armel \
-            systemtap-sdt-dev:armel
-    mkdir -p /usr/local/share/meson/cross
-    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\
-pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'arm'\n\
-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
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-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"
-
-export ABI="arm-linux-gnueabi"
-export MESON_OPTS="--cross-file=arm-linux-gnueabi"

ci/buildenv/debian-11-cross-armv7l.sh

@@ -1,117 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            black \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libclang-dev \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pytest \
-            qemu-utils \
-            sed \
-            xsltproc
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
-    dpkg-reconfigure locales
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-    export DEBIAN_FRONTEND=noninteractive
-    dpkg --add-architecture armhf
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y dpkg-dev
-    apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabihf \
-            libacl1-dev:armhf \
-            libapparmor-dev:armhf \
-            libattr1-dev:armhf \
-            libaudit-dev:armhf \
-            libblkid-dev:armhf \
-            libc6-dev:armhf \
-            libcap-ng-dev:armhf \
-            libcurl4-gnutls-dev:armhf \
-            libdevmapper-dev:armhf \
-            libfuse-dev:armhf \
-            libglib2.0-dev:armhf \
-            libglusterfs-dev:armhf \
-            libgnutls28-dev:armhf \
-            libiscsi-dev:armhf \
-            libjson-c-dev:armhf \
-            libnl-3-dev:armhf \
-            libnl-route-3-dev:armhf \
-            libnuma-dev:armhf \
-            libparted-dev:armhf \
-            libpcap0.8-dev:armhf \
-            libpciaccess-dev:armhf \
-            librbd-dev:armhf \
-            libreadline-dev:armhf \
-            libsanlock-dev:armhf \
-            libsasl2-dev:armhf \
-            libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
-            libssh2-1-dev:armhf \
-            libtirpc-dev:armhf \
-            libudev-dev:armhf \
-            libxen-dev:armhf \
-            libxml2-dev:armhf \
-            systemtap-sdt-dev:armhf
-    mkdir -p /usr/local/share/meson/cross
-    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\
-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'armhf'\n\
-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
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-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"
-
-export ABI="arm-linux-gnueabihf"
-export MESON_OPTS="--cross-file=arm-linux-gnueabihf"

ci/buildenv/debian-11-cross-i686.sh

@@ -1,116 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            black \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libclang-dev \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pytest \
-            qemu-utils \
-            sed \
-            xsltproc
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
-    dpkg-reconfigure locales
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-    export DEBIAN_FRONTEND=noninteractive
-    dpkg --add-architecture i386
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y dpkg-dev
-    apt-get install --no-install-recommends -y \
-            gcc-i686-linux-gnu \
-            libacl1-dev:i386 \
-            libapparmor-dev:i386 \
-            libattr1-dev:i386 \
-            libaudit-dev:i386 \
-            libblkid-dev:i386 \
-            libc6-dev:i386 \
-            libcap-ng-dev:i386 \
-            libcurl4-gnutls-dev:i386 \
-            libdevmapper-dev:i386 \
-            libfuse-dev:i386 \
-            libglib2.0-dev:i386 \
-            libglusterfs-dev:i386 \
-            libgnutls28-dev:i386 \
-            libiscsi-dev:i386 \
-            libjson-c-dev:i386 \
-            libnl-3-dev:i386 \
-            libnl-route-3-dev:i386 \
-            libnuma-dev:i386 \
-            libparted-dev:i386 \
-            libpcap0.8-dev:i386 \
-            libpciaccess-dev:i386 \
-            librbd-dev:i386 \
-            libreadline-dev:i386 \
-            libsanlock-dev:i386 \
-            libsasl2-dev:i386 \
-            libselinux1-dev:i386 \
-            libssh-gcrypt-dev:i386 \
-            libssh2-1-dev:i386 \
-            libtirpc-dev:i386 \
-            libudev-dev:i386 \
-            libxml2-dev:i386 \
-            systemtap-sdt-dev:i386
-    mkdir -p /usr/local/share/meson/cross
-    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\
-pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'x86'\n\
-cpu = 'i686'\n\
-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
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-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"
-
-export ABI="i686-linux-gnu"
-export MESON_OPTS="--cross-file=i686-linux-gnu"

ci/buildenv/debian-11-cross-mips64el.sh

@@ -1,116 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            black \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libclang-dev \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pytest \
-            qemu-utils \
-            sed \
-            xsltproc
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
-    dpkg-reconfigure locales
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-    export DEBIAN_FRONTEND=noninteractive
-    dpkg --add-architecture mips64el
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y dpkg-dev
-    apt-get install --no-install-recommends -y \
-            gcc-mips64el-linux-gnuabi64 \
-            libacl1-dev:mips64el \
-            libapparmor-dev:mips64el \
-            libattr1-dev:mips64el \
-            libaudit-dev:mips64el \
-            libblkid-dev:mips64el \
-            libc6-dev:mips64el \
-            libcap-ng-dev:mips64el \
-            libcurl4-gnutls-dev:mips64el \
-            libdevmapper-dev:mips64el \
-            libfuse-dev:mips64el \
-            libglib2.0-dev:mips64el \
-            libglusterfs-dev:mips64el \
-            libgnutls28-dev:mips64el \
-            libiscsi-dev:mips64el \
-            libjson-c-dev:mips64el \
-            libnl-3-dev:mips64el \
-            libnl-route-3-dev:mips64el \
-            libnuma-dev:mips64el \
-            libparted-dev:mips64el \
-            libpcap0.8-dev:mips64el \
-            libpciaccess-dev:mips64el \
-            librbd-dev:mips64el \
-            libreadline-dev:mips64el \
-            libsanlock-dev:mips64el \
-            libsasl2-dev:mips64el \
-            libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
-            libssh2-1-dev:mips64el \
-            libtirpc-dev:mips64el \
-            libudev-dev:mips64el \
-            libxml2-dev:mips64el \
-            systemtap-sdt-dev:mips64el
-    mkdir -p /usr/local/share/meson/cross
-    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\
-pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips64'\n\
-cpu = 'mips64el'\n\
-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
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-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"
-
-export ABI="mips64el-linux-gnuabi64"
-export MESON_OPTS="--cross-file=mips64el-linux-gnuabi64"

ci/buildenv/debian-11-cross-mipsel.sh

@@ -1,116 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            black \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libclang-dev \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pytest \
-            qemu-utils \
-            sed \
-            xsltproc
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
-    dpkg-reconfigure locales
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-    export DEBIAN_FRONTEND=noninteractive
-    dpkg --add-architecture mipsel
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y dpkg-dev
-    apt-get install --no-install-recommends -y \
-            gcc-mipsel-linux-gnu \
-            libacl1-dev:mipsel \
-            libapparmor-dev:mipsel \
-            libattr1-dev:mipsel \
-            libaudit-dev:mipsel \
-            libblkid-dev:mipsel \
-            libc6-dev:mipsel \
-            libcap-ng-dev:mipsel \
-            libcurl4-gnutls-dev:mipsel \
-            libdevmapper-dev:mipsel \
-            libfuse-dev:mipsel \
-            libglib2.0-dev:mipsel \
-            libglusterfs-dev:mipsel \
-            libgnutls28-dev:mipsel \
-            libiscsi-dev:mipsel \
-            libjson-c-dev:mipsel \
-            libnl-3-dev:mipsel \
-            libnl-route-3-dev:mipsel \
-            libnuma-dev:mipsel \
-            libparted-dev:mipsel \
-            libpcap0.8-dev:mipsel \
-            libpciaccess-dev:mipsel \
-            librbd-dev:mipsel \
-            libreadline-dev:mipsel \
-            libsanlock-dev:mipsel \
-            libsasl2-dev:mipsel \
-            libselinux1-dev:mipsel \
-            libssh-gcrypt-dev:mipsel \
-            libssh2-1-dev:mipsel \
-            libtirpc-dev:mipsel \
-            libudev-dev:mipsel \
-            libxml2-dev:mipsel \
-            systemtap-sdt-dev:mipsel
-    mkdir -p /usr/local/share/meson/cross
-    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\
-pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips'\n\
-cpu = 'mipsel'\n\
-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
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-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"
-
-export ABI="mipsel-linux-gnu"
-export MESON_OPTS="--cross-file=mipsel-linux-gnu"

ci/buildenv/debian-11-cross-ppc64le.sh

@@ -1,116 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            black \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libclang-dev \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pytest \
-            qemu-utils \
-            sed \
-            xsltproc
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
-    dpkg-reconfigure locales
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-    export DEBIAN_FRONTEND=noninteractive
-    dpkg --add-architecture ppc64el
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y dpkg-dev
-    apt-get install --no-install-recommends -y \
-            gcc-powerpc64le-linux-gnu \
-            libacl1-dev:ppc64el \
-            libapparmor-dev:ppc64el \
-            libattr1-dev:ppc64el \
-            libaudit-dev:ppc64el \
-            libblkid-dev:ppc64el \
-            libc6-dev:ppc64el \
-            libcap-ng-dev:ppc64el \
-            libcurl4-gnutls-dev:ppc64el \
-            libdevmapper-dev:ppc64el \
-            libfuse-dev:ppc64el \
-            libglib2.0-dev:ppc64el \
-            libglusterfs-dev:ppc64el \
-            libgnutls28-dev:ppc64el \
-            libiscsi-dev:ppc64el \
-            libjson-c-dev:ppc64el \
-            libnl-3-dev:ppc64el \
-            libnl-route-3-dev:ppc64el \
-            libnuma-dev:ppc64el \
-            libparted-dev:ppc64el \
-            libpcap0.8-dev:ppc64el \
-            libpciaccess-dev:ppc64el \
-            librbd-dev:ppc64el \
-            libreadline-dev:ppc64el \
-            libsanlock-dev:ppc64el \
-            libsasl2-dev:ppc64el \
-            libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
-            libssh2-1-dev:ppc64el \
-            libtirpc-dev:ppc64el \
-            libudev-dev:ppc64el \
-            libxml2-dev:ppc64el \
-            systemtap-sdt-dev:ppc64el
-    mkdir -p /usr/local/share/meson/cross
-    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\
-pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'ppc64'\n\
-cpu = 'powerpc64le'\n\
-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
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-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"
-
-export ABI="powerpc64le-linux-gnu"
-export MESON_OPTS="--cross-file=powerpc64le-linux-gnu"

ci/buildenv/debian-11-cross-s390x.sh

@@ -1,116 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            black \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libclang-dev \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pytest \
-            qemu-utils \
-            sed \
-            xsltproc
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
-    dpkg-reconfigure locales
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-    export DEBIAN_FRONTEND=noninteractive
-    dpkg --add-architecture s390x
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y dpkg-dev
-    apt-get install --no-install-recommends -y \
-            gcc-s390x-linux-gnu \
-            libacl1-dev:s390x \
-            libapparmor-dev:s390x \
-            libattr1-dev:s390x \
-            libaudit-dev:s390x \
-            libblkid-dev:s390x \
-            libc6-dev:s390x \
-            libcap-ng-dev:s390x \
-            libcurl4-gnutls-dev:s390x \
-            libdevmapper-dev:s390x \
-            libfuse-dev:s390x \
-            libglib2.0-dev:s390x \
-            libglusterfs-dev:s390x \
-            libgnutls28-dev:s390x \
-            libiscsi-dev:s390x \
-            libjson-c-dev:s390x \
-            libnl-3-dev:s390x \
-            libnl-route-3-dev:s390x \
-            libnuma-dev:s390x \
-            libparted-dev:s390x \
-            libpcap0.8-dev:s390x \
-            libpciaccess-dev:s390x \
-            librbd-dev:s390x \
-            libreadline-dev:s390x \
-            libsanlock-dev:s390x \
-            libsasl2-dev:s390x \
-            libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
-            libssh2-1-dev:s390x \
-            libtirpc-dev:s390x \
-            libudev-dev:s390x \
-            libxml2-dev:s390x \
-            systemtap-sdt-dev:s390x
-    mkdir -p /usr/local/share/meson/cross
-    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\
-pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 's390x'\n\
-cpu = 's390x'\n\
-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
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-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"
-
-export ABI="s390x-linux-gnu"
-export MESON_OPTS="--cross-file=s390x-linux-gnu"

ci/buildenv/debian-11.sh

@@ -1,100 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-function install_buildenv() {
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
-    apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            black \
-            ca-certificates \
-            ccache \
-            clang \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gcc \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libblkid-dev \
-            libc6-dev \
-            libcap-ng-dev \
-            libclang-dev \
-            libcurl4-gnutls-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libglib2.0-dev \
-            libglusterfs-dev \
-            libgnutls28-dev \
-            libiscsi-dev \
-            libjson-c-dev \
-            libnetcf-dev \
-            libnl-3-dev \
-            libnl-route-3-dev \
-            libnuma-dev \
-            libparted-dev \
-            libpcap0.8-dev \
-            libpciaccess-dev \
-            librbd-dev \
-            libreadline-dev \
-            libsanlock-dev \
-            libsasl2-dev \
-            libselinux1-dev \
-            libssh-gcrypt-dev \
-            libssh2-1-dev \
-            libtirpc-dev \
-            libudev-dev \
-            libxen-dev \
-            libxml2-dev \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pytest \
-            qemu-utils \
-            sed \
-            systemtap-sdt-dev \
-            wireshark-dev \
-            xsltproc
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
-    dpkg-reconfigure locales
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-    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/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"

ci/buildenv/debian-12-cross-aarch64.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:arm64 \
             libsasl2-dev:arm64 \
             libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
+            libssh-dev:arm64 \
             libssh2-1-dev:arm64 \
             libtirpc-dev:arm64 \
             libudev-dev:arm64 \

ci/buildenv/debian-12-cross-armv6l.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:armel \
             libsasl2-dev:armel \
             libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
+            libssh-dev:armel \
             libssh2-1-dev:armel \
             libtirpc-dev:armel \
             libudev-dev:armel \

ci/buildenv/debian-12-cross-armv7l.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:armhf \
             libsasl2-dev:armhf \
             libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
+            libssh-dev:armhf \
             libssh2-1-dev:armhf \
             libtirpc-dev:armhf \
             libudev-dev:armhf \

ci/buildenv/debian-12-cross-i686.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:i386 \
             libsasl2-dev:i386 \
             libselinux1-dev:i386 \
-            libssh-gcrypt-dev:i386 \
+            libssh-dev:i386 \
             libssh2-1-dev:i386 \
             libtirpc-dev:i386 \
             libudev-dev:i386 \

ci/buildenv/debian-12-cross-mips64el.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:mips64el \
             libsasl2-dev:mips64el \
             libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
+            libssh-dev:mips64el \
             libssh2-1-dev:mips64el \
             libtirpc-dev:mips64el \
             libudev-dev:mips64el \

ci/buildenv/debian-12-cross-mipsel.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:mipsel \
             libsasl2-dev:mipsel \
             libselinux1-dev:mipsel \
-            libssh-gcrypt-dev:mipsel \
+            libssh-dev:mipsel \
             libssh2-1-dev:mipsel \
             libtirpc-dev:mipsel \
             libudev-dev:mipsel \

ci/buildenv/debian-12-cross-ppc64le.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:ppc64el \
             libsasl2-dev:ppc64el \
             libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
+            libssh-dev:ppc64el \
             libssh2-1-dev:ppc64el \
             libtirpc-dev:ppc64el \
             libudev-dev:ppc64el \

ci/buildenv/debian-12-cross-s390x.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:s390x \
             libsasl2-dev:s390x \
             libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
+            libssh-dev:s390x \
             libssh2-1-dev:s390x \
             libtirpc-dev:s390x \
             libudev-dev:s390x \

ci/buildenv/debian-12.sh

@@ -26,9 +26,6 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libacl1-dev \
             libapparmor-dev \
             libattr1-dev \
@@ -57,7 +54,7 @@ function install_buildenv() {
             libsanlock-dev \
             libsasl2-dev \
             libselinux1-dev \
-            libssh-gcrypt-dev \
+            libssh-dev \
             libssh2-1-dev \
             libtirpc-dev \
             libudev-dev \
@@ -65,16 +62,11 @@ function install_buildenv() {
             libxml2-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \

ci/buildenv/debian-sid-cross-aarch64.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:arm64 \
             libsasl2-dev:arm64 \
             libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
+            libssh-dev:arm64 \
             libssh2-1-dev:arm64 \
             libtirpc-dev:arm64 \
             libudev-dev:arm64 \

ci/buildenv/debian-sid-cross-armv6l.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -77,12 +69,11 @@ function install_buildenv() {
             libparted-dev:armel \
             libpcap0.8-dev:armel \
             libpciaccess-dev:armel \
-            librbd-dev:armel \
             libreadline-dev:armel \
             libsanlock-dev:armel \
             libsasl2-dev:armel \
             libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
+            libssh-dev:armel \
             libssh2-1-dev:armel \
             libtirpc-dev:armel \
             libudev-dev:armel \

ci/buildenv/debian-sid-cross-armv7l.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -77,16 +69,14 @@ function install_buildenv() {
             libparted-dev:armhf \
             libpcap0.8-dev:armhf \
             libpciaccess-dev:armhf \
-            librbd-dev:armhf \
             libreadline-dev:armhf \
             libsanlock-dev:armhf \
             libsasl2-dev:armhf \
             libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
+            libssh-dev:armhf \
             libssh2-1-dev:armhf \
             libtirpc-dev:armhf \
             libudev-dev:armhf \
-            libxen-dev:armhf \
             libxml2-dev:armhf \
             systemtap-sdt-dev:armhf
     mkdir -p /usr/local/share/meson/cross

ci/buildenv/debian-sid-cross-i686.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -77,12 +69,11 @@ function install_buildenv() {
             libparted-dev:i386 \
             libpcap0.8-dev:i386 \
             libpciaccess-dev:i386 \
-            librbd-dev:i386 \
             libreadline-dev:i386 \
             libsanlock-dev:i386 \
             libsasl2-dev:i386 \
             libselinux1-dev:i386 \
-            libssh-gcrypt-dev:i386 \
+            libssh-dev:i386 \
             libssh2-1-dev:i386 \
             libtirpc-dev:i386 \
             libudev-dev:i386 \

ci/buildenv/debian-sid-cross-mips64el.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:mips64el \
             libsasl2-dev:mips64el \
             libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
+            libssh-dev:mips64el \
             libssh2-1-dev:mips64el \
             libtirpc-dev:mips64el \
             libudev-dev:mips64el \

ci/buildenv/debian-sid-cross-ppc64le.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:ppc64el \
             libsasl2-dev:ppc64el \
             libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
+            libssh-dev:ppc64el \
             libssh2-1-dev:ppc64el \
             libtirpc-dev:ppc64el \
             libudev-dev:ppc64el \

ci/buildenv/debian-sid-cross-s390x.sh

@@ -24,23 +24,15 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libclang-rt-dev \
             libnbd-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \
@@ -83,7 +75,7 @@ function install_buildenv() {
             libsanlock-dev:s390x \
             libsasl2-dev:s390x \
             libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
+            libssh-dev:s390x \
             libssh2-1-dev:s390x \
             libtirpc-dev:s390x \
             libudev-dev:s390x \

ci/buildenv/debian-sid.sh

@@ -26,9 +26,6 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libacl1-dev \
             libapparmor-dev \
             libattr1-dev \
@@ -57,7 +54,7 @@ function install_buildenv() {
             libsanlock-dev \
             libsasl2-dev \
             libselinux1-dev \
-            libssh-gcrypt-dev \
+            libssh-dev \
             libssh2-1-dev \
             libtirpc-dev \
             libudev-dev \
@@ -65,16 +62,11 @@ function install_buildenv() {
             libxml2-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \

ci/buildenv/fedora-41.sh

@@ -9,7 +9,7 @@ function install_buildenv() {
     dnf install -y \
         audit-libs-devel \
         augeas \
-        bash-completion \
+        bash-completion-devel \
         ca-certificates \
         ccache \
         clang \
@@ -33,12 +33,7 @@ function install_buildenv() {
         glusterfs-api-devel \
         gnutls-devel \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
         json-c-devel \
-        kmod \
         libacl-devel \
         libattr-devel \
         libblkid-devel \
@@ -58,17 +53,13 @@ function install_buildenv() {
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
         numactl-devel \
-        numad \
         parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         python3 \
         python3-black \
         python3-docutils \
@@ -82,6 +73,7 @@ function install_buildenv() {
         systemd-devel \
         systemd-rpm-macros \
         systemtap-sdt-devel \
+        systemtap-sdt-dtrace \
         wireshark-devel \
         xen-devel
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED

ci/buildenv/fedora-42-cross-mingw32.sh

@@ -8,7 +8,7 @@ function install_buildenv() {
     dnf update -y
     dnf install -y \
         augeas \
-        bash-completion \
+        bash-completion-devel \
         ca-certificates \
         ccache \
         codespell \
@@ -23,22 +23,13 @@ function install_buildenv() {
         git \
         glibc-langpack-en \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
         libnbd-devel \
         libxml2 \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
-        numad \
         perl-base \
-        polkit \
         python3 \
         python3-black \
         python3-docutils \

ci/buildenv/fedora-42-cross-mingw64.sh

@@ -8,7 +8,7 @@ function install_buildenv() {
     dnf update -y
     dnf install -y \
         augeas \
-        bash-completion \
+        bash-completion-devel \
         ca-certificates \
         ccache \
         codespell \
@@ -23,22 +23,13 @@ function install_buildenv() {
         git \
         glibc-langpack-en \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
         libnbd-devel \
         libxml2 \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
-        numad \
         perl-base \
-        polkit \
         python3 \
         python3-black \
         python3-docutils \

ci/buildenv/fedora-42.sh

@@ -9,7 +9,7 @@ function install_buildenv() {
     dnf install -y \
         audit-libs-devel \
         augeas \
-        bash-completion \
+        bash-completion-devel \
         ca-certificates \
         ccache \
         clang \
@@ -33,12 +33,7 @@ function install_buildenv() {
         glusterfs-api-devel \
         gnutls-devel \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
         json-c-devel \
-        kmod \
         libacl-devel \
         libattr-devel \
         libblkid-devel \
@@ -58,17 +53,13 @@ function install_buildenv() {
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
         numactl-devel \
-        numad \
         parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         python3 \
         python3-black \
         python3-docutils \
@@ -82,6 +73,7 @@ function install_buildenv() {
         systemd-devel \
         systemd-rpm-macros \
         systemtap-sdt-devel \
+        systemtap-sdt-dtrace \
         wireshark-devel \
         xen-devel
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED

ci/buildenv/fedora-rawhide-cross-mingw32.sh

@@ -24,22 +24,13 @@ function install_buildenv() {
         git \
         glibc-langpack-en \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
         libnbd-devel \
         libxml2 \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
-        numad \
         perl-base \
-        polkit \
         python3 \
         python3-black \
         python3-docutils \

ci/buildenv/fedora-rawhide-cross-mingw64.sh

@@ -24,22 +24,13 @@ function install_buildenv() {
         git \
         glibc-langpack-en \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
         libnbd-devel \
         libxml2 \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
-        numad \
         perl-base \
-        polkit \
         python3 \
         python3-black \
         python3-docutils \

ci/buildenv/fedora-rawhide.sh

@@ -34,12 +34,7 @@ function install_buildenv() {
         glusterfs-api-devel \
         gnutls-devel \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
         json-c-devel \
-        kmod \
         libacl-devel \
         libattr-devel \
         libblkid-devel \
@@ -59,17 +54,13 @@ function install_buildenv() {
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
         numactl-devel \
-        numad \
         parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         python3 \
         python3-black \
         python3-docutils \

ci/buildenv/opensuse-leap-15.sh

@@ -33,9 +33,6 @@ function install_buildenv() {
            glibc-locale \
            glusterfs-devel \
            grep \
-           iproute2 \
-           iptables \
-           kmod \
            libacl-devel \
            libapparmor-devel \
            libattr-devel \
@@ -60,17 +57,12 @@ function install_buildenv() {
            libxml2 \
            libxml2-devel \
            libxslt \
-           lvm2 \
            make \
            meson \
-           nfs-utils \
            ninja \
-           numad \
-           open-iscsi \
            parted-devel \
            perl-base \
            pkgconfig \
-           polkit \
            python3-base \
            python3-docutils \
            python3-flake8 \

ci/buildenv/opensuse-tumbleweed.sh

@@ -32,9 +32,6 @@ function install_buildenv() {
            glibc-locale \
            glusterfs-devel \
            grep \
-           iproute2 \
-           iptables \
-           kmod \
            libacl-devel \
            libapparmor-devel \
            libattr-devel \
@@ -59,17 +56,12 @@ function install_buildenv() {
            libxml2 \
            libxml2-devel \
            libxslt \
-           lvm2 \
            make \
            meson \
-           nfs-utils \
            ninja \
-           numad \
-           open-iscsi \
            parted-devel \
            perl-base \
            pkgconfig \
-           polkit \
            python3-base \
            python3-black \
            python3-docutils \

ci/buildenv/ubuntu-2204.sh

@@ -26,9 +26,6 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libacl1-dev \
             libapparmor-dev \
             libattr1-dev \
@@ -66,16 +63,11 @@ function install_buildenv() {
             libxml2-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \

ci/buildenv/ubuntu-2404.sh

@@ -26,9 +26,6 @@ function install_buildenv() {
             gettext \
             git \
             grep \
-            iproute2 \
-            iptables \
-            kmod \
             libacl1-dev \
             libapparmor-dev \
             libattr1-dev \
@@ -66,16 +63,11 @@ function install_buildenv() {
             libxml2-dev \
             libxml2-utils \
             locales \
-            lvm2 \
             make \
             meson \
-            nfs-common \
             ninja-build \
-            numad \
-            open-iscsi \
             perl-base \
             pkgconf \
-            polkitd \
             python3 \
             python3-docutils \
             python3-pytest \

ci/cirrus/freebsd-13.vars

@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline'
+PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'

ci/cirrus/freebsd-14.vars

@@ -10,7 +10,7 @@ CROSS_PKGS=''
 MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
-PIP3='/usr/local/bin/pip-3.8'
+PIP3='/usr/local/bin/pip'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline'
+PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'

ci/containers/almalinux-9.Dockerfile

@@ -34,12 +34,7 @@ RUN dnf update -y && \
         glibc-langpack-en \
         gnutls-devel \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
         json-c-devel \
-        kmod \
         libacl-devel \
         libattr-devel \
         libblkid-devel \
@@ -59,17 +54,13 @@ RUN dnf update -y && \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
         numactl-devel \
-        numad \
         parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         python3 \
         python3-docutils \
         python3-flake8 \

ci/containers/alpine-322.Dockerfile

@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM docker.io/library/alpine:3.19
+FROM docker.io/library/alpine:3.22
 
 RUN apk update && \
     apk upgrade && \
@@ -30,10 +30,8 @@ RUN apk update && \
         glib-dev \
         gnutls-dev \
         grep \
-        iproute2 \
         iptables \
         json-c-dev \
-        kmod \
         libcap-ng-dev \
         libnl3-dev \
         libpcap-dev \
@@ -45,19 +43,15 @@ RUN apk update && \
         libxml2-dev \
         libxml2-utils \
         libxslt \
-        lvm2 \
         lvm2-dev \
         make \
         meson \
         musl-dev \
         netcf-dev \
-        nfs-utils \
         numactl-dev \
-        open-iscsi \
         parted-dev \
         perl \
         pkgconf \
-        polkit \
         py3-docutils \
         py3-flake8 \
         py3-pytest \

ci/containers/alpine-edge.Dockerfile

@@ -30,10 +30,8 @@ RUN apk update && \
         glib-dev \
         gnutls-dev \
         grep \
-        iproute2 \
         iptables \
         json-c-dev \
-        kmod \
         libcap-ng-dev \
         libnl3-dev \
         libpcap-dev \
@@ -45,19 +43,15 @@ RUN apk update && \
         libxml2-dev \
         libxml2-utils \
         libxslt \
-        lvm2 \
         lvm2-dev \
         make \
         meson \
         musl-dev \
         netcf-dev \
-        nfs-utils \
         numactl-dev \
-        open-iscsi \
         parted-dev \
         perl \
         pkgconf \
-        polkit \
         py3-docutils \
         py3-flake8 \
         py3-pytest \

ci/containers/centos-stream-9.Dockerfile

@@ -35,12 +35,7 @@ RUN dnf distro-sync -y && \
         glibc-langpack-en \
         gnutls-devel \
         grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
         json-c-devel \
-        kmod \
         libacl-devel \
         libattr-devel \
         libblkid-devel \
@@ -60,17 +55,13 @@ RUN dnf distro-sync -y && \
         libxml2 \
         libxml2-devel \
         libxslt \
-        lvm2 \
         make \
         meson \
-        nfs-utils \
         ninja-build \
         numactl-devel \
-        numad \
         parted-devel \
         perl-base \
         pkgconfig \
-        polkit \
         python3 \
         python3-docutils \
         python3-flake8 \

ci/containers/debian-11-cross-aarch64.Dockerfile

@@ -1,123 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      augeas-lenses \
-                      augeas-tools \
-                      bash-completion \
-                      black \
-                      ca-certificates \
-                      ccache \
-                      codespell \
-                      cpp \
-                      diffutils \
-                      dwarves \
-                      ebtables \
-                      flake8 \
-                      gettext \
-                      git \
-                      grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
-                      libclang-dev \
-                      libxml2-utils \
-                      locales \
-                      lvm2 \
-                      make \
-                      meson \
-                      nfs-common \
-                      ninja-build \
-                      numad \
-                      open-iscsi \
-                      perl-base \
-                      pkgconf \
-                      policykit-1 \
-                      python3 \
-                      python3-docutils \
-                      python3-pytest \
-                      qemu-utils \
-                      sed \
-                      xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-
-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"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture arm64 && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      gcc-aarch64-linux-gnu \
-                      libacl1-dev:arm64 \
-                      libapparmor-dev:arm64 \
-                      libattr1-dev:arm64 \
-                      libaudit-dev:arm64 \
-                      libblkid-dev:arm64 \
-                      libc6-dev:arm64 \
-                      libcap-ng-dev:arm64 \
-                      libcurl4-gnutls-dev:arm64 \
-                      libdevmapper-dev:arm64 \
-                      libfuse-dev:arm64 \
-                      libglib2.0-dev:arm64 \
-                      libglusterfs-dev:arm64 \
-                      libgnutls28-dev:arm64 \
-                      libiscsi-dev:arm64 \
-                      libjson-c-dev:arm64 \
-                      libnl-3-dev:arm64 \
-                      libnl-route-3-dev:arm64 \
-                      libnuma-dev:arm64 \
-                      libparted-dev:arm64 \
-                      libpcap0.8-dev:arm64 \
-                      libpciaccess-dev:arm64 \
-                      librbd-dev:arm64 \
-                      libreadline-dev:arm64 \
-                      libsanlock-dev:arm64 \
-                      libsasl2-dev:arm64 \
-                      libselinux1-dev:arm64 \
-                      libssh-gcrypt-dev:arm64 \
-                      libssh2-1-dev:arm64 \
-                      libtirpc-dev:arm64 \
-                      libudev-dev:arm64 \
-                      libxen-dev:arm64 \
-                      libxml2-dev:arm64 \
-                      systemtap-sdt-dev:arm64 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    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\
-pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'aarch64'\n\
-cpu = 'aarch64'\n\
-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 && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc
-
-ENV ABI "aarch64-linux-gnu"
-ENV MESON_OPTS "--cross-file=aarch64-linux-gnu"

ci/containers/debian-11-cross-armv6l.Dockerfile

@@ -1,122 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      augeas-lenses \
-                      augeas-tools \
-                      bash-completion \
-                      black \
-                      ca-certificates \
-                      ccache \
-                      codespell \
-                      cpp \
-                      diffutils \
-                      dwarves \
-                      ebtables \
-                      flake8 \
-                      gettext \
-                      git \
-                      grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
-                      libclang-dev \
-                      libxml2-utils \
-                      locales \
-                      lvm2 \
-                      make \
-                      meson \
-                      nfs-common \
-                      ninja-build \
-                      numad \
-                      open-iscsi \
-                      perl-base \
-                      pkgconf \
-                      policykit-1 \
-                      python3 \
-                      python3-docutils \
-                      python3-pytest \
-                      qemu-utils \
-                      sed \
-                      xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-
-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"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armel && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      gcc-arm-linux-gnueabi \
-                      libacl1-dev:armel \
-                      libapparmor-dev:armel \
-                      libattr1-dev:armel \
-                      libaudit-dev:armel \
-                      libblkid-dev:armel \
-                      libc6-dev:armel \
-                      libcap-ng-dev:armel \
-                      libcurl4-gnutls-dev:armel \
-                      libdevmapper-dev:armel \
-                      libfuse-dev:armel \
-                      libglib2.0-dev:armel \
-                      libglusterfs-dev:armel \
-                      libgnutls28-dev:armel \
-                      libiscsi-dev:armel \
-                      libjson-c-dev:armel \
-                      libnl-3-dev:armel \
-                      libnl-route-3-dev:armel \
-                      libnuma-dev:armel \
-                      libparted-dev:armel \
-                      libpcap0.8-dev:armel \
-                      libpciaccess-dev:armel \
-                      librbd-dev:armel \
-                      libreadline-dev:armel \
-                      libsanlock-dev:armel \
-                      libsasl2-dev:armel \
-                      libselinux1-dev:armel \
-                      libssh-gcrypt-dev:armel \
-                      libssh2-1-dev:armel \
-                      libtirpc-dev:armel \
-                      libudev-dev:armel \
-                      libxml2-dev:armel \
-                      systemtap-sdt-dev:armel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    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\
-pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'arm'\n\
-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 && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
-
-ENV ABI "arm-linux-gnueabi"
-ENV MESON_OPTS "--cross-file=arm-linux-gnueabi"

ci/containers/debian-11-cross-armv7l.Dockerfile

@@ -1,123 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      augeas-lenses \
-                      augeas-tools \
-                      bash-completion \
-                      black \
-                      ca-certificates \
-                      ccache \
-                      codespell \
-                      cpp \
-                      diffutils \
-                      dwarves \
-                      ebtables \
-                      flake8 \
-                      gettext \
-                      git \
-                      grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
-                      libclang-dev \
-                      libxml2-utils \
-                      locales \
-                      lvm2 \
-                      make \
-                      meson \
-                      nfs-common \
-                      ninja-build \
-                      numad \
-                      open-iscsi \
-                      perl-base \
-                      pkgconf \
-                      policykit-1 \
-                      python3 \
-                      python3-docutils \
-                      python3-pytest \
-                      qemu-utils \
-                      sed \
-                      xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-
-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"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armhf && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      gcc-arm-linux-gnueabihf \
-                      libacl1-dev:armhf \
-                      libapparmor-dev:armhf \
-                      libattr1-dev:armhf \
-                      libaudit-dev:armhf \
-                      libblkid-dev:armhf \
-                      libc6-dev:armhf \
-                      libcap-ng-dev:armhf \
-                      libcurl4-gnutls-dev:armhf \
-                      libdevmapper-dev:armhf \
-                      libfuse-dev:armhf \
-                      libglib2.0-dev:armhf \
-                      libglusterfs-dev:armhf \
-                      libgnutls28-dev:armhf \
-                      libiscsi-dev:armhf \
-                      libjson-c-dev:armhf \
-                      libnl-3-dev:armhf \
-                      libnl-route-3-dev:armhf \
-                      libnuma-dev:armhf \
-                      libparted-dev:armhf \
-                      libpcap0.8-dev:armhf \
-                      libpciaccess-dev:armhf \
-                      librbd-dev:armhf \
-                      libreadline-dev:armhf \
-                      libsanlock-dev:armhf \
-                      libsasl2-dev:armhf \
-                      libselinux1-dev:armhf \
-                      libssh-gcrypt-dev:armhf \
-                      libssh2-1-dev:armhf \
-                      libtirpc-dev:armhf \
-                      libudev-dev:armhf \
-                      libxen-dev:armhf \
-                      libxml2-dev:armhf \
-                      systemtap-sdt-dev:armhf && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    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\
-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'armhf'\n\
-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 && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc
-
-ENV ABI "arm-linux-gnueabihf"
-ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf"

ci/containers/debian-11-cross-i686.Dockerfile

@@ -1,122 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      augeas-lenses \
-                      augeas-tools \
-                      bash-completion \
-                      black \
-                      ca-certificates \
-                      ccache \
-                      codespell \
-                      cpp \
-                      diffutils \
-                      dwarves \
-                      ebtables \
-                      flake8 \
-                      gettext \
-                      git \
-                      grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
-                      libclang-dev \
-                      libxml2-utils \
-                      locales \
-                      lvm2 \
-                      make \
-                      meson \
-                      nfs-common \
-                      ninja-build \
-                      numad \
-                      open-iscsi \
-                      perl-base \
-                      pkgconf \
-                      policykit-1 \
-                      python3 \
-                      python3-docutils \
-                      python3-pytest \
-                      qemu-utils \
-                      sed \
-                      xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-
-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"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture i386 && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      gcc-i686-linux-gnu \
-                      libacl1-dev:i386 \
-                      libapparmor-dev:i386 \
-                      libattr1-dev:i386 \
-                      libaudit-dev:i386 \
-                      libblkid-dev:i386 \
-                      libc6-dev:i386 \
-                      libcap-ng-dev:i386 \
-                      libcurl4-gnutls-dev:i386 \
-                      libdevmapper-dev:i386 \
-                      libfuse-dev:i386 \
-                      libglib2.0-dev:i386 \
-                      libglusterfs-dev:i386 \
-                      libgnutls28-dev:i386 \
-                      libiscsi-dev:i386 \
-                      libjson-c-dev:i386 \
-                      libnl-3-dev:i386 \
-                      libnl-route-3-dev:i386 \
-                      libnuma-dev:i386 \
-                      libparted-dev:i386 \
-                      libpcap0.8-dev:i386 \
-                      libpciaccess-dev:i386 \
-                      librbd-dev:i386 \
-                      libreadline-dev:i386 \
-                      libsanlock-dev:i386 \
-                      libsasl2-dev:i386 \
-                      libselinux1-dev:i386 \
-                      libssh-gcrypt-dev:i386 \
-                      libssh2-1-dev:i386 \
-                      libtirpc-dev:i386 \
-                      libudev-dev:i386 \
-                      libxml2-dev:i386 \
-                      systemtap-sdt-dev:i386 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    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\
-pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'x86'\n\
-cpu = 'i686'\n\
-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 && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc
-
-ENV ABI "i686-linux-gnu"
-ENV MESON_OPTS "--cross-file=i686-linux-gnu"

ci/containers/debian-11-cross-mips64el.Dockerfile

@@ -1,122 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      augeas-lenses \
-                      augeas-tools \
-                      bash-completion \
-                      black \
-                      ca-certificates \
-                      ccache \
-                      codespell \
-                      cpp \
-                      diffutils \
-                      dwarves \
-                      ebtables \
-                      flake8 \
-                      gettext \
-                      git \
-                      grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
-                      libclang-dev \
-                      libxml2-utils \
-                      locales \
-                      lvm2 \
-                      make \
-                      meson \
-                      nfs-common \
-                      ninja-build \
-                      numad \
-                      open-iscsi \
-                      perl-base \
-                      pkgconf \
-                      policykit-1 \
-                      python3 \
-                      python3-docutils \
-                      python3-pytest \
-                      qemu-utils \
-                      sed \
-                      xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-
-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"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips64el && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      gcc-mips64el-linux-gnuabi64 \
-                      libacl1-dev:mips64el \
-                      libapparmor-dev:mips64el \
-                      libattr1-dev:mips64el \
-                      libaudit-dev:mips64el \
-                      libblkid-dev:mips64el \
-                      libc6-dev:mips64el \
-                      libcap-ng-dev:mips64el \
-                      libcurl4-gnutls-dev:mips64el \
-                      libdevmapper-dev:mips64el \
-                      libfuse-dev:mips64el \
-                      libglib2.0-dev:mips64el \
-                      libglusterfs-dev:mips64el \
-                      libgnutls28-dev:mips64el \
-                      libiscsi-dev:mips64el \
-                      libjson-c-dev:mips64el \
-                      libnl-3-dev:mips64el \
-                      libnl-route-3-dev:mips64el \
-                      libnuma-dev:mips64el \
-                      libparted-dev:mips64el \
-                      libpcap0.8-dev:mips64el \
-                      libpciaccess-dev:mips64el \
-                      librbd-dev:mips64el \
-                      libreadline-dev:mips64el \
-                      libsanlock-dev:mips64el \
-                      libsasl2-dev:mips64el \
-                      libselinux1-dev:mips64el \
-                      libssh-gcrypt-dev:mips64el \
-                      libssh2-1-dev:mips64el \
-                      libtirpc-dev:mips64el \
-                      libudev-dev:mips64el \
-                      libxml2-dev:mips64el \
-                      systemtap-sdt-dev:mips64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    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\
-pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips64'\n\
-cpu = 'mips64el'\n\
-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 && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64"

ci/containers/debian-11-cross-mipsel.Dockerfile

@@ -1,122 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      augeas-lenses \
-                      augeas-tools \
-                      bash-completion \
-                      black \
-                      ca-certificates \
-                      ccache \
-                      codespell \
-                      cpp \
-                      diffutils \
-                      dwarves \
-                      ebtables \
-                      flake8 \
-                      gettext \
-                      git \
-                      grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
-                      libclang-dev \
-                      libxml2-utils \
-                      locales \
-                      lvm2 \
-                      make \
-                      meson \
-                      nfs-common \
-                      ninja-build \
-                      numad \
-                      open-iscsi \
-                      perl-base \
-                      pkgconf \
-                      policykit-1 \
-                      python3 \
-                      python3-docutils \
-                      python3-pytest \
-                      qemu-utils \
-                      sed \
-                      xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-
-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"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mipsel && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      gcc-mipsel-linux-gnu \
-                      libacl1-dev:mipsel \
-                      libapparmor-dev:mipsel \
-                      libattr1-dev:mipsel \
-                      libaudit-dev:mipsel \
-                      libblkid-dev:mipsel \
-                      libc6-dev:mipsel \
-                      libcap-ng-dev:mipsel \
-                      libcurl4-gnutls-dev:mipsel \
-                      libdevmapper-dev:mipsel \
-                      libfuse-dev:mipsel \
-                      libglib2.0-dev:mipsel \
-                      libglusterfs-dev:mipsel \
-                      libgnutls28-dev:mipsel \
-                      libiscsi-dev:mipsel \
-                      libjson-c-dev:mipsel \
-                      libnl-3-dev:mipsel \
-                      libnl-route-3-dev:mipsel \
-                      libnuma-dev:mipsel \
-                      libparted-dev:mipsel \
-                      libpcap0.8-dev:mipsel \
-                      libpciaccess-dev:mipsel \
-                      librbd-dev:mipsel \
-                      libreadline-dev:mipsel \
-                      libsanlock-dev:mipsel \
-                      libsasl2-dev:mipsel \
-                      libselinux1-dev:mipsel \
-                      libssh-gcrypt-dev:mipsel \
-                      libssh2-1-dev:mipsel \
-                      libtirpc-dev:mipsel \
-                      libudev-dev:mipsel \
-                      libxml2-dev:mipsel \
-                      systemtap-sdt-dev:mipsel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    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\
-pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips'\n\
-cpu = 'mipsel'\n\
-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 && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc
-
-ENV ABI "mipsel-linux-gnu"
-ENV MESON_OPTS "--cross-file=mipsel-linux-gnu"

ci/containers/debian-11-cross-ppc64le.Dockerfile

@@ -1,122 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      augeas-lenses \
-                      augeas-tools \
-                      bash-completion \
-                      black \
-                      ca-certificates \
-                      ccache \
-                      codespell \
-                      cpp \
-                      diffutils \
-                      dwarves \
-                      ebtables \
-                      flake8 \
-                      gettext \
-                      git \
-                      grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
-                      libclang-dev \
-                      libxml2-utils \
-                      locales \
-                      lvm2 \
-                      make \
-                      meson \
-                      nfs-common \
-                      ninja-build \
-                      numad \
-                      open-iscsi \
-                      perl-base \
-                      pkgconf \
-                      policykit-1 \
-                      python3 \
-                      python3-docutils \
-                      python3-pytest \
-                      qemu-utils \
-                      sed \
-                      xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-
-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"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture ppc64el && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      gcc-powerpc64le-linux-gnu \
-                      libacl1-dev:ppc64el \
-                      libapparmor-dev:ppc64el \
-                      libattr1-dev:ppc64el \
-                      libaudit-dev:ppc64el \
-                      libblkid-dev:ppc64el \
-                      libc6-dev:ppc64el \
-                      libcap-ng-dev:ppc64el \
-                      libcurl4-gnutls-dev:ppc64el \
-                      libdevmapper-dev:ppc64el \
-                      libfuse-dev:ppc64el \
-                      libglib2.0-dev:ppc64el \
-                      libglusterfs-dev:ppc64el \
-                      libgnutls28-dev:ppc64el \
-                      libiscsi-dev:ppc64el \
-                      libjson-c-dev:ppc64el \
-                      libnl-3-dev:ppc64el \
-                      libnl-route-3-dev:ppc64el \
-                      libnuma-dev:ppc64el \
-                      libparted-dev:ppc64el \
-                      libpcap0.8-dev:ppc64el \
-                      libpciaccess-dev:ppc64el \
-                      librbd-dev:ppc64el \
-                      libreadline-dev:ppc64el \
-                      libsanlock-dev:ppc64el \
-                      libsasl2-dev:ppc64el \
-                      libselinux1-dev:ppc64el \
-                      libssh-gcrypt-dev:ppc64el \
-                      libssh2-1-dev:ppc64el \
-                      libtirpc-dev:ppc64el \
-                      libudev-dev:ppc64el \
-                      libxml2-dev:ppc64el \
-                      systemtap-sdt-dev:ppc64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    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\
-pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'ppc64'\n\
-cpu = 'powerpc64le'\n\
-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 && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu"

ci/containers/debian-11-cross-s390x.Dockerfile

@@ -1,122 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      augeas-lenses \
-                      augeas-tools \
-                      bash-completion \
-                      black \
-                      ca-certificates \
-                      ccache \
-                      codespell \
-                      cpp \
-                      diffutils \
-                      dwarves \
-                      ebtables \
-                      flake8 \
-                      gettext \
-                      git \
-                      grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
-                      libclang-dev \
-                      libxml2-utils \
-                      locales \
-                      lvm2 \
-                      make \
-                      meson \
-                      nfs-common \
-                      ninja-build \
-                      numad \
-                      open-iscsi \
-                      perl-base \
-                      pkgconf \
-                      policykit-1 \
-                      python3 \
-                      python3-docutils \
-                      python3-pytest \
-                      qemu-utils \
-                      sed \
-                      xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-
-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"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture s390x && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      gcc-s390x-linux-gnu \
-                      libacl1-dev:s390x \
-                      libapparmor-dev:s390x \
-                      libattr1-dev:s390x \
-                      libaudit-dev:s390x \
-                      libblkid-dev:s390x \
-                      libc6-dev:s390x \
-                      libcap-ng-dev:s390x \
-                      libcurl4-gnutls-dev:s390x \
-                      libdevmapper-dev:s390x \
-                      libfuse-dev:s390x \
-                      libglib2.0-dev:s390x \
-                      libglusterfs-dev:s390x \
-                      libgnutls28-dev:s390x \
-                      libiscsi-dev:s390x \
-                      libjson-c-dev:s390x \
-                      libnl-3-dev:s390x \
-                      libnl-route-3-dev:s390x \
-                      libnuma-dev:s390x \
-                      libparted-dev:s390x \
-                      libpcap0.8-dev:s390x \
-                      libpciaccess-dev:s390x \
-                      librbd-dev:s390x \
-                      libreadline-dev:s390x \
-                      libsanlock-dev:s390x \
-                      libsasl2-dev:s390x \
-                      libselinux1-dev:s390x \
-                      libssh-gcrypt-dev:s390x \
-                      libssh2-1-dev:s390x \
-                      libtirpc-dev:s390x \
-                      libudev-dev:s390x \
-                      libxml2-dev:s390x \
-                      systemtap-sdt-dev:s390x && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    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\
-pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 's390x'\n\
-cpu = 's390x'\n\
-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 && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc
-
-ENV ABI "s390x-linux-gnu"
-ENV MESON_OPTS "--cross-file=s390x-linux-gnu"

ci/containers/debian-11.Dockerfile

@@ -1,103 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-                      augeas-lenses \
-                      augeas-tools \
-                      bash-completion \
-                      black \
-                      ca-certificates \
-                      ccache \
-                      clang \
-                      codespell \
-                      cpp \
-                      diffutils \
-                      dwarves \
-                      ebtables \
-                      flake8 \
-                      gcc \
-                      gettext \
-                      git \
-                      grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
-                      libacl1-dev \
-                      libapparmor-dev \
-                      libattr1-dev \
-                      libaudit-dev \
-                      libblkid-dev \
-                      libc6-dev \
-                      libcap-ng-dev \
-                      libclang-dev \
-                      libcurl4-gnutls-dev \
-                      libdevmapper-dev \
-                      libfuse-dev \
-                      libglib2.0-dev \
-                      libglusterfs-dev \
-                      libgnutls28-dev \
-                      libiscsi-dev \
-                      libjson-c-dev \
-                      libnetcf-dev \
-                      libnl-3-dev \
-                      libnl-route-3-dev \
-                      libnuma-dev \
-                      libparted-dev \
-                      libpcap0.8-dev \
-                      libpciaccess-dev \
-                      librbd-dev \
-                      libreadline-dev \
-                      libsanlock-dev \
-                      libsasl2-dev \
-                      libselinux1-dev \
-                      libssh-gcrypt-dev \
-                      libssh2-1-dev \
-                      libtirpc-dev \
-                      libudev-dev \
-                      libxen-dev \
-                      libxml2-dev \
-                      libxml2-utils \
-                      locales \
-                      lvm2 \
-                      make \
-                      meson \
-                      nfs-common \
-                      ninja-build \
-                      numad \
-                      open-iscsi \
-                      perl-base \
-                      pkgconf \
-                      policykit-1 \
-                      python3 \
-                      python3-docutils \
-                      python3-pytest \
-                      qemu-utils \
-                      sed \
-                      systemtap-sdt-dev \
-                      wireshark-dev \
-                      xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
-    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/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"

ci/containers/debian-12-cross-aarch64.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:arm64 \
                       libsasl2-dev:arm64 \
                       libselinux1-dev:arm64 \
-                      libssh-gcrypt-dev:arm64 \
+                      libssh-dev:arm64 \
                       libssh2-1-dev:arm64 \
                       libtirpc-dev:arm64 \
                       libudev-dev:arm64 \

ci/containers/debian-12-cross-armv6l.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:armel \
                       libsasl2-dev:armel \
                       libselinux1-dev:armel \
-                      libssh-gcrypt-dev:armel \
+                      libssh-dev:armel \
                       libssh2-1-dev:armel \
                       libtirpc-dev:armel \
                       libudev-dev:armel \

ci/containers/debian-12-cross-armv7l.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:armhf \
                       libsasl2-dev:armhf \
                       libselinux1-dev:armhf \
-                      libssh-gcrypt-dev:armhf \
+                      libssh-dev:armhf \
                       libssh2-1-dev:armhf \
                       libtirpc-dev:armhf \
                       libudev-dev:armhf \

ci/containers/debian-12-cross-i686.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:i386 \
                       libsasl2-dev:i386 \
                       libselinux1-dev:i386 \
-                      libssh-gcrypt-dev:i386 \
+                      libssh-dev:i386 \
                       libssh2-1-dev:i386 \
                       libtirpc-dev:i386 \
                       libudev-dev:i386 \

ci/containers/debian-12-cross-mips64el.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:mips64el \
                       libsasl2-dev:mips64el \
                       libselinux1-dev:mips64el \
-                      libssh-gcrypt-dev:mips64el \
+                      libssh-dev:mips64el \
                       libssh2-1-dev:mips64el \
                       libtirpc-dev:mips64el \
                       libudev-dev:mips64el \

ci/containers/debian-12-cross-mipsel.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:mipsel \
                       libsasl2-dev:mipsel \
                       libselinux1-dev:mipsel \
-                      libssh-gcrypt-dev:mipsel \
+                      libssh-dev:mipsel \
                       libssh2-1-dev:mipsel \
                       libtirpc-dev:mipsel \
                       libudev-dev:mipsel \

ci/containers/debian-12-cross-ppc64le.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:ppc64el \
                       libsasl2-dev:ppc64el \
                       libselinux1-dev:ppc64el \
-                      libssh-gcrypt-dev:ppc64el \
+                      libssh-dev:ppc64el \
                       libssh2-1-dev:ppc64el \
                       libtirpc-dev:ppc64el \
                       libudev-dev:ppc64el \

ci/containers/debian-12-cross-s390x.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:s390x \
                       libsasl2-dev:s390x \
                       libselinux1-dev:s390x \
-                      libssh-gcrypt-dev:s390x \
+                      libssh-dev:s390x \
                       libssh2-1-dev:s390x \
                       libtirpc-dev:s390x \
                       libudev-dev:s390x \

ci/containers/debian-12.Dockerfile

@@ -28,9 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libacl1-dev \
                       libapparmor-dev \
                       libattr1-dev \
@@ -59,7 +56,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev \
                       libsasl2-dev \
                       libselinux1-dev \
-                      libssh-gcrypt-dev \
+                      libssh-dev \
                       libssh2-1-dev \
                       libtirpc-dev \
                       libudev-dev \
@@ -67,16 +64,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libxml2-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \

ci/containers/debian-sid-cross-aarch64.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:arm64 \
                       libsasl2-dev:arm64 \
                       libselinux1-dev:arm64 \
-                      libssh-gcrypt-dev:arm64 \
+                      libssh-dev:arm64 \
                       libssh2-1-dev:arm64 \
                       libtirpc-dev:arm64 \
                       libudev-dev:arm64 \

ci/containers/debian-sid-cross-armv6l.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -88,12 +80,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libparted-dev:armel \
                       libpcap0.8-dev:armel \
                       libpciaccess-dev:armel \
-                      librbd-dev:armel \
                       libreadline-dev:armel \
                       libsanlock-dev:armel \
                       libsasl2-dev:armel \
                       libselinux1-dev:armel \
-                      libssh-gcrypt-dev:armel \
+                      libssh-dev:armel \
                       libssh2-1-dev:armel \
                       libtirpc-dev:armel \
                       libudev-dev:armel \

ci/containers/debian-sid-cross-armv7l.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -88,16 +80,14 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libparted-dev:armhf \
                       libpcap0.8-dev:armhf \
                       libpciaccess-dev:armhf \
-                      librbd-dev:armhf \
                       libreadline-dev:armhf \
                       libsanlock-dev:armhf \
                       libsasl2-dev:armhf \
                       libselinux1-dev:armhf \
-                      libssh-gcrypt-dev:armhf \
+                      libssh-dev:armhf \
                       libssh2-1-dev:armhf \
                       libtirpc-dev:armhf \
                       libudev-dev:armhf \
-                      libxen-dev:armhf \
                       libxml2-dev:armhf \
                       systemtap-sdt-dev:armhf && \
     eatmydata apt-get autoremove -y && \

ci/containers/debian-sid-cross-i686.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -88,12 +80,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libparted-dev:i386 \
                       libpcap0.8-dev:i386 \
                       libpciaccess-dev:i386 \
-                      librbd-dev:i386 \
                       libreadline-dev:i386 \
                       libsanlock-dev:i386 \
                       libsasl2-dev:i386 \
                       libselinux1-dev:i386 \
-                      libssh-gcrypt-dev:i386 \
+                      libssh-dev:i386 \
                       libssh2-1-dev:i386 \
                       libtirpc-dev:i386 \
                       libudev-dev:i386 \

ci/containers/debian-sid-cross-mips64el.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:mips64el \
                       libsasl2-dev:mips64el \
                       libselinux1-dev:mips64el \
-                      libssh-gcrypt-dev:mips64el \
+                      libssh-dev:mips64el \
                       libssh2-1-dev:mips64el \
                       libtirpc-dev:mips64el \
                       libudev-dev:mips64el \

ci/containers/debian-sid-cross-ppc64le.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:ppc64el \
                       libsasl2-dev:ppc64el \
                       libselinux1-dev:ppc64el \
-                      libssh-gcrypt-dev:ppc64el \
+                      libssh-dev:ppc64el \
                       libssh2-1-dev:ppc64el \
                       libtirpc-dev:ppc64el \
                       libudev-dev:ppc64el \

ci/containers/debian-sid-cross-s390x.Dockerfile

@@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libclang-rt-dev \
                       libnbd-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \
@@ -94,7 +86,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev:s390x \
                       libsasl2-dev:s390x \
                       libselinux1-dev:s390x \
-                      libssh-gcrypt-dev:s390x \
+                      libssh-dev:s390x \
                       libssh2-1-dev:s390x \
                       libtirpc-dev:s390x \
                       libudev-dev:s390x \

ci/containers/debian-sid.Dockerfile

@@ -28,9 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libacl1-dev \
                       libapparmor-dev \
                       libattr1-dev \
@@ -59,7 +56,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libsanlock-dev \
                       libsasl2-dev \
                       libselinux1-dev \
-                      libssh-gcrypt-dev \
+                      libssh-dev \
                       libssh2-1-dev \
                       libtirpc-dev \
                       libudev-dev \
@@ -67,16 +64,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libxml2-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \

ci/containers/fedora-41.Dockerfile

@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:40
+FROM registry.fedoraproject.org/fedora:41
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
@@ -20,7 +20,7 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf install -y \
                audit-libs-devel \
                augeas \
-               bash-completion \
+               bash-completion-devel \
                ca-certificates \
                ccache \
                clang \
@@ -44,12 +44,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                glusterfs-api-devel \
                gnutls-devel \
                grep \
-               iproute \
-               iproute-tc \
-               iptables \
-               iscsi-initiator-utils \
                json-c-devel \
-               kmod \
                libacl-devel \
                libattr-devel \
                libblkid-devel \
@@ -69,17 +64,13 @@ exec "$@"\n' > /usr/bin/nosync && \
                libxml2 \
                libxml2-devel \
                libxslt \
-               lvm2 \
                make \
                meson \
-               nfs-utils \
                ninja-build \
                numactl-devel \
-               numad \
                parted-devel \
                perl-base \
                pkgconfig \
-               polkit \
                python3 \
                python3-black \
                python3-docutils \
@@ -93,6 +84,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                systemd-devel \
                systemd-rpm-macros \
                systemtap-sdt-devel \
+               systemtap-sdt-dtrace \
                wireshark-devel \
                xen-devel && \
     nosync dnf autoremove -y && \

ci/containers/fedora-42-cross-mingw32.Dockerfile

@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:40
+FROM registry.fedoraproject.org/fedora:42
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
@@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf update -y && \
     nosync dnf install -y \
                augeas \
-               bash-completion \
+               bash-completion-devel \
                ca-certificates \
                ccache \
                codespell \
@@ -34,22 +34,13 @@ exec "$@"\n' > /usr/bin/nosync && \
                git \
                glibc-langpack-en \
                grep \
-               iproute \
-               iproute-tc \
-               iptables \
-               iscsi-initiator-utils \
-               kmod \
                libnbd-devel \
                libxml2 \
                libxslt \
-               lvm2 \
                make \
                meson \
-               nfs-utils \
                ninja-build \
-               numad \
                perl-base \
-               polkit \
                python3 \
                python3-black \
                python3-docutils \

ci/containers/fedora-42-cross-mingw64.Dockerfile

@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:40
+FROM registry.fedoraproject.org/fedora:42
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
@@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf update -y && \
     nosync dnf install -y \
                augeas \
-               bash-completion \
+               bash-completion-devel \
                ca-certificates \
                ccache \
                codespell \
@@ -34,22 +34,13 @@ exec "$@"\n' > /usr/bin/nosync && \
                git \
                glibc-langpack-en \
                grep \
-               iproute \
-               iproute-tc \
-               iptables \
-               iscsi-initiator-utils \
-               kmod \
                libnbd-devel \
                libxml2 \
                libxslt \
-               lvm2 \
                make \
                meson \
-               nfs-utils \
                ninja-build \
-               numad \
                perl-base \
-               polkit \
                python3 \
                python3-black \
                python3-docutils \

ci/containers/fedora-42.Dockerfile

@@ -4,7 +4,7 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM registry.fedoraproject.org/fedora:39
+FROM registry.fedoraproject.org/fedora:42
 
 RUN dnf install -y nosync && \
     printf '#!/bin/sh\n\
@@ -20,7 +20,7 @@ exec "$@"\n' > /usr/bin/nosync && \
     nosync dnf install -y \
                audit-libs-devel \
                augeas \
-               bash-completion \
+               bash-completion-devel \
                ca-certificates \
                ccache \
                clang \
@@ -44,12 +44,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                glusterfs-api-devel \
                gnutls-devel \
                grep \
-               iproute \
-               iproute-tc \
-               iptables \
-               iscsi-initiator-utils \
                json-c-devel \
-               kmod \
                libacl-devel \
                libattr-devel \
                libblkid-devel \
@@ -69,17 +64,13 @@ exec "$@"\n' > /usr/bin/nosync && \
                libxml2 \
                libxml2-devel \
                libxslt \
-               lvm2 \
                make \
                meson \
-               nfs-utils \
                ninja-build \
                numactl-devel \
-               numad \
                parted-devel \
                perl-base \
                pkgconfig \
-               polkit \
                python3 \
                python3-black \
                python3-docutils \
@@ -93,6 +84,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                systemd-devel \
                systemd-rpm-macros \
                systemtap-sdt-devel \
+               systemtap-sdt-dtrace \
                wireshark-devel \
                xen-devel && \
     nosync dnf autoremove -y && \

ci/containers/fedora-rawhide-cross-mingw32.Dockerfile

@@ -35,22 +35,13 @@ exec "$@"\n' > /usr/bin/nosync && \
                git \
                glibc-langpack-en \
                grep \
-               iproute \
-               iproute-tc \
-               iptables \
-               iscsi-initiator-utils \
-               kmod \
                libnbd-devel \
                libxml2 \
                libxslt \
-               lvm2 \
                make \
                meson \
-               nfs-utils \
                ninja-build \
-               numad \
                perl-base \
-               polkit \
                python3 \
                python3-black \
                python3-docutils \

ci/containers/fedora-rawhide-cross-mingw64.Dockerfile

@@ -35,22 +35,13 @@ exec "$@"\n' > /usr/bin/nosync && \
                git \
                glibc-langpack-en \
                grep \
-               iproute \
-               iproute-tc \
-               iptables \
-               iscsi-initiator-utils \
-               kmod \
                libnbd-devel \
                libxml2 \
                libxslt \
-               lvm2 \
                make \
                meson \
-               nfs-utils \
                ninja-build \
-               numad \
                perl-base \
-               polkit \
                python3 \
                python3-black \
                python3-docutils \

ci/containers/fedora-rawhide.Dockerfile

@@ -45,12 +45,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                glusterfs-api-devel \
                gnutls-devel \
                grep \
-               iproute \
-               iproute-tc \
-               iptables \
-               iscsi-initiator-utils \
                json-c-devel \
-               kmod \
                libacl-devel \
                libattr-devel \
                libblkid-devel \
@@ -70,17 +65,13 @@ exec "$@"\n' > /usr/bin/nosync && \
                libxml2 \
                libxml2-devel \
                libxslt \
-               lvm2 \
                make \
                meson \
-               nfs-utils \
                ninja-build \
                numactl-devel \
-               numad \
                parted-devel \
                perl-base \
                pkgconfig \
-               polkit \
                python3 \
                python3-black \
                python3-docutils \

ci/containers/opensuse-leap-15.Dockerfile

@@ -34,9 +34,6 @@ RUN zypper update -y && \
            glibc-locale \
            glusterfs-devel \
            grep \
-           iproute2 \
-           iptables \
-           kmod \
            libacl-devel \
            libapparmor-devel \
            libattr-devel \
@@ -61,17 +58,12 @@ RUN zypper update -y && \
            libxml2 \
            libxml2-devel \
            libxslt \
-           lvm2 \
            make \
            meson \
-           nfs-utils \
            ninja \
-           numad \
-           open-iscsi \
            parted-devel \
            perl-base \
            pkgconfig \
-           polkit \
            python3-base \
            python3-docutils \
            python3-flake8 \

ci/containers/opensuse-tumbleweed.Dockerfile

@@ -33,9 +33,6 @@ RUN zypper dist-upgrade -y && \
            glibc-locale \
            glusterfs-devel \
            grep \
-           iproute2 \
-           iptables \
-           kmod \
            libacl-devel \
            libapparmor-devel \
            libattr-devel \
@@ -60,17 +57,12 @@ RUN zypper dist-upgrade -y && \
            libxml2 \
            libxml2-devel \
            libxslt \
-           lvm2 \
            make \
            meson \
-           nfs-utils \
            ninja \
-           numad \
-           open-iscsi \
            parted-devel \
            perl-base \
            pkgconfig \
-           polkit \
            python3-base \
            python3-black \
            python3-docutils \

ci/containers/ubuntu-2204.Dockerfile

@@ -28,9 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libacl1-dev \
                       libapparmor-dev \
                       libattr1-dev \
@@ -68,16 +65,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libxml2-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \

ci/containers/ubuntu-2404.Dockerfile

@@ -28,9 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       gettext \
                       git \
                       grep \
-                      iproute2 \
-                      iptables \
-                      kmod \
                       libacl1-dev \
                       libapparmor-dev \
                       libattr1-dev \
@@ -68,16 +65,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                       libxml2-dev \
                       libxml2-utils \
                       locales \
-                      lvm2 \
                       make \
                       meson \
-                      nfs-common \
                       ninja-build \
-                      numad \
-                      open-iscsi \
                       perl-base \
                       pkgconf \
-                      polkitd \
                       python3 \
                       python3-docutils \
                       python3-pytest \

ci/gitlab.yml

@@ -11,8 +11,11 @@
 #  - RUN_PIPELINE - force creation of a CI pipeline when
 #    pushing to a branch in a forked repository. Official
 #    CI pipelines are triggered when merge requests are
-#    created/updated. Setting this variable to a non-empty
+#    created/updated. Setting this variable allows CI
-#    value allows CI testing prior to opening a merge request.
+#    testing prior to opening a merge request. A value
+#    of "0" will create the pipeline but leave all jobs
+#    to be manually started, while "1" will immediately
+#    run all default jobs.
 #
 #  - RUN_PIPELINE_UPSTREAM_ENV - same semantics as RUN_PIPELINE,
 #    but uses the CI environment (containers) from the upstream project
@@ -38,11 +41,13 @@
 #
 # Aliases can be set for common usage
 #
-#  $ git config --local alias.push-ci "push -o ci.variable=RUN_PIPELINE=1"
+#  $ git config --local alias.push-ci "push -o ci.variable=RUN_PIPELINE=0"
+#  $ git config --local alias.push-ci-now "push -o ci.variable=RUN_PIPELINE=1"
 #
 # Allowing the less verbose invocation
 #
-#  $ git push-ci
+#  $ git push-ci     (create pipeline but don't start jobs)
+#  $ git push-ci-now (create pipeline and start default jobs)
 #
 # Pipeline variables can also be set in the repository
 # pipeline config globally, or set against scheduled pipelines
@@ -50,6 +55,7 @@
 
 variables:
   RUN_UPSTREAM_NAMESPACE: libvirt
+  CONTAINER_UPSTREAM_NAMESPACE: libvirt
   FF_SCRIPT_SECTIONS: 1
 
 

ci/gitlab/build-templates.yml

@@ -35,7 +35,7 @@
       fi
     - cat /packages.txt
   variables:
-    IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest
+    IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest
   rules:
     ### PUSH events
 
@@ -47,19 +47,27 @@
       when: on_success
 
     # forks: pushes to a branch when a pipeline run in upstream env is explicitly requested
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
       when: manual
       allow_failure: true
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
       when: on_success
 
     # forks: pushes to branches with pipeline requested
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"'
       when: manual
       allow_failure: true
       variables:
         IMAGE: $TARGET_BASE_IMAGE
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+      variables:
+        IMAGE: $TARGET_BASE_IMAGE
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"'
       when: on_success
       variables:
         IMAGE: $TARGET_BASE_IMAGE
@@ -171,7 +179,7 @@
       fi
     - cat /packages.txt
   variables:
-    IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest
+    IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest
   rules:
     ### PUSH events
 
@@ -183,19 +191,27 @@
       when: on_success
 
     # forks: pushes to a branch when a pipeline run in upstream env is explicitly requested
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
       when: manual
       allow_failure: true
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
       when: on_success
 
     # forks: pushes to branches with pipeline requested
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"'
       when: manual
       allow_failure: true
       variables:
         IMAGE: $TARGET_BASE_IMAGE
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+      variables:
+        IMAGE: $TARGET_BASE_IMAGE
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"'
       when: on_success
       variables:
         IMAGE: $TARGET_BASE_IMAGE
@@ -302,15 +318,21 @@
       when: on_success
 
     # forks: pushes to branches with pipeline requested (including pipeline in upstream environment)
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "0"'
       when: manual
       allow_failure: true
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1" && $JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE == "1"'
       when: on_success
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
       when: manual
       allow_failure: true
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1" && $JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
       when: on_success
 
     # upstream+forks: Run pipelines on MR, web, api & scheduled

ci/gitlab/builds.yml

@@ -33,15 +33,15 @@ x86_64-almalinux-9-clang:
     TARGET_BASE_IMAGE: docker.io/library/almalinux:9
 
 
-x86_64-alpine-319:
+x86_64-alpine-322:
   extends: .native_build_job
   needs:
-    - job: x86_64-alpine-319-container
+    - job: x86_64-alpine-322-container
       optional: true
   allow_failure: false
   variables:
-    NAME: alpine-319
+    NAME: alpine-322
-    TARGET_BASE_IMAGE: docker.io/library/alpine:3.19
+    TARGET_BASE_IMAGE: docker.io/library/alpine:3.22
 
 
 x86_64-alpine-edge:
@@ -70,30 +70,6 @@ x86_64-centos-stream-9:
       - libvirt-rpms
 
 
-x86_64-debian-11:
-  extends: .native_build_job
-  needs:
-    - job: x86_64-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
-x86_64-debian-11-clang:
-  extends: .native_build_job
-  needs:
-    - job: x86_64-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
 x86_64-debian-12:
   extends: .native_build_job
   needs:
@@ -127,30 +103,30 @@ x86_64-debian-sid:
     TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
 
 
-x86_64-fedora-39:
+x86_64-fedora-41:
   extends: .native_build_job
   needs:
-    - job: x86_64-fedora-39-container
+    - job: x86_64-fedora-41-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-39
+    NAME: fedora-41
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41
   artifacts:
     expire_in: 1 day
     paths:
       - libvirt-rpms
 
 
-x86_64-fedora-40:
+x86_64-fedora-42:
   extends: .native_build_job
   needs:
-    - job: x86_64-fedora-40-container
+    - job: x86_64-fedora-42-container
       optional: true
   allow_failure: false
   variables:
-    NAME: fedora-40
+    NAME: fedora-42
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42
   artifacts:
     expire_in: 1 day
     paths:
@@ -246,110 +222,6 @@ x86_64-ubuntu-2404-clang:
 
 # Cross build jobs
 
-aarch64-debian-11:
-  extends: .cross_build_job
-  needs:
-    - job: aarch64-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    CROSS: aarch64
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
-armv6l-debian-11:
-  extends: .cross_build_job
-  needs:
-    - job: armv6l-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    CROSS: armv6l
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
-armv7l-debian-11:
-  extends: .cross_build_job
-  needs:
-    - job: armv7l-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    CROSS: armv7l
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
-i686-debian-11:
-  extends: .cross_build_job
-  needs:
-    - job: i686-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    CROSS: i686
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
-mips64el-debian-11:
-  extends: .cross_build_job
-  needs:
-    - job: mips64el-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    CROSS: mips64el
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
-mipsel-debian-11:
-  extends: .cross_build_job
-  needs:
-    - job: mipsel-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    CROSS: mipsel
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
-ppc64le-debian-11:
-  extends: .cross_build_job
-  needs:
-    - job: ppc64le-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    CROSS: ppc64le
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
-s390x-debian-11:
-  extends: .cross_build_job
-  needs:
-    - job: s390x-debian-11-container
-      optional: true
-  allow_failure: false
-  variables:
-    CROSS: s390x
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-    TARGET_BASE_IMAGE: docker.io/library/debian:11-slim
-
-
 aarch64-debian-12:
   extends: .cross_build_job
   needs:
@@ -544,29 +416,29 @@ s390x-debian-sid:
     TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
 
 
-mingw32-fedora-40:
+mingw32-fedora-42:
   extends: .cross_build_job
   needs:
-    - job: mingw32-fedora-40-container
+    - job: mingw32-fedora-42-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw32
     JOB_OPTIONAL: 1
-    NAME: fedora-40
+    NAME: fedora-42
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42
 
 
-mingw64-fedora-40:
+mingw64-fedora-42:
   extends: .cross_build_job
   needs:
-    - job: mingw64-fedora-40-container
+    - job: mingw64-fedora-42-container
       optional: true
   allow_failure: false
   variables:
     CROSS: mingw64
-    NAME: fedora-40
+    NAME: fedora-42
-    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
+    TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42
 
 
 mingw32-fedora-rawhide:
@@ -602,7 +474,7 @@ x86_64-freebsd-13:
   allow_failure:
     exit_codes: 3
   variables:
-    CIRRUS_VM_IMAGE_NAME: freebsd-13-3
+    CIRRUS_VM_IMAGE_NAME: freebsd-13-4
     CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
     INSTALL_COMMAND: pkg install -y
@@ -617,7 +489,7 @@ x86_64-freebsd-14:
   allow_failure:
     exit_codes: 3
   variables:
-    CIRRUS_VM_IMAGE_NAME: freebsd-14-0
+    CIRRUS_VM_IMAGE_NAME: freebsd-14-2
     CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
     INSTALL_COMMAND: pkg install -y

ci/gitlab/containers.yml

@@ -14,11 +14,11 @@ x86_64-almalinux-9-container:
     NAME: almalinux-9
 
 
-x86_64-alpine-319-container:
+x86_64-alpine-322-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: alpine-319
+    NAME: alpine-322
 
 
 x86_64-alpine-edge-container:
@@ -35,14 +35,6 @@ x86_64-centos-stream-9-container:
     NAME: centos-stream-9
 
 
-x86_64-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11
-
-
 x86_64-debian-12-container:
   extends: .container_job
   allow_failure: false
@@ -57,18 +49,18 @@ x86_64-debian-sid-container:
     NAME: debian-sid
 
 
-x86_64-fedora-39-container:
+x86_64-fedora-41-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-39
+    NAME: fedora-41
 
 
-x86_64-fedora-40-container:
+x86_64-fedora-42-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-40
+    NAME: fedora-42
 
 
 x86_64-fedora-rawhide-container:
@@ -109,70 +101,6 @@ x86_64-ubuntu-2404-container:
 
 # Cross container jobs
 
-aarch64-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11-cross-aarch64
-
-
-armv6l-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11-cross-armv6l
-
-
-armv7l-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11-cross-armv7l
-
-
-i686-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11-cross-i686
-
-
-mips64el-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11-cross-mips64el
-
-
-mipsel-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11-cross-mipsel
-
-
-ppc64le-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11-cross-ppc64le
-
-
-s390x-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-11-cross-s390x
-
-
 aarch64-debian-12-container:
   extends: .container_job
   allow_failure: false
@@ -292,19 +220,19 @@ s390x-debian-sid-container:
     NAME: debian-sid-cross-s390x
 
 
-mingw32-fedora-40-container:
+mingw32-fedora-42-container:
   extends: .container_job
   allow_failure: false
   variables:
     JOB_OPTIONAL: 1
-    NAME: fedora-40-cross-mingw32
+    NAME: fedora-42-cross-mingw32
 
 
-mingw64-fedora-40-container:
+mingw64-fedora-42-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: fedora-40-cross-mingw64
+    NAME: fedora-42-cross-mingw64
 
 
 mingw32-fedora-rawhide-container:

ci/gitlab/sanity-checks.yml

@@ -18,9 +18,13 @@ check-dco:
       when: on_success
 
     # forks: pushes to branches with pipeline requested (including upstream env pipelines)
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE == "0"'
+      when: manual
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE == "1"'
       when: on_success
-    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV'
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV == "0"'
+      when: manual
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV == "1"'
       when: on_success
 
     # upstream+forks: that's all folks

ci/integration.yml

@@ -29,23 +29,23 @@ centos-stream-9-tests:
 # and libvirt-python CI jobs, so the new target needs to be introduced
 # there before it can be used here. The VM template for the target
 # also needs to be created on the runner host.
-fedora-39-tests:
+fedora-41-tests:
   extends: .integration_tests
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-39
+    DISTRO: fedora-41
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
   needs:
-    - x86_64-fedora-39
+    - x86_64-fedora-41
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-39
+      job: x86_64-fedora-41
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-39
+      job: x86_64-fedora-41
       ref: master
       artifacts: true
 
@@ -53,22 +53,22 @@ fedora-39-tests:
 # and libvirt-python CI jobs, so the new target needs to be introduced
 # there before it can be used here. The VM template for the target
 # also needs to be created on the runner host.
-.fedora-39-upstream-qemu-tests:
+.fedora-41-upstream-qemu-tests:
   extends: .integration_tests
   variables:
     # needed by libvirt-gitlab-executor
-    DISTRO: fedora-39
+    DISTRO: fedora-41
     # can be overridden in forks to set a different runner tag
     LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host
   tags:
     - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
   needs:
-    - x86_64-fedora-39
+    - x86_64-fedora-41
     - project: libvirt/libvirt-perl
-      job: x86_64-fedora-39
+      job: x86_64-fedora-41
       ref: master
       artifacts: true
     - project: libvirt/libvirt-python
-      job: x86_64-fedora-39
+      job: x86_64-fedora-41
       ref: master
       artifacts: true

ci/jobs.sh

@@ -124,6 +124,9 @@ run_integration() {
         DAEMONS="virtinterfaced virtlockd virtlogd virtnetworkd virtnodedevd virtnwfilterd virtproxyd virtqemud virtsecretd virtstoraged"
     fi
 
+    # Force libvirt to use iptables to make sure libvirt-tck tests don't fail
+    run_cmd_quiet sudo augtool set /files/etc/libvirt/network.conf/firewall_backend "'iptables'"
+
     echo "DAEMONS=$DAEMONS"
     for daemon in $DAEMONS
     do

ci/lcitool/projects/libvirt.yml

@@ -27,9 +27,6 @@ packages:
   - glusterfs
   - gnutls
   - grep
-  - ip
-  - iptables
-  - iscsiadm
   - json-c
   - libacl
   - libattr
@@ -54,16 +51,12 @@ packages:
   - libtirpc
   - libudev
   - libxml2
-  - lvm2
   - make
   - meson
-  - modprobe
   - netcf
   - ninja
-  - numad
   - openwsman
   - perl
-  - pkcheck
   - pkg-config
   - portablexdr
   - python3
@@ -74,10 +67,8 @@ packages:
   - rpmbuild
   - sanlock
   - sed
-  - showmount
   - systemd-rpm-macros
   - systemtap
-  - tc
   - wireshark
   - xen
   - xmllint

ci/manifest.yml

@@ -19,7 +19,7 @@ targets:
           RPM: skip
           CC: clang
 
-  alpine-319: x86_64
+  alpine-322: x86_64
 
   alpine-edge:
     jobs:
@@ -34,46 +34,6 @@ targets:
           paths:
             - libvirt-rpms
 
-  debian-11:
-    jobs:
-      - arch: x86_64
-        builds: false
-
-      - arch: x86_64
-        suffix: -clang
-        builds: false
-
-      - arch: aarch64
-        containers: false
-        builds: false
-
-      - arch: armv6l
-        containers: false
-        builds: false
-
-      - arch: armv7l
-        builds: false
-
-      - arch: i686
-        containers: false
-        builds: false
-
-      - arch: mips64el
-        containers: false
-        builds: false
-
-      - arch: mipsel
-        containers: false
-        builds: false
-
-      - arch: ppc64le
-        containers: false
-        builds: false
-
-      - arch: s390x
-        containers: false
-        builds: false
-
   debian-12:
     jobs:
       - arch: x86_64
@@ -144,7 +104,7 @@ targets:
         containers: false
         builds: false
 
-  fedora-39:
+  fedora-41:
     jobs:
       - arch: x86_64
         artifacts:
@@ -152,7 +112,7 @@ targets:
           paths:
             - libvirt-rpms
 
-  fedora-40:
+  fedora-42:
     jobs:
       - arch: x86_64
         artifacts:

docs/api.rst

@@ -26,7 +26,7 @@ name will default to a preselected hypervisor, but it's probably not a
 wise thing to do in most cases. See the `connection URI <uri.html>`__
 page for a full descriptions of the values allowed.
 
-OnDevice the application obtains a
+Once the application obtains a
 `virConnectPtr <html/libvirt-libvirt-host.html#virConnectPtr>`__
 connection to the hypervisor it can then use it to manage the
 hypervisor's available domains and related virtualization resources,

docs/apps.rst

@@ -206,6 +206,11 @@ Libraries
    Allows using simple ruby objects to manipulate hypervisors, guests,
    storage, network etc. It is based on top of the `native ruby
    bindings <https://ruby.libvirt.org/>`__.
+`Perl Async bindings <https://github.com/ehuelsmann/perl-sys-async-virt#readme>`__
+   Perl `Sys::Async::Virt library <https://metacpan.org/pod/Sys::Async::Virt>`__
+   supporting the asynchronous paradigm introduced by `Future::AsyncAwait
+   <https://metacpan.org/pod/Future::AsyncAwait>`__ that tries to stay close to
+   the `Sys::Virt API <https://metacpan.org/pod/Sys::Virt>`__.
 
 LiveCD / Appliances
 -------------------