Prep for release 2.2.1

spec: Avoid RPM verification errors on nwfilter XMLs
/etc/libvirt/nwfilter/*.xml files are installed with no UUID, which means libvirtd will automatically alter all of them once it starts. Thus RPM verification will always fail on them. Let's use a trick similar to the default network XML and store nwfilter XMLs in /usr/share. They will be copied into /etc in %post. Additionally the /etc files are marked as %ghost so that they are uninstalled if the RPM package is removed. Note that the %post script overwrites existing files with new ones on upgrade, which is what has always been happening. https://bugzilla.redhat.com/show_bug.cgi?id=1431581 https://bugzilla.redhat.com/show_bug.cgi?id=1378774 Signed-off-by: Jiri Denemark <jdenemar@redhat.com> (cherry picked from commit 1d3963dba5)
2025-09-16 17:45:48 +03:00 · 2017-05-10 16:47:43 -04:00 · 2017-05-10 15:42:45 -04:00 · 2017-05-10 15:42:45 -04:00 · 2017-05-10 15:42:45 -04:00 · 2017-05-10 15:42:45 -04:00
11777 changed files with 4711575 additions and 3757603 deletions
--- a/.ctags
+++ b/.ctags
@@ -3,4 +3,3 @@
 --exclude=*.html
 --exclude=*.html.in
 --langmap=c:+.h.in
--c-kinds=+p
--- a/.ctags.d/libvirt.ctags
+++ b/.ctags.d/libvirt.ctags
@@ -1 +0,0 @@
-../.ctags
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,21 +0,0 @@
-# EditorConfig is a file format and collection of text editor plugins
-# for maintaining consistent coding styles between different editors
-# and IDEs. Most popular editors support this either natively or via
-# plugin.
-#
-# Check https://editorconfig.org for details.
-
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-
-[*.c]
-indent_style = space
-indent_size = 4
-
-[*.{rng,xml}]
-indent_style = space
-indent_size = 2
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,22 +0,0 @@
-# Generic git stuff
-**/.gitattributes export-ignore
-**/.gitignore export-ignore
-/.gitmodules export-ignore
-/.mailmap export-ignore
-
-# Project-specific git stuff
-/.gitpublish export-ignore
-/docs/gitdm export-ignore
-/docs/gitdm/** export-ignore
-/gitdm.config export-ignore
-
-# Code hosting stuff
-/.github export-ignore
-/.github/** export-ignore
-/.gitlab export-ignore
-/.gitlab/** export-ignore
-
-# CI stuff
-/.gitlab-ci.yml export-ignore
-/ci export-ignore
-/ci/** export-ignore
--- a/.github/workflows/lockdown.yml
+++ b/.github/workflows/lockdown.yml
@@ -1,52 +0,0 @@
---
-# Configuration for Repo Lockdown - https://github.com/dessant/repo-lockdown
-
-name: 'Repo Lockdown'
-
-on:
-  issues:
-    types: opened
-  pull_request_target:
-    types: opened
-
-permissions:
-  pull-requests: write
-  issues: write
-
-jobs:
-  action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/repo-lockdown@v2
-        with:
-          issue-comment: |
-            Thank you for your interest in the libvirt project.
-
-            Since this repository is a read-only mirror of the project's master
-            repostory hosted on GitLab, issues opened here are not processed.
-
-            We kindly request that new issues are reported to
-
-              https://gitlab.com/libvirt/libvirt/-/issues/new
-
-            Thank you for your time and understanding.
-          lock-issue: true
-          close-issue: true
-          pr-comment: |
-            Thank you for your interest in the libvirt project.
-
-            Since this repository is a read-only mirror of the project's master
-            repostory hosted on GitLab, merge requests opened here are not
-            processed.
-
-            We kindly request that contributors fork the project at
-
-              https://gitlab.com/libvirt/libvirt/
-
-            push changes to the fork, and then open a new merge request at
-
-              https://gitlab.com/libvirt/libvirt/-/merge_requests/new
-
-            Thank you for your time and understanding.
-          lock-pr: true
-          close-pr: true
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,211 @@
-# vim related ignores
-*.swp
-.lvimrc
-
-# emacs related ignores
 *#*#
 *.#*#
-.#*
-*~
-
-# git related ignores
-*.rej
+*.[18]
+*.[18].in
+*.a
+*.cov
+*.exe
+*.exe.manifest
+*.gcda
+*.gcno
+*.gcov
+*.html
+*.i
+*.init
+*.la
+*.lo
+*.loT
+*.o
 *.orig
+*.pem
+*.pyc
+*.rej
+*.s
+*.service
+*.socket
+*.swp
+*~
+.#*
+.deps
+.dirstamp
+.gdb_history
+.git
 .git-module-status
-
-# python related ignores
-__pycache__/
-
-# libvirt related ignores
+.libs
+.lvimrc
+.memdump
+.sc-start-sc_*
+/ABOUT-NLS
+/AUTHORS
+/ChangeLog
+/GNUmakefile
+/INSTALL
+/NEWS
+/aclocal.m4
+/autom4te.cache
+/build-aux/
 /build/
-/ci/scratch/
+/confdefs.h
+/config.cache
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.rpath
+/config.status
+/config.sub
+/configure
+/configure.lineno
+/conftest.*
+/daemon/*_dispatch.h
+/daemon/libvirt_qemud
+/daemon/libvirtd
+/daemon/libvirtd*.logrotate
+/daemon/libvirtd.policy
+/daemon/test_libvirtd.aug
+/docs/aclperms.htmlinc
+/docs/apibuild.py.stamp
+/docs/devhelp/libvirt.devhelp
+/docs/hvsupport.html.in
+/docs/libvirt-admin-*.xml
+/docs/libvirt-api.xml
+/docs/libvirt-lxc-*.xml
+/docs/libvirt-qemu-*.xml
+/docs/libvirt-refs.xml
+/docs/search.php
+/docs/todo.html.in
+/examples/admin/client_close
+/examples/admin/client_info
+/examples/admin/client_limits
+/examples/admin/list_clients
+/examples/admin/list_servers
+/examples/admin/threadpool_params
+/examples/object-events/event-test
+/examples/dominfo/info1
+/examples/domsuspend/suspend
+/examples/dommigrate/dommigrate
+/examples/domtop/domtop
+/examples/hellolibvirt/hellolibvirt
+/examples/openauth/openauth
+/examples/rename/rename
+/gnulib/lib/*
+/gnulib/m4/*
+/gnulib/tests/*
+/include/libvirt/libvirt-common.h
+/libtool
+/libvirt-*.tar.xz
+/libvirt-[0-9]*
+/libvirt*.pc
+/libvirt.spec
+/ltconfig
+/ltmain.sh
+/m4/*
+/maint.mk
+/mingw-libvirt.spec
+/mkinstalldirs
+/po/*
+/proxy/
+/python/
+/run
+/sc_*
+/src/.*.stamp
+/src/*.pc
+/src/access/org.libvirt.api.policy
+/src/access/viraccessapicheck.c
+/src/access/viraccessapicheck.h
+/src/access/viraccessapichecklxc.c
+/src/access/viraccessapichecklxc.h
+/src/access/viraccessapicheckqemu.c
+/src/access/viraccessapicheckqemu.h
+/src/admin/admin_client.h
+/src/admin/admin_protocol.[ch]
+/src/esx/*.generated.*
+/src/hyperv/*.generated.*
+/src/libvirt*.def
+/src/libvirt.syms
+/src/libvirt_access.syms
+/src/libvirt_access.xml
+/src/libvirt_access_lxc.syms
+/src/libvirt_access_lxc.xml
+/src/libvirt_access_qemu.syms
+/src/libvirt_access_qemu.xml
+/src/libvirt_admin.syms
+/src/libvirt_*.stp
+/src/libvirt_*helper
+/src/libvirt_*probes.h
+/src/libvirt_lxc
+/src/locking/libxl-lockd.conf
+/src/locking/libxl-sanlock.conf
+/src/locking/lock_daemon_dispatch_stubs.h
+/src/locking/lock_protocol.[ch]
+/src/locking/qemu-lockd.conf
+/src/locking/qemu-sanlock.conf
+/src/locking/test_libvirt_sanlock.aug
+/src/logging/log_daemon_dispatch_stubs.h
+/src/logging/log_protocol.[ch]
+/src/lxc/lxc_controller_dispatch.h
+/src/lxc/lxc_monitor_dispatch.h
+/src/lxc/lxc_monitor_protocol.c
+/src/lxc/lxc_monitor_protocol.h
+/src/lxc/lxc_protocol.[ch]
+/src/lxc/test_libvirtd_lxc.aug
+/src/qemu/test_libvirtd_qemu.aug
+/src/remote/*_client_bodies.h
+/src/remote/*_protocol.[ch]
+/src/rpc/virkeepaliveprotocol.[ch]
+/src/rpc/virnetprotocol.[ch]
+/src/test_libvirt*.aug
+/src/test_virtlockd.aug
+/src/test_virtlogd.aug
+/src/util/virkeymaps.h
+/src/virt-aa-helper
+/src/virtlockd
+/src/virtlogd
+/tests/*.log
+/tests/*.pid
+/tests/*.trs
+/tests/*test
+/tests/commandhelper
+/tests/qemucapsprobe
+!/tests/virsh-self-test
+!/tests/virt-aa-helper-test
+/tests/objectlocking
+/tests/objectlocking-files.txt
+/tests/objectlocking.cm[ix]
+/tests/reconnect
+/tests/ssh
+/tests/test_file_access.txt
+/tests/test_conf
+/tools/libvirt-guests.sh
+/tools/virt-login-shell
+/tools/virsh
+/tools/virsh-*-edit.c
+/tools/virt-admin
+/tools/virt-*-validate
+/tools/virt-sanlock-cleanup
+/tools/wireshark/src/plugin.c
+/tools/wireshark/src/libvirt
+/update.log
+GPATH
+GRTAGS
+GTAGS
+Makefile
+Makefile.in
+TAGS
+coverage
+cscope.files
+cscope.in.out
+cscope.out
+cscope.po.out
+results.log
+stamp-h
+stamp-h.in
+stamp-h1
 tags
-
-# clangd related ignores
-.clangd
-compile_commands.json
+!/build-aux/*.pl
+!/gnulib/lib/Makefile.am
+!/gnulib/tests/Makefile.am
+!/m4/virt-*.m4
+!/po/*.po
+!/po/POTFILES.in
+!/po/libvirt.pot
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,133 +0,0 @@
-variables:
-  GIT_DEPTH: 100
-
-stages:
-  - containers
-  - builds
-  - integration_tests
-  - sanity_checks
-
-.script_variables: &script_variables |
-  export CCACHE_BASEDIR="$(pwd)"
-  export CCACHE_DIR="$CCACHE_BASEDIR/ccache"
-  export CCACHE_MAXSIZE="500M"
-  export PATH="$CCACHE_WRAPPERSDIR:$PATH"
-  export VIR_TEST_VERBOSE="1"
-  export VIR_TEST_DEBUG="1"
-
-include:
-  - '/ci/gitlab.yml'
-  - '/ci/integration.yml'
-
-.native_build_job:
-  extends: .gitlab_native_build_job
-  cache:
-    paths:
-      - ccache/
-    key: "$CI_JOB_NAME"
-  before_script:
-    - *script_variables
-    - cat /packages.txt
-  script:
-    - meson setup build --werror $MESON_ARGS || (cat build/meson-logs/meson-log.txt && exit 1)
-    - meson dist -C build --no-tests
-    - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip";
-      then
-        rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild/" -ta build/meson-dist/libvirt-*.tar.xz;
-        mv rpmbuild/RPMS/x86_64/ libvirt-rpms/;
-      else
-        meson compile -C build;
-        meson test -C build --no-suite syntax-check --print-errorlogs;
-      fi
-
-.cross_build_job:
-  extends: .gitlab_cross_build_job
-  cache:
-    paths:
-      - ccache/
-    key: "$CI_JOB_NAME"
-  before_script:
-    - *script_variables
-    - cat /packages.txt
-  script:
-    - meson setup build --werror $MESON_OPTS || (cat build/meson-logs/meson-log.txt && exit 1)
-    - meson compile -C build
-    - if test "$CROSS" = "i686" ; then meson test -C build --no-suite syntax-check --print-errorlogs ; fi
-
-
-# This artifact published by this job is downloaded by libvirt.org to
-# be deployed to the web root:
-#    https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=website
-website:
-  stage: builds
-  image: $CI_REGISTRY_IMAGE/ci-almalinux-8:latest
-  needs:
-    - x86_64-almalinux-8-container
-  before_script:
-    - *script_variables
-  script:
-    - meson setup build --werror --prefix=$(pwd)/vroot || (cat build/meson-logs/meson-log.txt && exit 1)
-    - ninja -C build install-web
-    - mv vroot/share/doc/libvirt/html/ website
-  artifacts:
-    expose_as: 'Website'
-    name: 'website'
-    when: on_success
-    expire_in: 30 days
-    paths:
-      - website
-
-
-codestyle:
-  stage: sanity_checks
-  image: $CI_REGISTRY_IMAGE/ci-opensuse-leap-152:latest
-  needs:
-    - x86_64-opensuse-leap-152-container
-  before_script:
-    - *script_variables
-  script:
-    - meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
-    - ninja -C build libvirt-pot-dep
-    - meson test -C build --suite syntax-check --no-rebuild --print-errorlogs
-
-
-# This artifact published by this job is downloaded to push to Weblate
-# for translation usage:
-#    https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=potfile
-potfile:
-  stage: builds
-  image: $CI_REGISTRY_IMAGE/ci-almalinux-8:latest
-  needs:
-    - x86_64-almalinux-8-container
-  rules:
-    - if: "$CI_COMMIT_BRANCH == 'master'"
-  before_script:
-    - *script_variables
-  script:
-    - meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
-    - ninja -C build libvirt-pot-dep
-    - ninja -C build libvirt-pot
-    - cp po/libvirt.pot libvirt.pot
-  artifacts:
-    expose_as: 'Potfile'
-    name: 'potfile'
-    when: on_success
-    expire_in: 30 days
-    paths:
-      - libvirt.pot
-
-# Coverity job that is run only by schedules
-coverity:
-  image: $CI_REGISTRY_IMAGE/ci-almalinux-8:latest
-  needs:
-    - x86_64-almalinux-8-container
-  stage: builds
-  script:
-    - curl https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN -o /tmp/cov-analysis-linux64.tgz
-    - tar xfz /tmp/cov-analysis-linux64.tgz
-    - meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
-    - cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C build
-    - tar cfz cov-int.tar.gz cov-int
-    - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL --form file=@cov-int.tar.gz --form version="$(git describe --tags)" --form description="$(git describe --tags) / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
-  rules:
-    - if: "$CI_PIPELINE_SOURCE == 'schedule' && $COVERITY_SCAN_PROJECT_NAME && $COVERITY_SCAN_TOKEN"
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
@@ -1,24 +0,0 @@
-<!-- See https://libvirt.org/bugs.html#quality for guidance -->
-
-## Software environment
- - Operating system:
- - Architecture:
- - kernel version:
- - libvirt version:
- - Hypervisor and version:
-
-## Description of problem
-
-## Steps to reproduce
-1.
-2.
-3.
-
-## Additional information
-<!-- Attach XML configs, logs, stack traces, etc. Compress the files if necessary -->
-<!-- See https://libvirt.org/kbase/debuglogs.html on how to configure logging -->
-
-
-
-<!-- The line below ensures that proper tags are added to the issue. -- >
-/label ~bug
--- a/.gitlab/issue_templates/feature.md
+++ b/.gitlab/issue_templates/feature.md
@@ -1,30 +0,0 @@
-<!--
-This is the upstream libvirt issue tracker.
-
-Please note that libvirt, like most open source projects, relies on
-contributors who have motivation, skills and available time to work on
-implementing particular features.
-
-Feature requests can be helpful for determining demand and interest, but
-they are not a guarantee that a contributor will volunteer to implement
-it. We welcome and encourage even draft patches to implement a feature
-be sent to the mailing list where it can be discussed and developed
-further by the community.
-
-Thank you for your interest in helping us to make libvirt better!
-->
-
-## Goal
-<!-- Describe the final result you want to achieve. Avoid design specifics. -->
-
-
-## Technical details
-<!-- Describe technical details, design specifics, suggestions, versions, etc. -->
-
-
-## Additional information
-
-
-
-<!-- The line below ensures that proper tags are added to the issue. -- >
-/label ~enhancement
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "keycodemapdb"]
-	path = src/keycodemapdb
-	url = https://gitlab.com/keycodemap/keycodemapdb.git
+[submodule "gnulib"]
+	path = .gnulib
+	url = git://git.sv.gnu.org/gnulib.git
--- a/.gitpublish
+++ b/.gitpublish
@@ -1,4 +0,0 @@
-[gitpublishprofile "default"]
-base = master
-to = libvir-list@redhat.com
-prefix = libvirt PATCH
--- a/.gnulib
+++ b/.gnulib
--- a/.mailmap
+++ b/.mailmap
@@ -20,6 +20,7 @@
 <jfehlig@suse.com> <jfehlig@novell.com>
 <jfehlig@suse.com> <jfehlig@linux-ypgk.site>
 <jclift@redhat.com> <justin@salasaga.org>
+<berrange@redhat.com> <dan@berrange.com>
 <soren@linux2go.dk> <soren@canonical.com>
 <cfergeau@redhat.com> <teuf@gnome.org>
 <wency@cn.fujitsu.com> <wency cn fujitsu com>
@@ -38,16 +39,6 @@
 <zhlcindy@linux.vnet.ibm.com> <zhlcindy@gmail.com>
 <serge.hallyn@canonical.com> <serue@us.ibm.com>
 <pritesh.kothari@sun.com> <Pritesh.Kothari@Sun.COM>
-<cbosdonnat@suse.com> <cedric.bosdonnat@free.fr>
-<mnestratov@virtuozzo.com> <mnestratov@parallels.com>
-<nshirokovskiy@virtuozzo.com> <nshirokovskiy@parallels.com>
-<jyang@redhat.com> <osier@yunify.com>
-<kkoukiou@redhat.com> <k.koukiou@googlemail.com>
-<intrigeri@boum.org> <intrigeri+libvirt@boum.org>
-<fidencio@redhat.com> <fabiano@fidencio.org>
-<shi_lei@massclouds.com> <shilei.massclouds@gmx.com>
-<adrian.brzezinski@eo.pl> <redhat@adrb.pl>
-<matt@datto.com> <mcoleman@datto.com>

 # Name consolidation:
 # Preferred author spelling <preferred email>
@@ -65,16 +56,8 @@ Aurelien Rougemont <beorn@binaries.fr>
 Serge E. Hallyn <serge.hallyn@canonical.com>
 Henrik Persson E <henrik.e.persson@ericsson.com>
 Philipp Hahn <hahn@univention.de>
+Marco Bozzolan <bozzolan@gmail.com>
+Marco Bozzolan <redshift@gmx.com>
 Pritesh Kothari <pritesh.kothari@sun.com>
 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>
-
-# Non-trivial consolidation:
-# see git documentation for information about the format
-Daniel P. Berrangé <berrange@redhat.com>
-Daniel P. Berrangé <berrange@redhat.com> <dan@berrange.com>
-Michal Prívozník <mprivozn@redhat.com>
-Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
-Marco Bozzolan <bozzolan@gmail.com> <redshift@gmx.com>
--- a/AUTHORS.in
+++ b/AUTHORS.in
@@ -0,0 +1,101 @@
+   libvirt Authors
+   ===============
+
+The libvirt project was initiated by:
+
+Daniel Veillard <veillard@redhat.com> or <daniel@veillard.com>
+
+The primary maintainers and people with commit access rights:
+
+Alex Jia <ajia@redhat.com>
+Andrea Bolognani <abologna@redhat.com>
+Cédric Bosdonnat <cbosdonnat@suse.com>
+Christophe Fergeau <cfergeau@redhat.com>
+Claudio Bley <claudio.bley@gmail.com>
+Cole Robinson <crobinso@redhat.com>
+Daniel Berrange <berrange@redhat.com>
+Daniel Veillard <veillard@redhat.com>
+Doug Goldstein <cardoe@gentoo.org>
+Eric Blake <eblake@redhat.com>
+Erik Skultety <eskultet@redhat.com>
+Gao Feng <gaofeng@cn.fujitsu.com>
+Guido Günther <agx@sigxcpu.org>
+Ján Tomko <jtomko@redhat.com>
+Jim Fehlig <jfehlig@suse.com>
+Jiří Denemark <jdenemar@redhat.com>
+John Ferlan <jferlan@redhat.com>
+Laine Stump <laine@redhat.com>
+Mark McLoughlin <markmc@redhat.com>
+Martin Kletzander <mkletzan@redhat.com>
+Matthias Bolte <matthias.bolte@googlemail.com>
+Maxim Nestratov <mnestratov@virtuozzo.com>
+Michal Prívozník <mprivozn@redhat.com>
+Pavel Hrdina <phrdina@redhat.com>
+Peter Krempa <pkrempa@redhat.com>
+Richard W.M. Jones <rjones@redhat.com>
+Roman Bogorodskiy <bogorodskiy@gmail.com>
+Stefan Berger <stefanb@us.ibm.com>
+Wen Congyang <wency@cn.fujitsu.com>
+
+Previous maintainers:
+
+Anthony Liguori <aliguori@us.ibm.com>
+Atsushi SAKAI <sakaia@jp.fujitsu.com>
+Chris Lalancette <clalance@redhat.com>
+Dan Smith <danms@us.ibm.com>
+Dave Allan <dallan@redhat.com>
+Dave Leskovec <dlesko@linux.vnet.ibm.com>
+Dmitry Guryanov <dguryanov@parallels.com>
+Guannan Ren <gren@redhat.com>
+Jim Meyering <meyering@redhat.com>
+John Levon <john.levon@sun.com>
+Justin Clift <jclift@redhat.com>
+Karel Zak <kzak@redhat.com>
+Osier Yang <jyang@redhat.com>
+
+Patches have also been contributed by:
+
+Abel Míguez Rodríguez <amiguezr@pdi.ucm.es>
+Amit Shah <amit.shah@redhat.com>
+Andrew Puch <apuch@redhat.com>
+Anton Protopopov <aspsk2@gmail.com>
+Ben Guthro <ben.guthro@gmail.com>
+Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
+Daniel Hokka Zakrisson <daniel@hozac.com>
+Dan Wendlandt <dan@nicira.com>
+David Lively <dlively@virtualiron.com>
+David Lutterkort <dlutter@redhat.com>
+Evgeniy Sokolov <evg@openvz.org>
+Hugh Brock <hbrock@redhat.com>
+Itamar Heim <iheim@redhat.com>
+James Morris <jmorris@namei.org>
+Javier Fontan <jfontan@gmail.com>
+Jeremy Katz <katzj@redhat.com>
+Kaitlin Rupert <kaitlin@linux.vnet.ibm.com>
+Kazuki Mizushima <mizushima.kazuk@jp.fujitsu.com>
+Mads Chr. Olesen <shiyee@shiyee.dk>
+Mark Johnson <johnson.nh@gmail.com>
+Markus Armbruster <armbru@redhat.com>
+Masayuki Sunou <fj1826dm@aa.jp.fujitsu.com>
+Matthias Witte <witte@netzquadrat.de>
+Michel Ponceau <michel.ponceau@bull.net>
+Nobuhiro Itou <fj0873gn@aa.jp.fujitsu.com>
+Pete Vetere <pvetere@redhat.com>
+Philippe Berthault <philippe.berthault@Bull.net>
+Saori Fukuta <fukuta.saori@jp.fujitsu.com>
+Shigeki Sakamoto <fj0588di@aa.jp.fujitsu.com>
+Shuveb Hussain <shuveb@binarykarma.com>
+Stefan de Konink <dekonink@kinkrsoftware.nl>
+Takahashi Tomohiro <takatom@jp.fujitsu.com>
+Tatsuro Enokura <fj7716hz@aa.jp.fujitsu.com>
+
+#authorslist#
+
+[....send patches to get your name here....]
+
+The libvirt logo was designed by Diana Fong
+
+-- End
+;; Local Variables:
+;; coding: utf-8
+;; End:
--- a/AUTHORS.rst.in
+++ b/AUTHORS.rst.in
@@ -1,100 +0,0 @@
-===============
-libvirt Authors
-===============
-
-The libvirt project was initiated by:
-
-* Daniel Veillard <veillard@redhat.com> or <daniel@veillard.com>
-
-The primary maintainers and people with commit access rights:
-
-* Andrea Bolognani <abologna@redhat.com>
-* Cédric Bosdonnat <cbosdonnat@suse.com>
-* Christian Ehrhardt <christian.ehrhardt@canonical.com>
-* Christophe Fergeau <cfergeau@redhat.com>
-* Cole Robinson <crobinso@redhat.com>
-* Daniel P. Berrangé <berrange@redhat.com>
-* Daniel Veillard <veillard@redhat.com>
-* Eric Blake <eblake@redhat.com>
-* Erik Skultety <eskultet@redhat.com>
-* Fabiano Fidêncio <fidencio@redhat.com>
-* Guido Günther <agx@sigxcpu.org>
-* Ján Tomko <jtomko@redhat.com>
-* Jim Fehlig <jfehlig@suse.com>
-* Jiří Denemark <jdenemar@redhat.com>
-* Laine Stump <laine@redhat.com>
-* Martin Kletzander <mkletzan@redhat.com>
-* Michal Prívozník <mprivozn@redhat.com>
-* Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-* Pavel Hrdina <phrdina@redhat.com>
-* Peter Krempa <pkrempa@redhat.com>
-* Pino Toscano <ptoscano@redhat.com>
-* Richard W.M. Jones <rjones@redhat.com>
-* Roman Bogorodskiy <bogorodskiy@gmail.com>
-* Tim Wiederhake <twiederh@redhat.com>
-
-Previous maintainers:
-
-* Alex Jia <ajia@redhat.com>
-* Anthony Liguori <aliguori@us.ibm.com>
-* Atsushi SAKAI <sakaia@jp.fujitsu.com>
-* Chris Lalancette <clalance@redhat.com>
-* Claudio Bley <claudio.bley@gmail.com>
-* Dan Smith <danms@us.ibm.com>
-* Dave Allan <dallan@redhat.com>
-* Dave Leskovec <dlesko@linux.vnet.ibm.com>
-* Dmitry Guryanov <dguryanov@parallels.com>
-* Doug Goldstein <cardoe@gentoo.org>
-* Gao Feng <gaofeng@cn.fujitsu.com>
-* Guannan Ren <gren@redhat.com>
-* Jim Meyering <meyering@redhat.com>
-* John Ferlan <jferlan@redhat.com>
-* John Levon <john.levon@sun.com>
-* Justin Clift <jclift@redhat.com>
-* Karel Zak <kzak@redhat.com>
-* Katerina Koukiou <kkoukiou@redhat.com>
-* Mark McLoughlin <markmc@redhat.com>
-* Matthias Bolte <matthias.bolte@googlemail.com>
-* Maxim Nestratov <mnestratov@virtuozzo.com>
-* Osier Yang <jyang@redhat.com>
-* Stefan Berger <stefanb@us.ibm.com>
-* Wen Congyang <wency@cn.fujitsu.com>
-
-Patches have also been contributed by:
-
-* Abel Míguez Rodríguez <amiguezr@pdi.ucm.es>
-* Amit Shah <amit.shah@redhat.com>
-* Andrew Puch <apuch@redhat.com>
-* Anton Protopopov <aspsk2@gmail.com>
-* Ben Guthro <ben.guthro@gmail.com>
-* Daniel Hokka Zakrisson <daniel@hozac.com>
-* Dan Wendlandt <dan@nicira.com>
-* David Lively <dlively@virtualiron.com>
-* David Lutterkort <dlutter@redhat.com>
-* Evgeniy Sokolov <evg@openvz.org>
-* Hugh Brock <hbrock@redhat.com>
-* Itamar Heim <iheim@redhat.com>
-* James Morris <jmorris@namei.org>
-* Javier Fontan <jfontan@gmail.com>
-* Jeremy Katz <katzj@redhat.com>
-* Kaitlin Rupert <kaitlin@linux.vnet.ibm.com>
-* Kazuki Mizushima <mizushima.kazuk@jp.fujitsu.com>
-* Mads Chr. Olesen <shiyee@shiyee.dk>
-* Mark Johnson <johnson.nh@gmail.com>
-* Markus Armbruster <armbru@redhat.com>
-* Masayuki Sunou <fj1826dm@aa.jp.fujitsu.com>
-* Matthias Witte <witte@netzquadrat.de>
-* Michel Ponceau <michel.ponceau@bull.net>
-* Nobuhiro Itou <fj0873gn@aa.jp.fujitsu.com>
-* Pete Vetere <pvetere@redhat.com>
-* Philippe Berthault <philippe.berthault@Bull.net>
-* Saori Fukuta <fukuta.saori@jp.fujitsu.com>
-* Shigeki Sakamoto <fj0588di@aa.jp.fujitsu.com>
-* Shuveb Hussain <shuveb@binarykarma.com>
-* Stefan de Konink <dekonink@kinkrsoftware.nl>
-* Takahashi Tomohiro <takatom@jp.fujitsu.com>
-* Tatsuro Enokura <fj7716hz@aa.jp.fujitsu.com>
-
-@contributorslist@
-
-The libvirt logo was designed by Diana Fong
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,45 +0,0 @@
-=======================
-Contributing to libvirt
-=======================
-
-Full, up to date information on how to contribute to libvirt can be
-found on the libvirt website:
-
-https://libvirt.org/contribute.html
-
-To build the same document locally, from the top level directory of
-your git clone run:
-
-::
-
-   $ meson build
-   $ ninja -C build
-
-You'll find the freshly-built document in ``docs/contribute.html``.
-
-If ``meson setup`` fails because of missing dependencies, you can set
-up your system by calling
-
-::
-
-   $ sudo dnf builddep libvirt
-
-if you're on a RHEL-based distribution or
-
-::
-
-   $ sudo apt-get build-dep libvirt
-
-if you're on a Debian-based one.
-
-Note that, for the RHEL-based case, if you're on a machine where you
-haven't done any C development before, you will probably also need
-to run
-
-::
-
-   $ sudo dnf install gcc make ninja-build rpm-build
-
-You might still be missing some dependencies if your distribution is
-shipping an old libvirt version, but that will get you much closer to
-where you need to be to build successfully from source.
--- a/16699
+++ b/16699
--- a/1011
+++ b/1011
--- a/Makefile.am
+++ b/Makefile.am
@@ -0,0 +1,113 @@
+## Process this file with automake to produce Makefile.in
+
+## Copyright (C) 2005-2013 Red Hat, Inc.
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library.  If not, see
+## <http://www.gnu.org/licenses/>.
+
+LCOV = lcov
+GENHTML = genhtml
+
+SUBDIRS = . gnulib/lib include/libvirt src daemon tools docs gnulib/tests \
+  tests po examples
+
+XZ_OPT ?= -v -T0
+export XZ_OPT
+
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = \
+  config-post.h \
+  ChangeLog-old \
+  libvirt.spec libvirt.spec.in \
+  mingw-libvirt.spec.in \
+  libvirt.pc.in \
+  libvirt-qemu.pc.in \
+  libvirt-lxc.pc.in \
+  libvirt-admin.pc.in \
+  autobuild.sh \
+  Makefile.nonreentrant \
+  autogen.sh \
+  cfg.mk \
+  run.in \
+  AUTHORS.in
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin.pc
+
+NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
+	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then			\
+	  $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl	\
+	     $(top_srcdir)/docs/news.html.in			\
+	   | perl -0777 -pe 's/\n\n+$$/\n/'			\
+	   | perl -pe 's/[ \t]+$$//'				\
+	   > $@-t && mv $@-t $@ ; fi
+
+$(top_srcdir)/HACKING: $(top_srcdir)/docs/hacking1.xsl \
+			$(top_srcdir)/docs/hacking2.xsl \
+			$(top_srcdir)/docs/wrapstring.xsl \
+			$(top_srcdir)/docs/hacking.html.in
+	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
+	   $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking1.xsl \
+		$(top_srcdir)/docs/hacking.html.in | \
+	   $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking2.xsl - \
+	   | perl -0777 -pe 's/\n\n+$$/\n/' \
+	   > $@-t && mv $@-t $@ ; fi;
+
+rpm: clean
+	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz)
+
+check-local: all tests
+
+check-access:
+	@($(MAKE) $(AM_MAKEFLAGS) -C tests check-access)
+
+cov: clean-cov
+	$(MKDIR_P) $(top_builddir)/coverage
+	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \
+	  -d $(top_builddir)/src  -d $(top_builddir)/daemon \
+	  -d $(top_builddir)/tests
+	$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \
+	  -o $(top_builddir)/coverage/libvirt.info
+	rm $(top_builddir)/coverage/libvirt.info.tmp
+	$(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \
+	  --legend $(top_builddir)/coverage/libvirt.info
+
+clean-cov:
+	rm -rf $(top_builddir)/coverage
+
+MAINTAINERCLEANFILES = .git-module-status
+
+dist-hook: gen-ChangeLog gen-AUTHORS
+
+# Generate the ChangeLog file (with all entries since the switch to git)
+# and insert it into the directory we're about to use to create a tarball.
+gen_start_date = 2009-07-04
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+	$(AM_V_GEN)if test -d .git; then			\
+	  $(top_srcdir)/build-aux/gitlog-to-changelog		\
+	    --since=$(gen_start_date) > $(distdir)/cl-t;	\
+	  rm -f $(distdir)/ChangeLog;				\
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
+	fi
+
+.PHONY: gen-AUTHORS
+gen-AUTHORS:
+	$(AM_V_GEN)if test -d $(srcdir)/.git; then \
+	    out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \
+	    perl -p -e "s/#authorslist#// and print '$$out'" \
+	      < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \
+	    mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
+	fi
--- a/build-aux/Makefile.nonreentrant
+++ b/build-aux/Makefile.nonreentrant
@@ -15,9 +15,9 @@
 ## <http://www.gnu.org/licenses/>.

 #
-# Generated by running the following on Fedora 26:
+# Generated by running the following on Fedora 9:
 #
-#  nm -D --defined-only /lib64/libc.so.6 \
+#  nm -D --defined-only /lib/libc.so.6  \
 #      | grep '_r$' \
 #      | awk '{print $3}' \
 #      | grep -v __ \
@@ -43,7 +43,6 @@ NON_REENTRANT += ether_ntoa
 NON_REENTRANT += fcvt
 NON_REENTRANT += fgetgrent
 NON_REENTRANT += fgetpwent
-NON_REENTRANT += fgetsgent
 NON_REENTRANT += fgetspent
 NON_REENTRANT += getaliasbyname
 NON_REENTRANT += getaliasent
@@ -73,8 +72,6 @@ NON_REENTRANT += getrpcent
 NON_REENTRANT += getservbyname
 NON_REENTRANT += getservbyport
 NON_REENTRANT += getservent
-NON_REENTRANT += getsgent
-NON_REENTRANT += getsgnam
 NON_REENTRANT += getspent
 NON_REENTRANT += getspnam
 NON_REENTRANT += getutent
@@ -98,7 +95,6 @@ NON_REENTRANT += random
 NON_REENTRANT += rand
 NON_REENTRANT += seed48
 NON_REENTRANT += setstate
-NON_REENTRANT += sgetsgent
 NON_REENTRANT += sgetspent
 NON_REENTRANT += srand48
 NON_REENTRANT += srandom
--- a/NEWS.rst
+++ b/NEWS.rst
--- a/13
+++ b/13
@@ -0,0 +1,13 @@
+
+         LibVirt : simple API for virtualization
+
+  Libvirt is a C toolkit to interact with the virtualization capabilities
+of recent versions of Linux (and other OSes). It is free software
+available under the GNU Lesser General Public License. Virtualization of
+the Linux Operating System means the ability to run multiple instances of
+Operating Systems concurrently on a single hardware system where the basic
+resources are driven by a Linux instance. The library aim at providing
+long term stable C API initially for the Xen paravirtualization but
+should be able to integrate other virtualization mechanisms if needed.
+
+Daniel Veillard <veillard@redhat.com>
--- a/57
+++ b/57
@@ -0,0 +1,57 @@
+-*- outline -*-
+
+These notes intend to help people working on the checked-out sources.
+These requirements do not apply when building from a distribution tarball.
+See also HACKING for more detailed libvirt contribution guidelines.
+
+* Requirements
+
+We've opted to keep only the highest-level sources in the GIT repository.
+This eases our maintenance burden, (fewer merges etc.), but imposes more
+requirements on anyone wishing to build from the just-checked-out sources.
+Note the requirements to build the released archive are much less and
+are just the requirements of the standard ./configure && make procedure.
+Specific development tools and versions will be checked for and listed by
+the bootstrap script.
+
+Valgrind <http://valgrind.org/> is also highly recommended, if
+Valgrind supports your architecture.
+
+While building from a just-cloned source tree may require installing a
+few prerequisites, later, a plain `git pull && make' should be sufficient.
+
+* First GIT checkout
+
+You can get a copy of the source repository like this:
+
+        $ git clone git://libvirt.org/libvirt
+        $ cd libvirt
+
+As an optional step, if you already have a copy of the gnulib git
+repository on your hard drive, then you can use it as a reference to
+reduce download time and disk space requirements:
+
+        $ export GNULIB_SRCDIR=/path/to/gnulib
+
+The next step is to get all required pieces from gnulib,
+to run autoreconf, and to invoke ./configure:
+
+        $ ./autogen.sh
+
+And there you are!  Just
+
+        $ make
+        $ make check
+
+At this point, there should be no difference between your local copy,
+and the GIT master copy:
+
+        $ git diff
+
+should output no difference.
+
+Enjoy!
+
+Local Variables:
+indent-tabs-mode: nil
+End:
--- a/README.rst
+++ b/README.rst
@@ -1,72 +0,0 @@
-.. image:: https://gitlab.com/libvirt/libvirt/badges/master/pipeline.svg
-     :target: https://gitlab.com/libvirt/libvirt/pipelines
-     :alt: GitLab CI Build Status
-.. image:: https://bestpractices.coreinfrastructure.org/projects/355/badge
-     :target: https://bestpractices.coreinfrastructure.org/projects/355
-     :alt: CII Best Practices
-.. image:: https://translate.fedoraproject.org/widgets/libvirt/-/libvirt/svg-badge.svg
-     :target: https://translate.fedoraproject.org/engage/libvirt/
-     :alt: Translation status
-
-==============================
-Libvirt API for virtualization
-==============================
-
-Libvirt provides a portable, long term stable C API for managing the
-virtualization technologies provided by many operating systems. It
-includes support for QEMU, KVM, Xen, LXC, bhyve, Virtuozzo, VMware
-vCenter and ESX, VMware Desktop, Hyper-V, VirtualBox and the POWER
-Hypervisor.
-
-For some of these hypervisors, it provides a stateful management
-daemon which runs on the virtualization host allowing access to the
-API both by non-privileged local users and remote users.
-
-Layered packages provide bindings of the libvirt C API into other
-languages including Python, Perl, PHP, Go, Java, OCaml, as well as
-mappings into object systems such as GObject, CIM and SNMP.
-
-Further information about the libvirt project can be found on the
-website:
-
-https://libvirt.org
-
-
-License
-=======
-
-The libvirt C API is distributed under the terms of GNU Lesser General
-Public License, version 2.1 (or later). Some parts of the code that are
-not part of the C library may have the more restrictive GNU General
-Public License, version 2.0 (or later). See the files ``COPYING.LESSER``
-and ``COPYING`` for full license terms & conditions.
-
-
-Installation
-============
-
-Instructions on building and installing libvirt can be found on the website:
-
-https://libvirt.org/compiling.html
-
-Contributing
-============
-
-The libvirt project welcomes contributions in many ways. For most components
-the best way to contribute is to send patches to the primary development
-mailing list. Further guidance on this can be found on the website:
-
-https://libvirt.org/contribute.html
-
-
-Contact
-=======
-
-The libvirt project has two primary mailing lists:
-
-* libvirt-users@redhat.com (**for user discussions**)
-* libvir-list@redhat.com (**for development only**)
-
-Further details on contacting the project are available on the website:
-
-https://libvirt.org/contact.html
--- a/22
+++ b/22
@@ -0,0 +1,22 @@
+         libvirt TODO list
+         =================
+
+The TODO list changes frequently, so is maintained online
+in the libvirt bugzilla
+
+  http://bugzilla.redhat.com/
+
+Search against
+
+    Product: Virtualization Tools
+  Component: libvirt
+    Subject: RFE
+
+Or browse dependent bugs under
+
+  https://bugzilla.redhat.com/show_bug.cgi?id=libvirtTodo
+
+Summarized reports automatically generated from bugzilla
+and provided online at
+
+  http://libvirt.org/todo.html
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+set -e
+set -v
+
+# Make things clean.
+
+test -n "$1" && RESULTS=$1 || RESULTS=results.log
+: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder}
+
+# If run under the autobuilder, we must use --nodeps with rpmbuild;
+# but this can lead to odd error diagnosis for normal development.
+nodeps=
+if test "${AUTOBUILD_COUNTER+set}"; then
+  nodeps=--nodeps
+fi
+
+test -f Makefile && make -k distclean || :
+rm -rf coverage
+
+rm -rf build
+mkdir build
+cd build
+
+# Run with options not normally exercised by the rpm build, for
+# more complete code coverage.
+../autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \
+  --enable-expensive-tests \
+  --enable-test-coverage \
+  --disable-nls \
+  --enable-werror \
+  --enable-static
+
+# If the MAKEFLAGS envvar does not yet include a -j option,
+# add -jN where N depends on the number of processors.
+case $MAKEFLAGS in
+  *-j*) ;;
+  *) n=$(getconf _NPROCESSORS_ONLN 2> /dev/null)
+    test "$n" -gt 0 || n=1
+    n=$(expr $n + 1)
+    MAKEFLAGS="$MAKEFLAGS -j$n"
+    export MAKEFLAGS
+    ;;
+esac
+
+make
+make install
+
+# set -o pipefail is a bashism; this use of exec is the POSIX alternative
+exec 3>&1
+st=$(
+  exec 4>&1 >&3
+  { make check syntax-check 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS"
+)
+exec 3>&-
+test "$st" = 0
+test -x /usr/bin/lcov && make cov
+
+rm -f *.tar.xz
+make dist
+
+if test -n "$AUTOBUILD_COUNTER" ; then
+  EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER"
+else
+  NOW=`date +"%s"`
+  EXTRA_RELEASE=".$USER$NOW"
+fi
+
+if test -f /usr/bin/rpmbuild ; then
+  rpmbuild $nodeps \
+     --define "extra_release $EXTRA_RELEASE" \
+     --define "_sourcedir `pwd`" \
+     -ba --clean libvirt.spec
+fi
+
+# Test mingw32 cross-compile
+if test -x /usr/bin/i686-w64-mingw32-gcc ; then
+  make distclean
+
+  PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" \
+  PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
+  CC="i686-w64-mingw32-gcc" \
+  ../configure \
+    --build=$(uname -m)-w64-linux \
+    --host=i686-w64-mingw32 \
+    --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \
+    --enable-expensive-tests \
+    --enable-werror
+
+  make
+  make install
+
+fi
+
+# Test mingw64 cross-compile
+if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
+  make distclean
+
+  PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" \
+  PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
+  CC="x86_64-w64-mingw32-gcc" \
+  ../configure \
+    --build=$(uname -m)-w64-linux \
+    --host=x86_64-w64-mingw32 \
+    --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \
+    --enable-expensive-tests \
+    --enable-werror
+
+  make
+  make install
+
+fi
+
+
+if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
+  if test -f /usr/bin/rpmbuild ; then
+    rpmbuild $nodeps \
+       --define "extra_release $EXTRA_RELEASE" \
+       --define "_sourcedir `pwd`" \
+       -ba --clean mingw-libvirt.spec
+  fi
+fi
--- a/autogen.sh
+++ b/autogen.sh
@@ -0,0 +1,117 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+set -e
+
+srcdir=`dirname "$0"`
+test -z "$srcdir" && srcdir=.
+
+THEDIR=`pwd`
+cd "$srcdir"
+
+test -f src/libvirt.c || {
+    echo "You must run this script in the top-level libvirt directory"
+    exit 1
+}
+
+
+EXTRA_ARGS=
+no_git=
+if test "x$1" = "x--no-git"; then
+  no_git=" $1"
+  shift
+  case "$1 $2" in
+    --gnulib-srcdir=*) no_git="$no_git $1"; shift ;;
+    --gnulib-srcdir\ *) no_git="$no_git $1=$2"; shift; shift;;
+  esac
+fi
+if test -z "$NOCONFIGURE" ; then
+  if test "x$1" = "x--system"; then
+    shift
+    prefix=/usr
+    libdir=$prefix/lib
+    sysconfdir=/etc
+    localstatedir=/var
+    if [ -d /usr/lib64 ]; then
+      libdir=$prefix/lib64
+    fi
+    EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir"
+    echo "Running ./configure with $EXTRA_ARGS $@"
+  else
+    if test -z "$*" && test ! -f "$THEDIR/config.status"; then
+        echo "I am going to run ./configure with no arguments - if you wish"
+        echo "to pass any to it, please specify them on the $0 command line."
+    fi
+  fi
+fi
+
+# Compute the hash we'll use to determine whether rerunning bootstrap
+# is required.  The first is just the SHA1 that selects a gnulib snapshot.
+# The second ensures that whenever we change the set of gnulib modules used
+# by this package, we rerun bootstrap to pull in the matching set of files.
+# The third ensures that whenever we change the set of local gnulib diffs,
+# we rerun bootstrap to pull in those diffs.
+bootstrap_hash()
+{
+    if test "$no_git"; then
+        echo no-git
+        return
+    fi
+    git submodule status | sed 's/^[ +-]//;s/ .*//'
+    git hash-object bootstrap.conf
+    git ls-tree -d HEAD gnulib/local | awk '{print $3}'
+}
+
+# Ensure that whenever we pull in a gnulib update or otherwise change to a
+# different version (i.e., when switching branches), we also rerun ./bootstrap.
+# Also, running 'make rpm' tends to litter the po/ directory, and some people
+# like to run 'git clean -x -f po' to fix it; but only ./bootstrap regenerates
+# the required file po/Makevars.
+# Only run bootstrap from a git checkout, never from a tarball.
+if test -d .git || test -f .git; then
+    curr_status=.git-module-status t=
+    if test "$no_git"; then
+        t=no-git
+    elif test -d .gnulib; then
+        t=$(bootstrap_hash; git diff .gnulib)
+    fi
+    case $t:${CLEAN_SUBMODULE+set} in
+        *:set) ;;
+        *-dirty*)
+            echo "error: gnulib submodule is dirty, please investigate" 2>&1
+            echo "set env-var CLEAN_SUBMODULE to discard gnulib changes" 2>&1
+            exit 1 ;;
+    esac
+    # Keep this test in sync with cfg.mk:_update_required
+    if test "$t" = "$(cat $curr_status 2>/dev/null)" \
+        && test -f "po/Makevars" && test -f AUTHORS; then
+        # good, it's up to date, all we need is autoreconf
+        autoreconf -if
+    else
+        if test -z "$no_git" && test ${CLEAN_SUBMODULE+set}; then
+            echo cleaning up submodules...
+            git submodule foreach 'git clean -dfqx && git reset --hard'
+        fi
+        echo running bootstrap$no_git...
+        ./bootstrap$no_git --bootstrap-sync && bootstrap_hash > $curr_status \
+            || { echo "Failed to bootstrap, please investigate."; exit 1; }
+    fi
+fi
+
+test -n "$NOCONFIGURE" && exit 0
+
+cd "$THEDIR"
+
+if test "x$OBJ_DIR" != x; then
+    mkdir -p "$OBJ_DIR"
+    cd "$OBJ_DIR"
+fi
+
+if test -z "$*" && test -z "$EXTRA_ARGS" && test -f config.status; then
+    ./config.status --recheck
+else
+    $srcdir/configure $EXTRA_ARGS "$@"
+fi && {
+    echo
+    echo "Now type 'make' to compile libvirt."
+}
--- a/1026
+++ b/1026
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -0,0 +1,239 @@
+# Bootstrap configuration.
+
+# Copyright (C) 2010-2014 Red Hat, Inc.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+# gnulib modules used by this package.
+gnulib_modules='
+accept
+areadlink
+autobuild
+base64
+bind
+bitrotate
+byteswap
+c-ctype
+c-strcase
+c-strcasestr
+calloc-posix
+canonicalize-lgpl
+chown
+clock-time
+close
+connect
+configmake
+count-leading-zeros
+count-one-bits
+crypto/md5
+crypto/sha256
+dirname-lgpl
+environ
+execinfo
+fclose
+fcntl
+fcntl-h
+fdatasync
+ffs
+ffsl
+fnmatch
+fsync
+func
+getaddrinfo
+getcwd-lgpl
+gethostname
+getopt-posix
+getpass
+getpeername
+getsockname
+gettext-h
+gettimeofday
+gitlog-to-changelog
+gnumakefile
+ignore-value
+inet_pton
+intprops
+ioctl
+isatty
+largefile
+ldexp
+listen
+localeconv
+maintainer-makefile
+manywarnings
+mgetgroups
+mkdtemp
+mkostemp
+mkostemps
+mktempd
+net_if
+netdb
+nonblocking
+openpty
+passfd
+perror
+physmem
+pipe-posix
+pipe2
+poll
+posix-shell
+pthread
+pthread_sigmask
+recv
+regex
+random_r
+sched
+secure_getenv
+send
+setenv
+setsockopt
+sigaction
+sigpipe
+snprintf
+socket
+stat-time
+stdarg
+stpcpy
+strchrnul
+strdup-posix
+strndup
+strerror
+strerror_r-posix
+strptime
+strsep
+strtok_r
+sys_stat
+sys_wait
+termios
+time_r
+timegm
+ttyname_r
+uname
+unsetenv
+useless-if-before-free
+usleep
+vasprintf
+verify
+vc-list-files
+vsnprintf
+waitpid
+warnings
+'
+
+# Additional xgettext options to use.  Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
+ --flag=virAsprintf:2:c-format\\\
+ --from-code=UTF-8\\\
+'
+
+# This is not a GNU package, so the default bug address is invalid,
+# and the translation project is not in use.
+MSGID_BUGS_ADDRESS=libvir-list@redhat.com
+COPYRIGHT_HOLDER='Red Hat, Inc.'
+SKIP_PO=true
+
+# Enable copy-mode for MSYS/MinGW. MSYS' ln doesn't work well in the way
+# bootstrap uses it with relative paths.
+if test -n "$MSYSTEM"; then
+    copy=true
+fi
+
+# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
+# appears in configure.ac, exclude some unnecessary files.
+# Without grep's -E option (not portable enough, pre-configure),
+# the following test is ugly.  Also, this depends on the existence
+# of configure.ac, not the obsolescent-named configure.in.  But if
+# you're using this infrastructure, you should care about such things.
+
+gettext_external=0
+grep '^[	 ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
+  gettext_external=1
+grep '^[	 ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
+  gettext_external=1
+
+if test $gettext_external = 1; then
+  # Gettext supplies these files, but we don't need them since
+  # we don't have an intl subdirectory.
+  excluded_files='
+      m4/glibc2.m4
+      m4/intdiv0.m4
+      m4/lcmessage.m4
+      m4/uintmax_t.m4
+      m4/ulonglong.m4
+      m4/visibility.m4
+  '
+fi
+
+# Tell gnulib to:
+#   require LGPLv2+
+#   apply any local diffs in gnulib/local/ dir
+#   put *.m4 files in m4/ dir
+#   put *.[ch] files in new gnulib/lib/ dir
+#   import gnulib tests in new gnulib/tests/ dir
+gnulib_name=libgnu
+m4_base=m4
+source_base=gnulib/lib
+tests_base=gnulib/tests
+gnulib_tool_option_extras="\
+ --lgpl=2\
+ --with-tests\
+ --makefile-name=gnulib.mk\
+ --avoid=pt_chown\
+ --avoid=lock-tests\
+"
+local_gl_dir=gnulib/local
+
+# Build prerequisites
+# Note that some of these programs are only required for 'make dist' to
+# succeed from a fresh git checkout; not all of these programs are
+# required to run 'make dist' on a tarball.
+buildreq="\
+autoconf   2.59
+automake   1.9.6
+autopoint  -
+gettext    0.17
+git        1.5.5
+gzip       -
+libtool    -
+patch      -
+perl       5.5
+pkg-config -
+rpcgen     -
+tar        -
+xmllint	   -
+xsltproc   -
+"
+
+# Automake requires that ChangeLog and AUTHORS exist.
+touch AUTHORS ChangeLog || exit 1
+
+# Override bootstrap's list - we don't use mdate-sh or texinfo.tex.
+gnulib_extra_files="
+        build-aux/install-sh
+        build-aux/depcomp
+        build-aux/config.guess
+        build-aux/config.sub
+        doc/INSTALL
+"
+
+
+bootstrap_post_import_hook()
+{
+  # Change paths in gnulib/tests/gnulib.mk from "../../.." to "../..",
+  # and make tests conditional by changing "TESTS" to "GNULIB_TESTS".
+  m=gnulib/tests/gnulib.mk
+  sed 's,\.\./\.\./\.\.,../..,g; s/^TESTS /GNULIB_TESTS /' $m > $m-t
+  mv -f $m-t $m
+}
--- a/build-aux/Makefile.in
+++ b/build-aux/Makefile.in
@@ -1,12 +0,0 @@
-# define variables
-
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-FLAKE8 = @flake8_path@
-RUNUTF8 = @runutf8@
-PYTHON = @PYTHON3@
-GREP = @GREP@
-SED = @SED@
-
-# include syntax-check.mk file
-include $(top_srcdir)/build-aux/syntax-check.mk
--- a/build-aux/augeas-gentest.pl
+++ b/build-aux/augeas-gentest.pl
@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+#
+# augeas-gentest.pl: Generate an augeas test file, from an
+#                    example config file + test file template
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+# Authors:
+#     Daniel P. Berrange <berrange@redhat.com>
+
+use strict;
+use warnings;
+
+die "syntax: $0 CONFIG TEMPLATE AUGTEST\n" unless @ARGV == 3;
+
+my $config = shift @ARGV;
+my $template = shift @ARGV;
+my $augtest = shift @ARGV;
+
+open AUGTEST, ">", $augtest or die "cannot create $augtest: $!";
+
+$SIG{__DIE__} = sub {
+    unlink $augtest;
+};
+
+open CONFIG, "<", $config or die "cannot read $config: $!";
+open TEMPLATE, "<", $template or die "cannot read $template: $!";
+
+my $group = 0;
+while (<TEMPLATE>) {
+    if (/::CONFIG::/) {
+        my $group = 0;
+        print AUGTEST "  let conf = \"";
+        while (<CONFIG>) {
+            if (/^#\w/) {
+                s/^#//;
+                s/\"/\\\"/g;
+                print AUGTEST $_;
+                $group = /\[\s$/;
+            } elsif ($group) {
+                s/\"/\\\"/g;
+                if (/#\s*\]/) {
+                    $group = 0;
+                }
+                if (/^#/) {
+                    s/^#//;
+                    print AUGTEST $_;
+                }
+            }
+        }
+        print AUGTEST "\"\n";
+    } else {
+        print AUGTEST $_;
+    }
+}
+
+close TEMPLATE;
+close CONFIG;
+close AUGTEST or die "cannot save $augtest: $!";
--- a/build-aux/check-spacing.pl
+++ b/build-aux/check-spacing.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 #
 # check-spacing.pl: Report any usage of 'function (..args..)'
 # Also check for other syntax issues, such as correct use of ';'
@@ -16,6 +16,9 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
+#
+# Authors:
+#     Daniel P. Berrange <berrange@redhat.com>

 use strict;
 use warnings;
@@ -24,6 +27,11 @@ my $ret = 0;
 my $incomment = 0;

 foreach my $file (@ARGV) {
+    # Per-file variables for multiline Curly Bracket (cb_) check
+    my $cb_linenum = 0;
+    my $cb_code = "";
+    my $cb_scolon = 0;
+
    open FILE, $file;

    while (defined (my $line = <FILE>)) {
@@ -37,6 +45,9 @@ foreach my $file (@ARGV) {
        # Kill any quoted strings
        $data =~ s,"(?:[^\\\"]|\\.)*","XXX",g;

+        # Kill any C++ style comments
+        $data =~ s,//.*$,//,;
+
        next if $data =~ /^#/;

        # Kill contents of multi-line comments
@@ -155,6 +166,37 @@ foreach my $file (@ARGV) {
            print "$file:$.: $line";
            $ret = 1;
        }
+
+        # One line conditional statements with one line bodies should
+        # not use curly brackets.
+        if ($data =~ /^\s*(if|while|for)\b.*\{$/) {
+            $cb_linenum = $.;
+            $cb_code = $line;
+            $cb_scolon = 0;
+        }
+
+        # We need to check for exactly one semicolon inside the body,
+        # because empty statements (e.g. with comment only) are
+        # allowed
+        if ($cb_linenum == $. - 1 && $data =~ /^[^;]*;[^;]*$/) {
+            $cb_code .= $line;
+            $cb_scolon = 1;
+        }
+
+        if ($data =~ /^\s*}\s*$/ &&
+            $cb_linenum == $. - 2 &&
+            $cb_scolon) {
+
+            print "Curly brackets around single-line body:\n";
+            print "$file:$cb_linenum-$.:\n$cb_code$line";
+            $ret = 1;
+
+            # There _should_ be no need to reset the values; but to
+            # keep my inner peace...
+            $cb_linenum = 0;
+            $cb_scolon = 0;
+            $cb_code = "";
+        }
    }
    close FILE;
 }
--- a/build-aux/meson.build
+++ b/build-aux/meson.build
@@ -1,69 +0,0 @@
-syntax_check_conf = configuration_data()
-syntax_check_conf.set('top_srcdir', meson.source_root())
-syntax_check_conf.set('top_builddir', meson.build_root())
-
-flake8_path = ''
-if flake8_prog.found()
-  flake8_path = flake8_prog.path()
-endif
-syntax_check_conf.set('flake8_path', flake8_path)
-syntax_check_conf.set('runutf8', ' '.join(runutf8))
-syntax_check_conf.set('PYTHON3', python3_prog.path())
-
-if host_machine.system() == 'freebsd' or host_machine.system() == 'darwin'
-  make_prog = find_program('gmake')
-  sed_prog = find_program('gsed')
-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
-
-syntax_check_conf.set('GREP', grep_prog.path())
-syntax_check_conf.set('SED', sed_prog.path())
-
-configure_file(
-  input: 'Makefile.in',
-  output: '@BASENAME@',
-  configuration: syntax_check_conf,
-)
-
-rc = run_command(
-  'sed', '-n',
-  's/^\\(sc_[a-zA-Z0-9_-]*\\):.*/\\1/p',
-  meson.current_source_dir() / 'syntax-check.mk',
-  check: true,
-)
-
-sc_tests = rc.stdout().strip().split()
-
-
-# Skip syntax-check if not building from git because we get the list of files
-# to check using git commands and it fails if we are not in git repository.
-if git
-  foreach target : sc_tests
-    test(
-      target,
-      make_prog,
-      args: [ '-C', meson.current_build_dir(), target ],
-      depends: [
-        potfiles_dep,
-      ],
-      suite: 'syntax-check',
-    )
-  endforeach
-endif
--- a/build-aux/prohibit-duplicate-header.pl
+++ b/build-aux/prohibit-duplicate-header.pl
@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+use strict;
+
+my $file = " ";
+my $ret = 0;
+my %includes = ( );
+my $lineno = 0;
+
+while (<>) {
+    if (not $file eq $ARGV) {
+        %includes = ( );
+        $file = $ARGV;
+        $lineno = 0;
+    }
+    $lineno++;
+    if (/^# *include *[<"]([^>"]*\.h)[">]/) {
+        $includes{$1}++;
+        if ($includes{$1} == 2) {
+            $ret = 1;
+            print STDERR "$ARGV:$lineno: $_";
+            print STDERR "Do not include a header more than once per file\n";
+        }
+    }
+}
+exit $ret;
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
--- a/cfg.mk
+++ b/cfg.mk
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -1,245 +0,0 @@
-# -*- makefile -*-
-# vim: filetype=make
-
-# The root directory of the libvirt.git checkout
-CI_GIT_ROOT = $(shell git rev-parse --show-toplevel)
-
-# The root directory for all CI-related contents
-CI_ROOTDIR = $(CI_GIT_ROOT)/ci
-
-# The directory holding content on the host that we will
-# expose to the container.
-CI_SCRATCHDIR = $(CI_ROOTDIR)/scratch
-
-# The directory holding the clone of the git repo that
-# we will expose to the container
-CI_HOST_SRCDIR = $(CI_SCRATCHDIR)/src
-
-# The directory holding the source inside the
-# container, i.e. where we want to expose
-# the $(CI_HOST_SRCDIR) directory from the host
-CI_CONT_SRCDIR = $(CI_USER_HOME)/libvirt
-
-# Script containing build instructions
-CI_BUILD_SCRIPT = $(CI_ROOTDIR)/build.sh
-
-# Location of the container images we're going to pull
-# Can be useful to override to use a locally built
-# image instead
-CI_IMAGE_PREFIX = registry.gitlab.com/libvirt/libvirt/ci-
-
-# The default tag is ':latest' but if the container
-# repo above uses different conventions this can override it
-CI_IMAGE_TAG = :latest
-
-# We delete the virtual root after completion, set
-# to 0 if you need to keep it around for debugging
-CI_CLEAN = 1
-
-# We'll always freshly clone the virtual root each
-# time in case it was not cleaned up before. Set
-# to 1 if you want to try restarting a previously
-# preserved env
-CI_REUSE = 0
-
-# We need the user's login and home directory to prepare the
-# environment the way some programs expect it
-CI_USER_LOGIN = $(shell whoami)
-CI_USER_HOME = $(shell eval echo "~$(CI_USER_LOGIN)")
-
-# We also need the container process to run with current host IDs
-# so that it can access the passed in build directory
-CI_UID = $(shell id -u "$(CI_USER_LOGIN)")
-CI_GID = $(shell id -g "$(CI_USER_LOGIN)")
-
-CI_ENGINE = auto
-# Container engine we are going to use, can be overridden per make
-# invocation, if it is not we try podman and then default to docker.
-ifeq ($(CI_ENGINE),auto)
-	override CI_ENGINE = $(shell podman version >/dev/null 2>&1 && echo podman || echo docker)
-endif
-
-# IDs you run as do not need to exist in
-# the container's /etc/passwd & /etc/group files, but
-# if they do not, then libvirt's 'ninja test' will fail
-# many tests.
-
-# We do not directly mount /etc/{passwd,group} as Docker
-# is liable to mess with SELinux labelling which will
-# then prevent the host accessing them. And podman cannot
-# relabel the files due to it running rootless. So
-# copying them first is safer and less error-prone.
-CI_PWDB_MOUNTS = \
-	--volume $(CI_SCRATCHDIR)/group:/etc/group:ro,z \
-	--volume $(CI_SCRATCHDIR)/passwd:/etc/passwd:ro,z \
-	$(NULL)
-
-CI_HOME_MOUNTS = \
-	--volume $(CI_SCRATCHDIR)/home:$(CI_USER_HOME):z \
-	$(NULL)
-
-CI_SCRIPT_MOUNTS = \
-	--volume $(CI_SCRATCHDIR)/build:$(CI_USER_HOME)/build:z \
-	$(NULL)
-
-# Docker containers can have very large ulimits
-# for nofiles - as much as 1048576. This makes
-# libvirt very slow at exec'ing programs.
-CI_ULIMIT_FILES = 1024
-
-ifeq ($(CI_ENGINE),podman)
-	# Podman cannot reuse host namespace when running non-root
-	# containers.  Until support for --keep-uid is added we can
-	# just create another mapping that will do that for us.
-	# Beware, that in {uid,git}map=container_id:host_id:range, the
-	# host_id does actually refer to the uid in the first mapping
-	# where 0 (root) is mapped to the current user and rest is
-	# offset.
-	#
-	# In order to set up this mapping, we need to keep all the
-	# user IDs to prevent possible errors as some images might
-	# expect UIDs up to 90000 (looking at you fedora), so we don't
-	# want the overflowuid to be used for them.  For mapping all
-	# the other users properly, some math needs to be done.
-	# Don't worry, it's just addition and subtraction.
-	#
-	# 65536 ought to be enough (tm), but for really rare cases the
-	# maximums might need to be higher, but that only happens when
-	# your /etc/sub{u,g}id allow users to have more IDs.  Unless
-	# --keep-uid is supported, let's do this in a way that should
-	# work for everyone.
-	CI_MAX_UID = $(shell sed -n "s/^$(CI_USER_LOGIN):[^:]\+://p" /etc/subuid)
-	CI_MAX_GID = $(shell sed -n "s/^$(CI_USER_LOGIN):[^:]\+://p" /etc/subgid)
-	ifeq ($(CI_MAX_UID),)
-		CI_MAX_UID = 65536
-	endif
-	ifeq ($(CI_MAX_GID),)
-		CI_MAX_GID = 65536
-	endif
-	CI_UID_OTHER = $(shell echo $$(($(CI_UID)+1)))
-	CI_GID_OTHER = $(shell echo $$(($(CI_GID)+1)))
-	CI_UID_OTHER_RANGE = $(shell echo $$(($(CI_MAX_UID)-$(CI_UID))))
-	CI_GID_OTHER_RANGE = $(shell echo $$(($(CI_MAX_GID)-$(CI_GID))))
-
-	ifneq ($(CI_UID), 0)
-		CI_PODMAN_ARGS = \
-			--uidmap 0:1:$(CI_UID) \
-			--uidmap $(CI_UID):0:1 \
-			--uidmap $(CI_UID_OTHER):$(CI_UID_OTHER):$(CI_UID_OTHER_RANGE) \
-			--gidmap 0:1:$(CI_GID) \
-			--gidmap $(CI_GID):0:1 \
-			--gidmap $(CI_GID_OTHER):$(CI_GID_OTHER):$(CI_GID_OTHER_RANGE) \
-			$(NULL)
-	endif
-endif
-
-# Args to use when cloning a git repo.
-#  -c  stop it complaining about checking out a random hash
-#  -q  stop it displaying progress info for local clone
-#  --local ensure we don't actually copy files
-CI_GIT_ARGS = \
-	-c advice.detachedHead=false \
-	-q \
-	--local  \
-	$(NULL)
-
-# Args to use when running the container
-#   --rm      stop inactive containers getting left behind
-#   --user    we execute as the same user & group account
-#             as dev so that file ownership matches host
-#             instead of root:root
-#   --workdir we change to user's home dir in the container
-#             before running the workload
-#   --volume  to pass in the cloned git repo & config
-#   --ulimit  lower files limit for performance reasons
-#   --interactive
-#   --tty     Ensure we have ability to Ctrl-C the build
-CI_ENGINE_ARGS = \
-	--rm \
-	--interactive \
-	--tty \
-	--user "$(CI_UID)":"$(CI_GID)" \
-	--workdir "$(CI_USER_HOME)" \
-	--env CI_CONT_SRCDIR="$(CI_CONT_SRCDIR)" \
-	--env CI_MESON_ARGS="$(CI_MESON_ARGS)" \
-	--env CI_NINJA_ARGS="$(CI_NINJA_ARGS)" \
-	$(CI_PODMAN_ARGS) \
-	$(CI_PWDB_MOUNTS) \
-	$(CI_HOME_MOUNTS) \
-	$(CI_SCRIPT_MOUNTS) \
-	--volume $(CI_HOST_SRCDIR):$(CI_CONT_SRCDIR):z \
-	--ulimit nofile=$(CI_ULIMIT_FILES):$(CI_ULIMIT_FILES) \
-	--cap-add=SYS_PTRACE \
-	$(NULL)
-
-ci-check-engine:
-	@echo -n "Checking if $(CI_ENGINE) is available..." && \
-	$(CI_ENGINE) version 1>/dev/null && echo "yes"
-
-ci-prepare-tree: ci-check-engine
-	@test "$(CI_REUSE)" != "1" && rm -rf $(CI_SCRATCHDIR) || :
-	@if ! test -d $(CI_SCRATCHDIR) ; then \
-		mkdir -p $(CI_SCRATCHDIR); \
-		cp /etc/passwd $(CI_SCRATCHDIR); \
-		cp /etc/group $(CI_SCRATCHDIR); \
-		mkdir -p $(CI_SCRATCHDIR)/home; \
-		cp "$(CI_BUILD_SCRIPT)" $(CI_SCRATCHDIR)/build; \
-		chmod +x "$(CI_SCRATCHDIR)/build"; \
-		echo "Cloning $(CI_GIT_ROOT) to $(CI_HOST_SRCDIR)"; \
-		git clone $(CI_GIT_ARGS) $(CI_GIT_ROOT) $(CI_HOST_SRCDIR) || exit 1; \
-		for mod in $$(git submodule | awk '{ print $$2 }' | sed -E 's,^../,,g') ; \
-		do \
-			test -f $(CI_GIT_ROOT)/$$mod/.git || continue ; \
-			echo "Cloning $(CI_GIT_ROOT)/$$mod to $(CI_HOST_SRCDIR)/$$mod"; \
-			git clone $(CI_GIT_ARGS) $(CI_GIT_ROOT)/$$mod $(CI_HOST_SRCDIR)/$$mod || exit 1; \
-		done ; \
-	fi
-
-ci-run-command@%: ci-prepare-tree
-	$(CI_ENGINE) run \
-		$(CI_ENGINE_ARGS) \
-		$(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG) \
-		$(CI_COMMAND)
-	@test "$(CI_CLEAN)" = "1" && rm -rf $(CI_SCRATCHDIR) || :
-
-ci-shell@%:
-	$(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND="/bin/bash"
-
-ci-build@%:
-	$(MAKE) -C $(CI_ROOTDIR) ci-run-command@$* CI_COMMAND="$(CI_USER_HOME)/build"
-
-ci-test@%:
-	$(MAKE) -C $(CI_ROOTDIR) ci-build@$* CI_NINJA_ARGS=test
-
-ci-help:
-	@echo
-	@echo
-	@echo
-	@echo "      !!!  PLEASE DON'T USE THIS DIRECTLY  !!!"
-	@echo
-	@echo "          Use the ci/helper script instead"
-	@echo
-	@echo "      !!!  PLEASE DON'T USE THIS DIRECTLY  !!!"
-	@echo
-	@echo
-	@echo
-	@echo "Build libvirt inside containers used for CI"
-	@echo
-	@echo "Available targets:"
-	@echo
-	@echo "    ci-build@\$$IMAGE - run a default 'ninja' build"
-	@echo "    ci-test@\$$IMAGE  - run a 'ninja test'"
-	@echo "    ci-shell@\$$IMAGE - run an interactive shell"
-	@echo "    ci-help         - show this help message"
-	@echo
-	@echo "Available make variables:"
-	@echo
-	@echo "    CI_CLEAN=0              - do not delete '$(CI_SCRATCHDIR)' after completion"
-	@echo "    CI_REUSE=1              - re-use existing '$(CI_SCRATCHDIR)' content"
-	@echo "    CI_ENGINE=auto          - container engine to use (podman, docker)"
-	@echo "    CI_USER_LOGIN=          - which user should run in the container (default is $$USER)"
-	@echo "    CI_IMAGE_PREFIX=        - override to prefer a locally built image, (default is $(CI_IMAGE_PREFIX))"
-	@echo "    CI_IMAGE_TAG=:latest    - optionally use in conjunction with 'CI_IMAGE_PREFIX'"
-	@echo "    CI_MESON_ARGS=          - extra arguments passed to meson"
-	@echo "    CI_NINJA_ARGS=          - extra arguments passed to ninja"
-	@echo
--- a/ci/README.rst
+++ b/ci/README.rst
@@ -1,87 +0,0 @@
-==============
-CI for libvirt
-==============
-
-This document provides some information related to the CI capabilities for the
-libvirt project.
-
-
-Cirrus CI integration
-=====================
-
-libvirt currently supports three non-Linux operating systems: Windows, FreeBSD
-and macOS. Windows cross-builds can be prepared on Linux by using `MinGW`_, but
-for both FreeBSD and macOS we need to use the actual operating system, and
-unfortunately GitLab shared runners are currently not available for either.
-
-To work around this limitation, we take advantage of `Cirrus CI`_'s free
-offering: more specifically, we use the `cirrus-run`_ script to trigger Cirrus
-CI jobs from GitLab CI jobs so that the workaround is almost entirely
-transparent to users and there's no need to constantly check two separate CI
-dashboards.
-
-There is, however, some one-time setup required. If you want FreeBSD and macOS
-builds to happen when you push to your GitLab repository, you need to
-
-* set up a GitHub repository for the project, eg. ``yourusername/libvirt``.
-  This repository needs to exist for cirrus-run to work, but it doesn't need to
-  be kept up to date, so you can create it and then forget about it;
-
-* enable the `Cirrus CI GitHub app`_  for your GitHub account;
-
-* sign up for Cirrus CI. It's enough to log into the website using your GitHub
-  account;
-
-* grab an API token from the `Cirrus CI settings`_ page;
-
-* it may be necessary to push an empty ``.cirrus.yml`` file to your github fork
-  for Cirrus CI to properly recognize the project. You can check whether
-  Cirrus CI knows about your project by navigating to:
-
-  ``https://cirrus-ci.com/yourusername/libvirt``
-
-* in the *CI/CD / Variables* section of the settings page for your GitLab
-  repository, create two new variables:
-
-  * ``CIRRUS_GITHUB_REPO``, containing the name of the GitHub repository
-    created earlier, eg. ``yourusername/libvirt``;
-
-  * ``CIRRUS_API_TOKEN``, containing the Cirrus CI API token generated earlier.
-    This variable **must** be marked as *Masked*, because anyone with knowledge
-    of it can impersonate you as far as Cirrus CI is concerned.
-
-  Neither of these variables should be marked as *Protected*, because in
-  general you'll want to be able to trigger Cirrus CI builds from non-protected
-  branches.
-
-Once this one-time setup is complete, you can just keep pushing to your GitLab
-repository as usual and you'll automatically get the additional CI coverage.
-
-
-.. _Cirrus CI GitHub app: https://github.com/marketplace/cirrus-ci
-.. _Cirrus CI settings: https://cirrus-ci.com/settings/profile/
-.. _Cirrus CI: https://cirrus-ci.com/
-.. _MinGW: http://mingw.org/
-.. _cirrus-run: https://github.com/sio/cirrus-run/
-
-
-Coverity scan integration
-=========================
-
-This will be used only by the main repository for master branch by running
-scheduled pipeline in GitLab.
-
-The service is proved by `Coverity Scan`_ and requires that the project is
-registered there to get free coverity analysis which we already have for
-`libvirt project`_.
-
-To run the coverity job it requires two new variables:
-
-  * ``COVERITY_SCAN_PROJECT_NAME``, containing the `libvirt project`_
-    name.
-
-  * ``COVERITY_SCAN_TOKEN``, token visible to admins of `libvirt project`_
-
-
-.. _Coverity Scan: https://scan.coverity.com/
-.. _libvirt project: https://scan.coverity.com/projects/libvirt
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# This script is used to build libvirt inside the container.
-#
-# You can customize it to your liking, or alternatively use a
-# completely different script by passing
-#
-#  CI_BUILD_SCRIPT=/path/to/your/build/script
-#
-# to make.
-
-cd "$CI_CONT_SRCDIR"
-
-export VIR_TEST_DEBUG=1
-
-# $MESON_OPTS is an env that can optionally be set in the container,
-# populated at build time from the Dockerfile. A typical use case would
-# be to pass options to trigger cross-compilation
-
-meson build --werror $MESON_OPTS $CI_MESON_ARGS || \
-(cat build/meson-logs/meson-log.txt && exit 1)
-
-ninja -C build $CI_NINJA_ARGS
--- a/ci/cirrus/build.yml
+++ b/ci/cirrus/build.yml
@@ -1,29 +0,0 @@
-@CIRRUS_VM_INSTANCE_TYPE@:
-  @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@
-
-env:
-  CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@"
-  CI_COMMIT_REF_NAME: "@CI_COMMIT_REF_NAME@"
-  CI_COMMIT_SHA: "@CI_COMMIT_SHA@"
-  PATH: "@PATH@"
-  PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@"
-  PYTHON: "@PYTHON@"
-  MAKE: "@MAKE@"
-  VIR_TEST_VERBOSE: "1"
-  VIR_TEST_DEBUG: "1"
-
-build_task:
-  install_script:
-    - @UPDATE_COMMAND@
-    - @UPGRADE_COMMAND@
-    - @INSTALL_COMMAND@ @PKGS@
-    - if test -n "@PYPI_PKGS@" ; then @PIP3@ install @PYPI_PKGS@ ; fi
-  clone_script:
-    - git clone --depth 100 "$CI_REPOSITORY_URL" .
-    - git fetch origin "$CI_COMMIT_REF_NAME"
-    - git reset --hard "$CI_COMMIT_SHA"
-  build_script:
-    - meson setup build
-    - meson dist -C build --no-tests
-    - meson compile -C build
-    - meson test -C build --no-suite syntax-check
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-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 diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
-PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-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 diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
-PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
--- a/ci/cirrus/freebsd-current.vars
+++ b/ci/cirrus/freebsd-current.vars
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-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 diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
-PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
--- a/ci/cirrus/macos-11.vars
+++ b/ci/cirrus/macos-11.vars
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-CCACHE='/usr/local/bin/ccache'
-CPAN_PKGS=''
-CROSS_PKGS=''
-MAKE='/usr/local/bin/gmake'
-NINJA='/usr/local/bin/ninja'
-PACKAGING_COMMAND='brew'
-PIP3='/usr/local/bin/pip3'
-PKGS='augeas bash-completion ccache codespell cppi curl diffutils dnsmasq docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
-PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
--- a/ci/containers/almalinux-8.Dockerfile
+++ b/ci/containers/almalinux-8.Dockerfile
@@ -1,100 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/almalinux:8
-
-RUN dnf update -y && \
-    dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled -y powertools && \
-    dnf install -y centos-release-advanced-virtualization && \
-    dnf install -y epel-release && \
-    dnf install -y \
-        audit-libs-devel \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        clang \
-        cpp \
-        cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        glusterfs-api-devel \
-        gnutls-devel \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        netcf-devel \
-        nfs-utils \
-        ninja-build \
-        numactl-devel \
-        numad \
-        parted-devel \
-        perl \
-        pkgconfig \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        scrub \
-        sed \
-        systemd-devel \
-        systemtap-sdt-devel \
-        wireshark-devel \
-        yajl-devel && \
-    dnf autoremove -y && \
-    dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/alpine-314.Dockerfile
+++ b/ci/containers/alpine-314.Dockerfile
@@ -1,82 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/alpine:3.14
-
-RUN apk update && \
-    apk upgrade && \
-    apk add \
-        acl-dev \
-        attr-dev \
-        audit-dev \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        ceph-dev \
-        clang \
-        curl-dev \
-        cyrus-sasl-dev \
-        diffutils \
-        dnsmasq \
-        eudev-dev \
-        fuse-dev \
-        gcc \
-        gettext \
-        git \
-        glib-dev \
-        gnutls-dev \
-        grep \
-        iproute2 \
-        iptables \
-        kmod \
-        libcap-ng-dev \
-        libnl3-dev \
-        libpcap-dev \
-        libpciaccess-dev \
-        libselinux-dev \
-        libssh-dev \
-        libssh2-dev \
-        libtirpc-dev \
-        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 \
-        python3 \
-        qemu-img \
-        readline-dev \
-        rpcgen \
-        samurai \
-        sed \
-        util-linux-dev \
-        wireshark-dev \
-        xen-dev \
-        yajl-dev && \
-    apk list | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/alpine-edge.Dockerfile
+++ b/ci/containers/alpine-edge.Dockerfile
@@ -1,81 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/alpine:edge
-
-RUN apk update && \
-    apk upgrade && \
-    apk add \
-        acl-dev \
-        attr-dev \
-        audit-dev \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        ceph-dev \
-        clang \
-        curl-dev \
-        cyrus-sasl-dev \
-        diffutils \
-        dnsmasq \
-        eudev-dev \
-        fuse-dev \
-        gcc \
-        gettext \
-        git \
-        glib-dev \
-        gnutls-dev \
-        grep \
-        iproute2 \
-        iptables \
-        kmod \
-        libcap-ng-dev \
-        libnl3-dev \
-        libpcap-dev \
-        libpciaccess-dev \
-        libselinux-dev \
-        libssh-dev \
-        libssh2-dev \
-        libtirpc-dev \
-        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 \
-        python3 \
-        qemu-img \
-        readline-dev \
-        samurai \
-        sed \
-        util-linux-dev \
-        wireshark-dev \
-        xen-dev \
-        yajl-dev && \
-    apk list | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -1,100 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM quay.io/centos/centos:stream8
-
-RUN dnf update -y && \
-    dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled -y powertools && \
-    dnf install -y centos-release-advanced-virtualization && \
-    dnf install -y epel-release && \
-    dnf install -y \
-        audit-libs-devel \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        clang \
-        cpp \
-        cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        glusterfs-api-devel \
-        gnutls-devel \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        netcf-devel \
-        nfs-utils \
-        ninja-build \
-        numactl-devel \
-        numad \
-        parted-devel \
-        perl \
-        pkgconfig \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        scrub \
-        sed \
-        systemd-devel \
-        systemtap-sdt-devel \
-        wireshark-devel \
-        yajl-devel && \
-    dnf autoremove -y && \
-    dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@@ -1,90 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM quay.io/centos/centos:stream9
-
-RUN dnf update -y && \
-    dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled -y crb && \
-    dnf install -y \
-        https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
-        https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm && \
-    dnf install -y \
-        audit-libs-devel \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        clang \
-        cpp \
-        cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        gnutls-devel \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libtirpc-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        nfs-utils \
-        ninja-build \
-        numactl-devel \
-        numad \
-        parted-devel \
-        perl-base \
-        pkgconfig \
-        polkit \
-        python3 \
-        python3-docutils \
-        qemu-img \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        scrub \
-        sed \
-        systemd-devel \
-        systemtap-sdt-devel \
-        wireshark-devel \
-        yajl-devel && \
-    dnf autoremove -y && \
-    dnf clean all -y && \
-    rpm -qa | sort > /packages.txt
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-10-cross-aarch64.Dockerfile
@@ -1,126 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:arm64 \
-            systemtap-sdt-dev:arm64 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv6l.Dockerfile
@@ -1,125 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:armel \
-            systemtap-sdt-dev:armel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv7l.Dockerfile
@@ -1,126 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:armhf \
-            systemtap-sdt-dev:armhf && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ b/ci/containers/debian-10-cross-i686.Dockerfile
@@ -1,125 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:i386 \
-            systemtap-sdt-dev:i386 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ b/ci/containers/debian-10-cross-mips.Dockerfile
@@ -1,125 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips && \
-    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-mips-linux-gnu \
-            libacl1-dev:mips \
-            libapparmor-dev:mips \
-            libattr1-dev:mips \
-            libaudit-dev:mips \
-            libblkid-dev:mips \
-            libc6-dev:mips \
-            libcap-ng-dev:mips \
-            libcurl4-gnutls-dev:mips \
-            libdevmapper-dev:mips \
-            libfuse-dev:mips \
-            libglib2.0-dev:mips \
-            libglusterfs-dev:mips \
-            libgnutls28-dev:mips \
-            libiscsi-dev:mips \
-            libnl-3-dev:mips \
-            libnl-route-3-dev:mips \
-            libnuma-dev:mips \
-            libparted-dev:mips \
-            libpcap0.8-dev:mips \
-            libpciaccess-dev:mips \
-            librbd-dev:mips \
-            libreadline-dev:mips \
-            libsanlock-dev:mips \
-            libsasl2-dev:mips \
-            libselinux1-dev:mips \
-            libssh-gcrypt-dev:mips \
-            libssh2-1-dev:mips \
-            libtirpc-dev:mips \
-            libudev-dev:mips \
-            libxml2-dev:mips \
-            libyajl-dev:mips \
-            systemtap-sdt-dev:mips && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/mips-linux-gnu-gcc'\n\
-ar = '/usr/bin/mips-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/mips-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/mips-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips'\n\
-cpu = 'mips'\n\
-endian = 'big'" > /usr/local/share/meson/cross/mips-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/mips-linux-gnu-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc
-
-ENV ABI "mips-linux-gnu"
-ENV MESON_OPTS "--cross-file=mips-linux-gnu"
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-10-cross-mips64el.Dockerfile
@@ -1,125 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:mips64el \
-            systemtap-sdt-dev:mips64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-10-cross-mipsel.Dockerfile
@@ -1,125 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:mipsel \
-            systemtap-sdt-dev:mipsel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile
@@ -1,125 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:ppc64el \
-            systemtap-sdt-dev:ppc64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/debian-10-cross-s390x.Dockerfile
@@ -1,125 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:s390x \
-            systemtap-sdt-dev:s390x && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@@ -1,106 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-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 \
-            ca-certificates \
-            ccache \
-            clang \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gcc \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libglib2.0-dev \
-            libglusterfs-dev \
-            libgnutls28-dev \
-            libiscsi-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 \
-            libyajl-dev \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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 && \
-    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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/debian-11-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-11-cross-aarch64.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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:arm64 \
-            systemtap-sdt-dev:arm64 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-11-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv6l.Dockerfile
@@ -1,121 +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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:armel \
-            systemtap-sdt-dev:armel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-11-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv7l.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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:armhf \
-            systemtap-sdt-dev:armhf && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-11-cross-i686.Dockerfile
+++ b/ci/containers/debian-11-cross-i686.Dockerfile
@@ -1,121 +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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:i386 \
-            systemtap-sdt-dev:i386 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-11-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-11-cross-mips64el.Dockerfile
@@ -1,121 +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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:mips64el \
-            systemtap-sdt-dev:mips64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-11-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-11-cross-mipsel.Dockerfile
@@ -1,121 +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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:mipsel \
-            systemtap-sdt-dev:mipsel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-11-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile
@@ -1,121 +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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:ppc64el \
-            systemtap-sdt-dev:ppc64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-11-cross-s390x.Dockerfile
+++ b/ci/containers/debian-11-cross-s390x.Dockerfile
@@ -1,121 +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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:s390x \
-            systemtap-sdt-dev:s390x && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-11.Dockerfile
+++ b/ci/containers/debian-11.Dockerfile
@@ -1,102 +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 \
-            ca-certificates \
-            ccache \
-            clang \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gcc \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libglib2.0-dev \
-            libglusterfs-dev \
-            libgnutls28-dev \
-            libiscsi-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 \
-            libyajl-dev \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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 && \
-    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 LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.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:sid-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:arm64 \
-            systemtap-sdt-dev:arm64 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@@ -1,121 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:sid-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:armel \
-            systemtap-sdt-dev:armel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.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:sid-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:armhf \
-            systemtap-sdt-dev:armhf && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@@ -1,121 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:sid-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:i386 \
-            systemtap-sdt-dev:i386 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@@ -1,121 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:sid-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:mips64el \
-            systemtap-sdt-dev:mips64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile
@@ -1,121 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:sid-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:mipsel \
-            systemtap-sdt-dev:mipsel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@@ -1,121 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:sid-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:ppc64el \
-            systemtap-sdt-dev:ppc64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@@ -1,121 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:sid-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 \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-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 \
-            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 \
-            libyajl-dev:s390x \
-            systemtap-sdt-dev:s390x && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[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'" > /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"
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@@ -1,101 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:sid-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 \
-            ca-certificates \
-            ccache \
-            clang \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gcc \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libglib2.0-dev \
-            libglusterfs-dev \
-            libgnutls28-dev \
-            libiscsi-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 \
-            libyajl-dev \
-            locales \
-            lvm2 \
-            make \
-            meson \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            qemu-utils \
-            scrub \
-            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 && \
-    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 LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/fedora-34.Dockerfile
+++ b/ci/containers/fedora-34.Dockerfile
@@ -1,110 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:34
-
-RUN dnf install -y nosync && \
-    echo -e '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
-    export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
-    export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"' > /usr/bin/nosync && \
-    chmod +x /usr/bin/nosync && \
-    nosync dnf update -y && \
-    nosync dnf install -y \
-        audit-libs-devel \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        clang \
-        codespell \
-        cpp \
-        cppi \
-        cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        glusterfs-api-devel \
-        gnutls-devel \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        netcf-devel \
-        nfs-utils \
-        ninja-build \
-        numactl-devel \
-        numad \
-        parted-devel \
-        perl-base \
-        pkgconfig \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        scrub \
-        sed \
-        sheepdog \
-        systemd-devel \
-        systemtap-sdt-devel \
-        wireshark-devel \
-        xen-devel \
-        yajl-devel && \
-    nosync dnf autoremove -y && \
-    nosync dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/fedora-35-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-35-cross-mingw32.Dockerfile
@@ -1,89 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:35
-
-RUN dnf install -y nosync && \
-    echo -e '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
-    export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
-    export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"' > /usr/bin/nosync && \
-    chmod +x /usr/bin/nosync && \
-    nosync dnf update -y && \
-    nosync dnf install -y \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        codespell \
-        cpp \
-        cppi \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        git \
-        glibc-langpack-en \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libxml2 \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        nfs-utils \
-        ninja-build \
-        numad \
-        perl-base \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        rpcgen \
-        rpm-build \
-        scrub \
-        sed \
-        sheepdog && \
-    nosync dnf autoremove -y && \
-    nosync dnf clean all -y
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN nosync dnf install -y \
-        mingw32-curl \
-        mingw32-dlfcn \
-        mingw32-gcc \
-        mingw32-gettext \
-        mingw32-glib2 \
-        mingw32-gnutls \
-        mingw32-headers \
-        mingw32-libssh2 \
-        mingw32-libxml2 \
-        mingw32-pkg-config \
-        mingw32-portablexdr \
-        mingw32-readline && \
-    nosync dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
-
-ENV ABI "i686-w64-mingw32"
-ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson"
--- a/ci/containers/fedora-35-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-35-cross-mingw64.Dockerfile
@@ -1,89 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:35
-
-RUN dnf install -y nosync && \
-    echo -e '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
-    export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
-    export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"' > /usr/bin/nosync && \
-    chmod +x /usr/bin/nosync && \
-    nosync dnf update -y && \
-    nosync dnf install -y \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        codespell \
-        cpp \
-        cppi \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        git \
-        glibc-langpack-en \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libxml2 \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        nfs-utils \
-        ninja-build \
-        numad \
-        perl-base \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        rpcgen \
-        rpm-build \
-        scrub \
-        sed \
-        sheepdog && \
-    nosync dnf autoremove -y && \
-    nosync dnf clean all -y
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN nosync dnf install -y \
-        mingw64-curl \
-        mingw64-dlfcn \
-        mingw64-gcc \
-        mingw64-gettext \
-        mingw64-glib2 \
-        mingw64-gnutls \
-        mingw64-headers \
-        mingw64-libssh2 \
-        mingw64-libxml2 \
-        mingw64-pkg-config \
-        mingw64-portablexdr \
-        mingw64-readline && \
-    nosync dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
-
-ENV ABI "x86_64-w64-mingw32"
-ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson"
--- a/ci/containers/fedora-35.Dockerfile
+++ b/ci/containers/fedora-35.Dockerfile
@@ -1,110 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:35
-
-RUN dnf install -y nosync && \
-    echo -e '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
-    export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
-    export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"' > /usr/bin/nosync && \
-    chmod +x /usr/bin/nosync && \
-    nosync dnf update -y && \
-    nosync dnf install -y \
-        audit-libs-devel \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        clang \
-        codespell \
-        cpp \
-        cppi \
-        cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        glusterfs-api-devel \
-        gnutls-devel \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libwsman-devel \
-        libxml2 \
-        libxml2-devel \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        netcf-devel \
-        nfs-utils \
-        ninja-build \
-        numactl-devel \
-        numad \
-        parted-devel \
-        perl-base \
-        pkgconfig \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        scrub \
-        sed \
-        sheepdog \
-        systemd-devel \
-        systemtap-sdt-devel \
-        wireshark-devel \
-        xen-devel \
-        yajl-devel && \
-    nosync dnf autoremove -y && \
-    nosync dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@@ -1,90 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:rawhide
-
-RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
-    dnf install -y nosync && \
-    echo -e '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
-    export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
-    export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"' > /usr/bin/nosync && \
-    chmod +x /usr/bin/nosync && \
-    nosync dnf distro-sync -y && \
-    nosync dnf install -y \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        codespell \
-        cpp \
-        cppi \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        git \
-        glibc-langpack-en \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libxml2 \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        nfs-utils \
-        ninja-build \
-        numad \
-        perl-base \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        rpcgen \
-        rpm-build \
-        scrub \
-        sed \
-        sheepdog && \
-    nosync dnf autoremove -y && \
-    nosync dnf clean all -y
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN nosync dnf install -y \
-        mingw32-curl \
-        mingw32-dlfcn \
-        mingw32-gcc \
-        mingw32-gettext \
-        mingw32-glib2 \
-        mingw32-gnutls \
-        mingw32-headers \
-        mingw32-libssh2 \
-        mingw32-libxml2 \
-        mingw32-pkg-config \
-        mingw32-portablexdr \
-        mingw32-readline && \
-    nosync dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
-
-ENV ABI "i686-w64-mingw32"
-ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson"
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@@ -1,90 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:rawhide
-
-RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
-    dnf install -y nosync && \
-    echo -e '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
-    export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
-    export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"' > /usr/bin/nosync && \
-    chmod +x /usr/bin/nosync && \
-    nosync dnf distro-sync -y && \
-    nosync dnf install -y \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        codespell \
-        cpp \
-        cppi \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        git \
-        glibc-langpack-en \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libxml2 \
-        libxslt \
-        lvm2 \
-        make \
-        meson \
-        nfs-utils \
-        ninja-build \
-        numad \
-        perl-base \
-        polkit \
-        python3 \
-        python3-docutils \
-        python3-flake8 \
-        qemu-img \
-        rpcgen \
-        rpm-build \
-        scrub \
-        sed \
-        sheepdog && \
-    nosync dnf autoremove -y && \
-    nosync dnf clean all -y
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN nosync dnf install -y \
-        mingw64-curl \
-        mingw64-dlfcn \
-        mingw64-gcc \
-        mingw64-gettext \
-        mingw64-glib2 \
-        mingw64-gnutls \
-        mingw64-headers \
-        mingw64-libssh2 \
-        mingw64-libxml2 \
-        mingw64-pkg-config \
-        mingw64-portablexdr \
-        mingw64-readline && \
-    nosync dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
-
-ENV ABI "x86_64-w64-mingw32"
-ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson"
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -1,110 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.fedoraproject.org/fedora:rawhide
-
-RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
-    dnf install -y nosync && \
-    echo -e '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
-    export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
-    export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"' > /usr/bin/nosync && \
-    chmod +x /usr/bin/nosync && \
-    nosync dnf distro-sync -y && \
-    nosync dnf install -y \
-        audit-libs-devel \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        clang \
-        codespell \
-        cpp \
-        cppi \
-        cyrus-sasl-devel \
-        device-mapper-devel \
-        diffutils \
-        dnsmasq \
-        dwarves \
-        ebtables \
-        firewalld-filesystem \
-        fuse-devel \
-        gcc \
-        gettext \
-        git \
-        glib2-devel \
-        glibc-devel \
-        glibc-langpack-en \
-        glusterfs-api-devel \
-        gnutls-devel \
-        grep \
-        iproute \
-        iproute-tc \
-        iptables \
-        iscsi-initiator-utils \
-        kmod \
-        libacl-devel \
-        libattr-devel \
-        libblkid-devel \
-        libcap-ng-devel \
-        libcurl-devel \
-        libiscsi-devel \
-        libnl3-devel \
-        libpcap-devel \
-        libpciaccess-devel \
-        librbd-devel \
-        libselinux-devel \
-        libssh-devel \
-        libssh2-devel \
-        libtirpc-devel \
-        libwsman-devel \
-        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 \
-        qemu-img \
-        readline-devel \
-        rpcgen \
-        rpm-build \
-        sanlock-devel \
-        scrub \
-        sed \
-        sheepdog \
-        systemd-devel \
-        systemtap-sdt-devel \
-        wireshark-devel \
-        xen-devel \
-        yajl-devel && \
-    nosync dnf autoremove -y && \
-    nosync dnf clean all -y && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -1,101 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.opensuse.org/opensuse/leap:15.2
-
-RUN zypper update -y && \
-    zypper install -y \
-           audit-devel \
-           augeas \
-           augeas-lenses \
-           bash-completion \
-           ca-certificates \
-           ccache \
-           clang \
-           codespell \
-           cpp \
-           cppi \
-           cyrus-sasl-devel \
-           device-mapper-devel \
-           diffutils \
-           dnsmasq \
-           dwarves \
-           ebtables \
-           fuse-devel \
-           gcc \
-           gettext-runtime \
-           git \
-           glib2-devel \
-           glibc-devel \
-           glibc-locale \
-           glusterfs-devel \
-           grep \
-           iproute2 \
-           iptables \
-           kmod \
-           libacl-devel \
-           libapparmor-devel \
-           libattr-devel \
-           libblkid-devel \
-           libcap-ng-devel \
-           libcurl-devel \
-           libgnutls-devel \
-           libiscsi-devel \
-           libnl3-devel \
-           libnuma-devel \
-           libpcap-devel \
-           libpciaccess-devel \
-           librbd-devel \
-           libselinux-devel \
-           libssh-devel \
-           libssh2-devel \
-           libtirpc-devel \
-           libudev-devel \
-           libwsman-devel \
-           libxml2 \
-           libxml2-devel \
-           libxslt \
-           libyajl-devel \
-           lvm2 \
-           make \
-           nfs-utils \
-           ninja \
-           numad \
-           open-iscsi \
-           parted-devel \
-           perl-base \
-           pkgconfig \
-           polkit \
-           python3-base \
-           python3-docutils \
-           python3-flake8 \
-           python3-pip \
-           python3-setuptools \
-           python3-wheel \
-           qemu-tools \
-           readline-devel \
-           rpcgen \
-           rpm-build \
-           sanlock-devel \
-           scrub \
-           sed \
-           systemtap-sdt-devel \
-           wireshark-devel \
-           xen-devel && \
-    zypper clean --all && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -1,97 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM registry.opensuse.org/opensuse/tumbleweed:latest
-
-RUN zypper dist-upgrade -y && \
-    zypper install -y \
-           audit-devel \
-           augeas \
-           augeas-lenses \
-           bash-completion \
-           ca-certificates \
-           ccache \
-           clang \
-           codespell \
-           cpp \
-           cppi \
-           cyrus-sasl-devel \
-           device-mapper-devel \
-           diffutils \
-           dnsmasq \
-           dwarves \
-           ebtables \
-           fuse-devel \
-           gcc \
-           gettext-runtime \
-           git \
-           glib2-devel \
-           glibc-devel \
-           glibc-locale \
-           glusterfs-devel \
-           grep \
-           iproute2 \
-           iptables \
-           kmod \
-           libacl-devel \
-           libapparmor-devel \
-           libattr-devel \
-           libblkid-devel \
-           libcap-ng-devel \
-           libcurl-devel \
-           libgnutls-devel \
-           libiscsi-devel \
-           libnl3-devel \
-           libnuma-devel \
-           libpcap-devel \
-           libpciaccess-devel \
-           librbd-devel \
-           libselinux-devel \
-           libssh-devel \
-           libssh2-devel \
-           libtirpc-devel \
-           libudev-devel \
-           libwsman-devel \
-           libxml2 \
-           libxml2-devel \
-           libxslt \
-           libyajl-devel \
-           lvm2 \
-           make \
-           meson \
-           nfs-utils \
-           ninja \
-           numad \
-           open-iscsi \
-           parted-devel \
-           perl-base \
-           pkgconfig \
-           polkit \
-           python3-base \
-           python3-docutils \
-           python3-flake8 \
-           qemu-tools \
-           readline-devel \
-           rpcgen \
-           rpm-build \
-           sanlock-devel \
-           scrub \
-           sed \
-           systemtap-sdt-devel \
-           wireshark-devel \
-           xen-devel && \
-    zypper clean --all && \
-    rpm -qa | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/ubuntu-1804.Dockerfile
+++ b/ci/containers/ubuntu-1804.Dockerfile
@@ -1,108 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/ubuntu:18.04
-
-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 \
-            ca-certificates \
-            ccache \
-            clang \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gcc \
-            gettext \
-            git \
-            glusterfs-common \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libglib2.0-dev \
-            libgnutls28-dev \
-            libiscsi-dev \
-            libnetcf-dev \
-            libnl-3-dev \
-            libnl-route-3-dev \
-            libnuma-dev \
-            libopenwsman-dev \
-            libparted-dev \
-            libpcap0.8-dev \
-            libpciaccess-dev \
-            librbd-dev \
-            libreadline-dev \
-            libsanlock-dev \
-            libsasl2-dev \
-            libselinux1-dev \
-            libssh-dev \
-            libssh2-1-dev \
-            libtirpc-dev \
-            libudev-dev \
-            libxen-dev \
-            libxml2-dev \
-            libxml2-utils \
-            libyajl-dev \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            sheepdog \
-            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 && \
-    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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -1,107 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/ubuntu:20.04
-
-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 \
-            ca-certificates \
-            ccache \
-            clang \
-            codespell \
-            cpp \
-            diffutils \
-            dnsmasq-base \
-            dwarves \
-            ebtables \
-            flake8 \
-            gcc \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libglib2.0-dev \
-            libglusterfs-dev \
-            libgnutls28-dev \
-            libiscsi-dev \
-            libnetcf-dev \
-            libnl-3-dev \
-            libnl-route-3-dev \
-            libnuma-dev \
-            libopenwsman-dev \
-            libparted-dev \
-            libpcap0.8-dev \
-            libpciaccess-dev \
-            librbd-dev \
-            libreadline-dev \
-            libsanlock-dev \
-            libsasl2-dev \
-            libselinux1-dev \
-            libssh-dev \
-            libssh2-1-dev \
-            libtirpc-dev \
-            libudev-dev \
-            libxen-dev \
-            libxml2-dev \
-            libxml2-utils \
-            libyajl-dev \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            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 && \
-    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
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -1,751 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-
-.container_job:
-  image: docker:stable
-  stage: containers
-  needs: []
-  services:
-    - docker:dind
-  before_script:
-    - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest"
-    - export COMMON_TAG="$CI_REGISTRY/libvirt/libvirt/ci-$NAME:latest"
-    - docker info
-    - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
-  script:
-    - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
-    - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers
-    - docker push "$TAG"
-  after_script:
-    - docker logout
-
-
-.gitlab_native_build_job:
-  image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
-  stage: builds
-
-
-.gitlab_cross_build_job:
-  image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest
-  stage: builds
-
-
-.cirrus_build_job:
-  stage: builds
-  image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
-  needs: []
-  script:
-    - source ci/cirrus/$NAME.vars
-    - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g"
-          -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g"
-          -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g"
-          -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g"
-          -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g"
-          -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g"
-          -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g"
-          -e "s|[@]UPGRADE_COMMAND@|$UPGRADE_COMMAND|g"
-          -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g"
-          -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g"
-          -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g"
-          -e "s|[@]PKGS@|$PKGS|g"
-          -e "s|[@]MAKE@|$MAKE|g"
-          -e "s|[@]PYTHON@|$PYTHON|g"
-          -e "s|[@]PIP3@|$PIP3|g"
-          -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g"
-          -e "s|[@]XML_CATALOG_FILES@|$XML_CATALOG_FILES|g"
-      <ci/cirrus/build.yml >ci/cirrus/$NAME.yml
-    - cat ci/cirrus/$NAME.yml
-    - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml
-  rules:
-    - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN"
-
-
-check-dco:
-  stage: sanity_checks
-  needs: []
-  image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master
-  script:
-    - /check-dco libvirt
-  except:
-    variables:
-      - $CI_PROJECT_NAMESPACE == 'libvirt'
-  variables:
-    GIT_DEPTH: 1000
-
-
-# Native container jobs
-
-x86_64-almalinux-8-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: almalinux-8
-
-
-x86_64-alpine-314-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: alpine-314
-
-
-x86_64-alpine-edge-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: alpine-edge
-
-
-x86_64-centos-stream-8-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: centos-stream-8
-
-
-x86_64-centos-stream-9-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: centos-stream-9
-
-
-x86_64-debian-10-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-10
-
-
-x86_64-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-11
-
-
-x86_64-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid
-
-
-x86_64-fedora-34-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-34
-
-
-x86_64-fedora-35-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-35
-
-
-x86_64-fedora-rawhide-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: fedora-rawhide
-
-
-x86_64-opensuse-leap-152-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: opensuse-leap-152
-
-
-x86_64-opensuse-tumbleweed-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: opensuse-tumbleweed
-
-
-x86_64-ubuntu-1804-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: ubuntu-1804
-
-
-x86_64-ubuntu-2004-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: ubuntu-2004
-
-
-
-# Cross container jobs
-
-aarch64-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-10-cross-aarch64
-
-
-armv6l-debian-10-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-10-cross-armv6l
-
-
-armv7l-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-10-cross-armv7l
-
-
-i686-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-10-cross-i686
-
-
-mips-debian-10-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-10-cross-mips
-
-
-mips64el-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-10-cross-mips64el
-
-
-mipsel-debian-10-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-10-cross-mipsel
-
-
-ppc64le-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-10-cross-ppc64le
-
-
-s390x-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-10-cross-s390x
-
-
-aarch64-debian-11-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-11-cross-aarch64
-
-
-armv6l-debian-11-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-11-cross-armv6l
-
-
-armv7l-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-11-cross-armv7l
-
-
-i686-debian-11-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-11-cross-i686
-
-
-mips64el-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-11-cross-mips64el
-
-
-mipsel-debian-11-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-11-cross-mipsel
-
-
-ppc64le-debian-11-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: debian-11-cross-ppc64le
-
-
-s390x-debian-11-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-11-cross-s390x
-
-
-aarch64-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid-cross-aarch64
-
-
-armv6l-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid-cross-armv6l
-
-
-armv7l-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid-cross-armv7l
-
-
-i686-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid-cross-i686
-
-
-mips64el-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid-cross-mips64el
-
-
-mipsel-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid-cross-mipsel
-
-
-ppc64le-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid-cross-ppc64le
-
-
-s390x-debian-sid-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: debian-sid-cross-s390x
-
-
-mingw32-fedora-35-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: fedora-35-cross-mingw32
-
-
-mingw64-fedora-35-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: fedora-35-cross-mingw64
-
-
-mingw32-fedora-rawhide-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: fedora-rawhide-cross-mingw32
-
-
-mingw64-fedora-rawhide-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    NAME: fedora-rawhide-cross-mingw64
-
-
-# Native build jobs
-
-x86_64-almalinux-8:
-  extends: .native_build_job
-  needs:
-    - x86_64-almalinux-8-container
-  allow_failure: false
-  variables:
-    NAME: almalinux-8
-    RPM: skip
-
-
-x86_64-almalinux-8-clang:
-  extends: .native_build_job
-  needs:
-    - x86_64-almalinux-8-container
-  allow_failure: false
-  variables:
-    CC: clang
-    NAME: almalinux-8
-    RPM: skip
-
-
-x86_64-alpine-314:
-  extends: .native_build_job
-  needs:
-    - x86_64-alpine-314-container
-  allow_failure: false
-  variables:
-    NAME: alpine-314
-
-
-x86_64-alpine-edge:
-  extends: .native_build_job
-  needs:
-    - x86_64-alpine-edge-container
-  allow_failure: true
-  variables:
-    NAME: alpine-edge
-
-
-x86_64-centos-stream-8:
-  extends: .native_build_job
-  needs:
-    - x86_64-centos-stream-8-container
-  allow_failure: false
-  variables:
-    NAME: centos-stream-8
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - libvirt-rpms
-
-
-x86_64-centos-stream-9:
-  extends: .native_build_job
-  needs:
-    - x86_64-centos-stream-9-container
-  allow_failure: false
-  variables:
-    NAME: centos-stream-9
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - libvirt-rpms
-
-
-x86_64-debian-10:
-  extends: .native_build_job
-  needs:
-    - x86_64-debian-10-container
-  allow_failure: false
-  variables:
-    NAME: debian-10
-
-
-x86_64-debian-11:
-  extends: .native_build_job
-  needs:
-    - x86_64-debian-11-container
-  allow_failure: false
-  variables:
-    NAME: debian-11
-
-
-x86_64-debian-11-clang:
-  extends: .native_build_job
-  needs:
-    - x86_64-debian-11-container
-  allow_failure: false
-  variables:
-    NAME: debian-11
-
-
-x86_64-debian-sid:
-  extends: .native_build_job
-  needs:
-    - x86_64-debian-sid-container
-  allow_failure: true
-  variables:
-    NAME: debian-sid
-
-
-x86_64-fedora-34:
-  extends: .native_build_job
-  needs:
-    - x86_64-fedora-34-container
-  allow_failure: false
-  variables:
-    NAME: fedora-34
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - libvirt-rpms
-
-
-x86_64-fedora-35:
-  extends: .native_build_job
-  needs:
-    - x86_64-fedora-35-container
-  allow_failure: false
-  variables:
-    NAME: fedora-35
-  artifacts:
-    expire_in: 1 day
-    paths:
-      - libvirt-rpms
-
-
-x86_64-fedora-rawhide:
-  extends: .native_build_job
-  needs:
-    - x86_64-fedora-rawhide-container
-  allow_failure: true
-  variables:
-    NAME: fedora-rawhide
-
-
-x86_64-fedora-rawhide-clang:
-  extends: .native_build_job
-  needs:
-    - x86_64-fedora-rawhide-container
-  allow_failure: true
-  variables:
-    CC: clang
-    NAME: fedora-rawhide
-    RPM: skip
-
-
-x86_64-opensuse-leap-152:
-  extends: .native_build_job
-  needs:
-    - x86_64-opensuse-leap-152-container
-  allow_failure: false
-  variables:
-    NAME: opensuse-leap-152
-    RPM: skip
-
-
-x86_64-opensuse-tumbleweed:
-  extends: .native_build_job
-  needs:
-    - x86_64-opensuse-tumbleweed-container
-  allow_failure: true
-  variables:
-    NAME: opensuse-tumbleweed
-    RPM: skip
-
-
-x86_64-ubuntu-1804:
-  extends: .native_build_job
-  needs:
-    - x86_64-ubuntu-1804-container
-  allow_failure: false
-  variables:
-    NAME: ubuntu-1804
-
-
-x86_64-ubuntu-2004:
-  extends: .native_build_job
-  needs:
-    - x86_64-ubuntu-2004-container
-  allow_failure: false
-  variables:
-    ASAN_OPTIONS: verify_asan_link_order=0
-    MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
-    NAME: ubuntu-2004
-    UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-
-
-x86_64-ubuntu-2004-clang:
-  extends: .native_build_job
-  needs:
-    - x86_64-ubuntu-2004-container
-  allow_failure: false
-  variables:
-    CC: clang
-    MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
-    NAME: ubuntu-2004
-    UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-
-
-
-# Cross build jobs
-
-armv6l-debian-10:
-  extends: .cross_build_job
-  needs:
-    - armv6l-debian-10-container
-  allow_failure: false
-  variables:
-    CROSS: armv6l
-    NAME: debian-10
-
-
-mips-debian-10:
-  extends: .cross_build_job
-  needs:
-    - mips-debian-10-container
-  allow_failure: false
-  variables:
-    CROSS: mips
-    NAME: debian-10
-
-
-mipsel-debian-10:
-  extends: .cross_build_job
-  needs:
-    - mipsel-debian-10-container
-  allow_failure: false
-  variables:
-    CROSS: mipsel
-    NAME: debian-10
-
-
-armv7l-debian-11:
-  extends: .cross_build_job
-  needs:
-    - armv7l-debian-11-container
-  allow_failure: false
-  variables:
-    CROSS: armv7l
-    NAME: debian-11
-
-
-mips64el-debian-11:
-  extends: .cross_build_job
-  needs:
-    - mips64el-debian-11-container
-  allow_failure: false
-  variables:
-    CROSS: mips64el
-    NAME: debian-11
-
-
-ppc64le-debian-11:
-  extends: .cross_build_job
-  needs:
-    - ppc64le-debian-11-container
-  allow_failure: false
-  variables:
-    CROSS: ppc64le
-    NAME: debian-11
-
-
-aarch64-debian-sid:
-  extends: .cross_build_job
-  needs:
-    - aarch64-debian-sid-container
-  allow_failure: true
-  variables:
-    CROSS: aarch64
-    NAME: debian-sid
-
-
-i686-debian-sid:
-  extends: .cross_build_job
-  needs:
-    - i686-debian-sid-container
-  allow_failure: true
-  variables:
-    CROSS: i686
-    NAME: debian-sid
-
-
-s390x-debian-sid:
-  extends: .cross_build_job
-  needs:
-    - s390x-debian-sid-container
-  allow_failure: true
-  variables:
-    CROSS: s390x
-    NAME: debian-sid
-
-
-mingw64-fedora-35:
-  extends: .cross_build_job
-  needs:
-    - mingw64-fedora-35-container
-  allow_failure: false
-  variables:
-    CROSS: mingw64
-    NAME: fedora-35
-
-
-mingw32-fedora-rawhide:
-  extends: .cross_build_job
-  needs:
-    - mingw32-fedora-rawhide-container
-  allow_failure: true
-  variables:
-    CROSS: mingw32
-    NAME: fedora-rawhide
-
-
-# Native cirrus build jobs
-
-x86_64-freebsd-12:
-  extends: .cirrus_build_job
-  needs: []
-  allow_failure: false
-  variables:
-    CIRRUS_VM_IMAGE_NAME: freebsd-12-2
-    CIRRUS_VM_IMAGE_SELECTOR: image_family
-    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
-    INSTALL_COMMAND: pkg install -y
-    NAME: freebsd-12
-    UPDATE_COMMAND: pkg update
-    UPGRADE_COMMAND: pkg upgrade -y
-
-
-x86_64-freebsd-13:
-  extends: .cirrus_build_job
-  needs: []
-  allow_failure: false
-  variables:
-    CIRRUS_VM_IMAGE_NAME: freebsd-13-0
-    CIRRUS_VM_IMAGE_SELECTOR: image_family
-    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
-    INSTALL_COMMAND: pkg install -y
-    NAME: freebsd-13
-    UPDATE_COMMAND: pkg update
-    UPGRADE_COMMAND: pkg upgrade -y
-
-
-x86_64-macos-11:
-  extends: .cirrus_build_job
-  needs: []
-  allow_failure: false
-  variables:
-    CIRRUS_VM_IMAGE_NAME: big-sur-base
-    CIRRUS_VM_IMAGE_SELECTOR: image
-    CIRRUS_VM_INSTANCE_TYPE: osx_instance
-    INSTALL_COMMAND: brew install
-    NAME: macos-11
-    PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
-    PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-    UPDATE_COMMAND: brew update
-    UPGRADE_COMMAND: brew upgrade
--- a/ci/helper
+++ b/ci/helper
@@ -1,240 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2021 Red Hat, Inc.
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-import argparse
-import os
-import pathlib
-import pty
-import subprocess
-import sys
-import textwrap
-
-import util
-
-
-class Parser:
-    def __init__(self):
-        # Options that are common to all actions that use containers
-        containerparser = argparse.ArgumentParser(add_help=False)
-        containerparser.add_argument(
-            "target",
-            help="perform action on target OS",
-        )
-        containerparser.add_argument(
-            "--engine",
-            choices=["auto", "podman", "docker"],
-            default="auto",
-            help="container engine to use",
-        )
-        containerparser.add_argument(
-            "--login",
-            default=os.getlogin(),  # exempt from syntax-check
-            help="login to use inside the container",
-        )
-        containerparser.add_argument(
-            "--image-prefix",
-            default="registry.gitlab.com/libvirt/libvirt/ci-",
-            help="use container images from non-default location",
-        )
-        containerparser.add_argument(
-            "--image-tag",
-            default=":latest",
-            help="use container images with non-default tags",
-        )
-
-        # Options that are common to all actions that call the
-        # project's build system
-        mesonparser = argparse.ArgumentParser(add_help=False)
-        mesonparser.add_argument(
-            "--meson-args",
-            default="",
-            help="additional arguments passed to meson "
-                 "(eg --meson-args='-Dopt1=enabled -Dopt2=disabled')",
-        )
-        mesonparser.add_argument(
-            "--ninja-args",
-            default="",
-            help="additional arguments passed to ninja",
-        )
-
-        # Options that are common to actions communicating with a GitLab
-        # instance
-        gitlabparser = argparse.ArgumentParser(add_help=False)
-        gitlabparser.add_argument(
-            "--namespace",
-            default="libvirt/libvirt",
-            help="GitLab project namespace"
-        )
-        gitlabparser.add_argument(
-            "--gitlab-uri",
-            default="https://gitlab.com",
-            help="base GitLab URI"
-        )
-
-        # Main parser
-        self._parser = argparse.ArgumentParser()
-        subparsers = self._parser.add_subparsers(
-            dest="action",
-            metavar="ACTION",
-        )
-        subparsers.required = True
-
-        # build action
-        buildparser = subparsers.add_parser(
-            "build",
-            help="run a build in a container",
-            parents=[containerparser, mesonparser],
-            formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        )
-        buildparser.set_defaults(func=Application._action_build)
-
-        # test action
-        testparser = subparsers.add_parser(
-            "test",
-            help="run a build in a container (including tests)",
-            parents=[containerparser, mesonparser],
-            formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        )
-        testparser.set_defaults(func=Application._action_test)
-
-        # shell action
-        shellparser = subparsers.add_parser(
-            "shell",
-            help="start a shell in a container",
-            parents=[containerparser],
-            formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        )
-        shellparser.set_defaults(func=Application._action_shell)
-
-        # list-images action
-        listimagesparser = subparsers.add_parser(
-            "list-images",
-            help="list known container images",
-            parents=[gitlabparser],
-            formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        )
-        listimagesparser.set_defaults(func=Application._action_list_images)
-
-        # check_stale action
-        check_staleparser = subparsers.add_parser(
-            "check-stale",
-            help="check for existence of stale images on the GitLab instance",
-            parents=[gitlabparser],
-            formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        )
-        check_staleparser.set_defaults(func=Application._action_check_stale)
-
-    def parse(self):
-        return self._parser.parse_args()
-
-
-class Application:
-    def __init__(self):
-        self._basedir = pathlib.Path(__file__).resolve().parent
-        self._args = Parser().parse()
-
-    def _make_run(self, target):
-        args = [
-            "-C",
-            self._basedir,
-            target,
-        ]
-
-        if self._args.action in ["build", "test", "shell"]:
-            args.extend([
-                f"CI_ENGINE={self._args.engine}",
-                f"CI_USER_LOGIN={self._args.login}",
-                f"CI_IMAGE_PREFIX={self._args.image_prefix}",
-                f"CI_IMAGE_TAG={self._args.image_tag}",
-            ])
-
-        if self._args.action in ["build", "test"]:
-            args.extend([
-                f"CI_MESON_ARGS={self._args.meson_args}",
-                f"CI_NINJA_ARGS={self._args.ninja_args}",
-            ])
-
-        if pty.spawn(["make"] + args) != 0:
-            sys.exit("error: 'make' failed")
-
-    def _lcitool_run(self, args):
-        output = subprocess.check_output([self._args.lcitool] + args)
-        return output.decode("utf-8")
-
-    def _lcitool_get_targets(self):
-        output = self._lcitool_run(["targets"])
-        return output.splitlines()
-
-    def _check_stale_images(self):
-        namespace = self._args.namespace
-        gitlab_uri = self._args.gitlab_uri
-        registry_uri = util.get_registry_uri(namespace, gitlab_uri)
-
-        stale_images = util.get_registry_stale_images(registry_uri, self._basedir)
-        if stale_images:
-            spacing = "\n" + 4 * " "
-            stale_fmt = [f"{k} (ID: {v})" for k, v in stale_images.items()]
-            stale_details = spacing.join(stale_fmt)
-            stale_ids = ' '.join([str(id) for id in stale_images.values()])
-            registry_uri = util.get_registry_uri(namespace, gitlab_uri)
-
-            msg = textwrap.dedent(f"""
-                The following images are stale and can be purged from the registry:
-
-                    STALE_DETAILS
-
-                You can delete the images listed above using this shell snippet:
-
-                    $ for image_id in {stale_ids}; do
-                          curl --request DELETE --header "PRIVATE-TOKEN: <access_token>" \\
-                               {registry_uri}/$image_id;
-                      done
-
-                You can generate a personal access token here:
-
-                    {gitlab_uri}/-/profile/personal_access_tokens
-            """)
-            print(msg.replace("STALE_DETAILS", stale_details))
-
-    def _action_build(self):
-        self._make_run(f"ci-build@{self._args.target}")
-
-    def _action_test(self):
-        self._make_run(f"ci-test@{self._args.target}")
-
-    def _action_shell(self):
-        self._make_run(f"ci-shell@{self._args.target}")
-
-    def _action_list_images(self):
-        registry_uri = util.get_registry_uri(self._args.namespace,
-                                             self._args.gitlab_uri)
-        images = util.get_registry_images(registry_uri)
-
-        # skip the "ci-" prefix each of our container images' name has
-        name_prefix = "ci-"
-        names = [i["name"][len(name_prefix):] for i in images]
-        names.sort()
-
-        native = [name for name in names if "-cross-" not in name]
-        cross = [name for name in names if "-cross-" in name]
-
-        spacing = 4 * " "
-        print("Available x86 container images:\n")
-        print(spacing + ("\n" + spacing).join(native))
-
-        if cross:
-            print()
-            print("Available cross-compiler container images:\n")
-            print(spacing + ("\n" + spacing).join(cross))
-
-    def _action_check_stale(self):
-        self._check_stale_images()
-
-    def run(self):
-        self._args.func(self)
-
-
-if __name__ == "__main__":
-    Application().run()
--- a/ci/integration.yml
+++ b/ci/integration.yml
@@ -1,116 +0,0 @@
-.integration_tests:
-  stage: integration_tests
-  before_script:
-    - mkdir "$SCRATCH_DIR"
-    - sudo sh -c "echo DefaultLimitCORE=infinity >> /etc/systemd/system.conf" # Explicitly allow storing cores globally
-    - sudo systemctl daemon-reexec # need to reexec systemd after changing config
-    - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/*
-    - sudo pip3 install --prefix=/usr avocado-framework
-    - source /etc/os-release  # in order to query the vendor-provided variables
-    - if test "$ID" = "centos" && test "$VERSION_ID" -lt 9 ||
-         test "$ID" = "fedora" && test "$VERSION_ID" -lt 35;
-      then
-        DAEMONS="libvirtd virtlogd virtlockd";
-      else
-        DAEMONS="virtproxyd virtqemud virtinterfaced virtsecretd virtstoraged virtnwfilterd virtnodedevd virtlogd virtlockd";
-      fi
-    - for daemon in $DAEMONS;
-      do
-        LOG_OUTPUTS="1:file:/var/log/libvirt/${daemon}.log";
-        LOG_FILTERS="3:remote 4:event 3:util.json 3:util.object 3:util.dbus 3:util.netlink 3:node_device 3:rpc 3:access 1:*";
-        sudo augtool set /files/etc/libvirt/${daemon}.conf/log_filters "$LOG_FILTERS" &>/dev/null;
-        sudo augtool set /files/etc/libvirt/${daemon}.conf/log_outputs "$LOG_OUTPUTS" &>/dev/null;
-        sudo systemctl --quiet stop ${daemon}.service;
-        sudo systemctl restart ${daemon}.socket;
-      done
-    - sudo virsh net-start default &>/dev/null || true;
-  script:
-    - mkdir logs
-    - cd "$SCRATCH_DIR"
-    - git clone --depth 1 https://gitlab.com/libvirt/libvirt-tck.git
-    - cd libvirt-tck
-    - sudo avocado --config avocado.config run --job-results-dir "$SCRATCH_DIR"/avocado
-  after_script:
-    - test "$CI_JOB_STATUS" = "success" && exit 0;
-    - test -e "$SCRATCH_DIR"/avocado && sudo mv "$SCRATCH_DIR"/avocado/latest/test-results logs/avocado;
-    - sudo coredumpctl info --no-pager > logs/coredumpctl.txt
-    - sudo mv /var/log/libvirt logs/libvirt
-    - sudo chown -R $(whoami):$(whoami) logs
-      # rename all Avocado stderr/stdout logs to *.log so that GitLab's web UI doesn't mangle the MIME type
-    - find logs/avocado/ -type f ! -name "*.log" -exec
-        sh -c 'DIR=$(dirname {}); NAME=$(basename {}); mv $DIR/$NAME{,.log}' \;
-  variables:
-    SCRATCH_DIR: "/tmp/scratch"
-  artifacts:
-    name: logs
-    paths:
-      - logs
-    when: on_failure
-  rules:
-    - if: '$LIBVIRT_CI_INTEGRATION'
-      when: on_success
-    - when: never
-
-centos-stream-8-tests:
-  extends: .integration_tests
-  needs:
-    - x86_64-centos-stream-8
-    - project: libvirt/libvirt-perl
-      job: x86_64-centos-stream-8
-      ref: master
-      artifacts: true
-  variables:
-    # needed by libvirt-gitlab-executor
-    DISTRO: centos-stream-8
-    # 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
-
-centos-stream-9-tests:
-  extends: .integration_tests
-  needs:
-    - x86_64-centos-stream-9
-    - project: libvirt/libvirt-perl
-      job: x86_64-centos-stream-9
-      ref: master
-      artifacts: true
-  variables:
-    # needed by libvirt-gitlab-executor
-    DISTRO: centos-stream-9
-    # 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
-
-fedora-34-tests:
-  extends: .integration_tests
-  needs:
-    - x86_64-fedora-34
-    - project: libvirt/libvirt-perl
-      job: x86_64-fedora-34
-      ref: master
-      artifacts: true
-  variables:
-    # needed by libvirt-gitlab-executor
-    DISTRO: fedora-34
-    # 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
-
-fedora-35-tests:
-  extends: .integration_tests
-  needs:
-    - x86_64-fedora-35
-    - project: libvirt/libvirt-perl
-      job: x86_64-fedora-35
-      ref: master
-      artifacts: true
-  variables:
-    # needed by libvirt-gitlab-executor
-    DISTRO: fedora-35
-    # 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
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -1,233 +0,0 @@
-projects:
-  - libvirt
-
-gitlab:
-  namespace: libvirt
-  project: libvirt
-
-targets:
-  almalinux-8:
-    jobs:
-      - arch: x86_64
-        variables:
-          RPM: skip
-
-      - arch: x86_64
-        suffix: -clang
-        variables:
-          RPM: skip
-          CC: clang
-
-  alpine-314:
-    jobs:
-      - arch: x86_64
-
-  alpine-edge:
-    jobs:
-      - arch: x86_64
-        allow-failure: true
-
-  centos-stream-8:
-    jobs:
-      - arch: x86_64
-        artifacts:
-          expire_in: 1 day
-          paths:
-            - libvirt-rpms
-
-  centos-stream-9:
-    jobs:
-      - arch: x86_64
-        artifacts:
-          expire_in: 1 day
-          paths:
-            - libvirt-rpms
-
-  debian-10:
-    jobs:
-      - arch: x86_64
-
-      - arch: aarch64
-        allow-failure: true
-        builds: false
-
-      - arch: armv6l
-
-      - arch: armv7l
-        allow-failure: true
-        builds: false
-
-      - arch: i686
-        allow-failure: true
-        builds: false
-
-      - arch: mips
-
-      - arch: mips64el
-        allow-failure: true
-        builds: false
-
-      - arch: mipsel
-
-      - arch: ppc64le
-        allow-failure: true
-        builds: false
-
-      - arch: s390x
-        allow-failure: true
-        builds: false
-
-  debian-11:
-    jobs:
-      - arch: x86_64
-
-      - arch: x86_64
-        suffix: -clang
-
-      - arch: aarch64
-        allow-failure: true
-        builds: false
-
-      - arch: armv6l
-        allow-failure: true
-        builds: false
-
-      - arch: armv7l
-
-      - arch: i686
-        allow-failure: true
-        builds: false
-
-      - arch: mips64el
-
-      - arch: mipsel
-        allow-failure: true
-        builds: false
-
-      - arch: ppc64le
-
-      - arch: s390x
-        allow-failure: true
-        builds: false
-
-  debian-sid:
-    jobs:
-      - arch: x86_64
-        allow-failure: true
-
-      - arch: aarch64
-        allow-failure: true
-
-      - arch: armv6l
-        allow-failure: true
-        builds: false
-
-      - arch: armv7l
-        allow-failure: true
-        builds: false
-
-      - arch: i686
-        allow-failure: true
-
-      - arch: mips64el
-        allow-failure: true
-        builds: false
-
-      - arch: mipsel
-        allow-failure: true
-        builds: false
-
-      - arch: ppc64le
-        allow-failure: true
-        builds: false
-
-      - arch: s390x
-        allow-failure: true
-
-  fedora-34:
-    jobs:
-      - arch: x86_64
-        artifacts:
-          expire_in: 1 day
-          paths:
-            - libvirt-rpms
-
-  fedora-35:
-    jobs:
-      - arch: x86_64
-        artifacts:
-          expire_in: 1 day
-          paths:
-            - libvirt-rpms
-
-      - arch: mingw32
-        allow-failure: true
-        builds: false
-
-      - arch: mingw64
-
-  fedora-rawhide:
-    jobs:
-      - arch: x86_64
-        allow-failure: true
-
-      - arch: x86_64
-        suffix: -clang
-        allow-failure: true
-        variables:
-          CC: clang
-          RPM: skip
-
-      - arch: mingw32
-        allow-failure: true
-
-      - arch: mingw64
-        allow-failure: true
-        builds: false
-
-  freebsd-12: x86_64
-
-  freebsd-13: x86_64
-
-  freebsd-current:
-    jobs:
-      - arch: x86_64
-        allow-failure: true
-        builds: False
-
-  opensuse-leap-152:
-    jobs:
-      - arch: x86_64
-        variables:
-          RPM: skip
-
-  opensuse-tumbleweed:
-    jobs:
-      - arch: x86_64
-        allow-failure: true
-        variables:
-          RPM: skip
-
-  macos-11:
-    jobs:
-      - arch: x86_64
-        variables:
-          PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
-          PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-
-  ubuntu-1804: x86_64
-
-  ubuntu-2004:
-    jobs:
-      - arch: x86_64
-        variables:
-          ASAN_OPTIONS: verify_asan_link_order=0
-          MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
-          UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-
-      - arch: x86_64
-        suffix: -clang
-        variables:
-          CC: clang
-          MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
-          UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
--- a/ci/util.py
+++ b/ci/util.py
@@ -1,78 +0,0 @@
-import json
-import pathlib
-import urllib.request
-import urllib.parse
-
-from typing import Dict, List
-
-
-def get_registry_uri(namespace: str,
-                     gitlab_uri: str = "https://gitlab.com") -> str:
-    """
-    Construct a v4 API URI pointing the namespaced project's image registry.
-
-    :param namespace: GitLab project namespace, e.g. "libvirt/libvirt"
-    :param gitlab_uri: GitLab base URI, can be a private deployment
-    :param api_version: GitLab REST API version number
-    :return: URI pointing to a namespaced project's image registry
-    """
-
-    # this converts something like "libvirt/libvirt" to "libvirt%2Flibvirt"
-    namespace_urlenc = urllib.parse.quote_plus(namespace)
-
-    project_uri = f"{gitlab_uri}/api/v4/projects/{namespace_urlenc}"
-
-    uri = project_uri + "/registry/repositories"
-    return uri
-
-
-def get_registry_images(uri: str) -> List[Dict]:
-    """
-    List all container images that are currently available in the given GitLab
-    project.
-
-    :param uri: URI pointing to a GitLab instance's image registry
-    :return: list of container image names
-    """
-
-    r = urllib.request.urlopen(uri + "?per_page=100")
-
-    # read the HTTP response and load the JSON part of it
-    return json.loads(r.read().decode())
-
-
-def get_dockerfiles(base_dir) -> List:
-    """
-    List all container dockerfiles in the local directory.
-
-    :return: list of dockerfile names
-    """
-
-    dkrs = []
-    d = pathlib.Path(base_dir, "containers")
-    for f in d.iterdir():
-        if f.suffix == ".Dockerfile":
-            dkrs.append(f.stem)
-    return dkrs
-
-
-def get_registry_stale_images(registry_uri: str, base_dir: str) -> Dict[str, int]:
-    """
-    Check the GitLab image registry for images that we no longer support and
-    which should be deleted.
-
-    :param uri: URI pointing to a GitLab instance's image registry
-    :param base_dir: local repository base directory
-    :return: dictionary formatted as: {<gitlab_image_name>: <gitlab_image_id>}
-    """
-
-    dockerfiles = get_dockerfiles(base_dir)
-    images = get_registry_images(registry_uri)
-    name_prefix = "ci-"
-
-    stale_images = {}
-    for img in images:
-        if img["name"][len(name_prefix):] not in dockerfiles:
-            stale_images[img["name"]] = img["id"]
-
-    return stale_images
--- a/config-post.h
+++ b/config-post.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2013 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Since virt-login-shell will be setuid, we must do everything
+ * we can to avoid linking to other libraries. Many of them do
+ * unsafe things in functions marked __atttribute__((constructor)).
+ * The only way avoid to avoid such deps is to re-compile the
+ * functions with the code in question disabled, and for that we
+ * must override the main config.h rules. Hence this file :-(
+ */
+
+#ifdef LIBVIRT_SETUID_RPC_CLIENT
+# undef HAVE_LIBDEVMAPPER_H
+# undef HAVE_LIBNL
+# undef HAVE_LIBNL3
+# undef HAVE_LIBSASL2
+# undef WITH_CAPNG
+# undef WITH_CURL
+# undef WITH_DBUS
+# undef WITH_DTRACE_PROBES
+# undef WITH_GNUTLS
+# undef WITH_GNUTLS_GCRYPT
+# undef WITH_MACVTAP
+# undef WITH_NUMACTL
+# undef WITH_SASL
+# undef WITH_SSH2
+# undef WITH_SYSTEMD_DAEMON
+# undef WITH_VIRTUALPORT
+# undef WITH_YAJL
+# undef WITH_YAJL2
+#endif
+
+/*
+ * With the NSS module it's the same story as virt-login-shell. See the
+ * explanation above.
+ */
+#ifdef LIBVIRT_NSS
+# undef HAVE_LIBDEVMAPPER_H
+# undef HAVE_LIBNL
+# undef HAVE_LIBNL3
+# undef HAVE_LIBSASL2
+# undef WITH_CAPNG
+# undef WITH_CURL
+# undef WITH_DTRACE_PROBES
+# undef WITH_GNUTLS
+# undef WITH_GNUTLS_GCRYPT
+# undef WITH_MACVTAP
+# undef WITH_NUMACTL
+# undef WITH_SASL
+# undef WITH_SSH2
+# undef WITH_VIRTUALPORT
+# undef WITH_SECDRIVER_SELINUX
+# undef WITH_SECDRIVER_APPARMOR
+# undef WITH_CAPNG
+#endif /* LIBVIRT_NSS */
+
+/*
+ * Define __GNUC__ to a sane default if it isn't yet defined.
+ * This is done here so that it's included as early as possible; gnulib relies
+ * on this to be defined in features.h, which should be included from ctype.h.
+ * This doesn't happen on many non-glibc systems.
+ * When __GNUC__ is not defined, gnulib defines it to 0, which breaks things.
+ */
+#ifdef __GNUC__
+# ifndef __GNUC_PREREQ
+#  if defined __GNUC__ && defined __GNUC_MINOR__
+#   define __GNUC_PREREQ(maj, min)                                        \
+   ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#  else
+#   define __GNUC_PREREQ(maj, min) 0
+#  endif
+# endif
+#endif
--- a/config.h
+++ b/config.h
@@ -1,53 +0,0 @@
-/*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <meson-config.h>
-
-/* Enable compile-time and run-time bounds-checking, and some warnings,
- * without upsetting newer glibc. */
-
-#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
-# define _FORTIFY_SOURCE 2
-#endif
-
-/*
- * Define __GNUC_PREREQ to a sane default if it isn't yet defined.
- * This is done here so that it's included as early as possible;
- */
-#ifndef __GNUC_PREREQ
-# define __GNUC_PREREQ(maj, min) \
-    ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#endif
-
-#if defined(__clang_major__) && defined(__clang_minor__)
-# ifdef __apple_build_version__
-#  if __clang_major__ < 10 || (__clang_major__ == 10 && __clang_minor__ < 0)
-#   error You need at least XCode Clang v10.0 to compile libvirt
-#  endif
-# else
-#  if __clang_major__ < 6 || (__clang_major__ == 6 && __clang_minor__ < 4)
-#   error You need at least Clang v6.0 to compile libvirt
-#  endif
-# endif
-#elif defined(__GNUC__) && defined(__GNUC_MINOR__)
-# if __GNUC__ < 7 || (__GNUC__ == 7 && __GNUC_MINOR__ < 4)
-#  error You need at least GCC v7.4.0 to compile libvirt
-# endif
-#else
-# error You either need at least GCC 7.4.0 or Clang 6.0 or XCode Clang 10.0 to compile libvirt
-#endif
--- a/configmake.h.in
+++ b/configmake.h.in
@@ -1,16 +0,0 @@
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-#if WIN32
-# include <winsock2.h> /* avoid mingw pollution on DATADIR */
-#endif
-#mesondefine BINDIR
-#mesondefine DATADIR
-#mesondefine LIBDIR
-#mesondefine LIBEXECDIR
-#mesondefine LOCALEDIR
-#mesondefine LOCALSTATEDIR
-#mesondefine MANDIR
-#mesondefine PKGDATADIR
-#mesondefine PREFIX
-#mesondefine RUNSTATEDIR
-#mesondefine SBINDIR
-#mesondefine SYSCONFDIR
--- a/configure.ac
+++ b/configure.ac
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -0,0 +1,546 @@
+## Process this file with automake to produce Makefile.in
+
+## Copyright (C) 2005-2015 Red Hat, Inc.
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library.  If not, see
+## <http://www.gnu.org/licenses/>.
+
+INCLUDES = \
+	-I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \
+	-I$(top_srcdir) \
+	-I$(top_builddir)/include -I$(top_srcdir)/include \
+	-I$(top_builddir)/src -I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/util \
+	-I$(top_srcdir)/src/conf \
+	-I$(top_srcdir)/src/rpc \
+	-I$(top_srcdir)/src/remote \
+	-I$(top_srcdir)/src/admin \
+	-I$(top_srcdir)/src/access \
+	$(GETTEXT_CPPFLAGS)
+
+CLEANFILES =
+
+DAEMON_GENERATED =			\
+		remote_dispatch.h	\
+		lxc_dispatch.h		\
+		qemu_dispatch.h		\
+		admin_dispatch.h	\
+		$(NULL)
+
+DAEMON_SOURCES =					\
+		libvirtd.c libvirtd.h			\
+		remote.c remote.h			\
+		stream.c stream.h			\
+		$(DAEMON_GENERATED)
+
+LIBVIRTD_CONF_SOURCES = libvirtd-config.c libvirtd-config.h
+
+PODFILES = \
+	libvirtd.pod \
+	$(NULL)
+
+MANINFILES = \
+	libvirtd.8.in \
+	$(NULL)
+
+DISTCLEANFILES =
+EXTRA_DIST =						\
+	remote_dispatch.h				\
+	lxc_dispatch.h					\
+	qemu_dispatch.h					\
+	admin_dispatch.h				\
+	libvirtd.conf					\
+	libvirtd.init.in				\
+	libvirtd.upstart				\
+	libvirtd.policy.in				\
+	libvirt.rules					\
+	libvirtd.sasl					\
+	libvirtd.service.in				\
+	libvirtd.sysconf				\
+	libvirtd.sysctl					\
+	libvirtd.aug                                    \
+	libvirtd.logrotate.in                           \
+	libvirtd.qemu.logrotate.in                      \
+	libvirtd.lxc.logrotate.in                       \
+	libvirtd.libxl.logrotate.in                     \
+	libvirtd.uml.logrotate.in                       \
+	test_libvirtd.aug.in                             \
+	THREADS.txt					\
+	$(PODFILES)					\
+	$(MANINFILES)					\
+	$(DAEMON_SOURCES)				\
+	$(LIBVIRTD_CONF_SOURCES)			\
+	$(NULL)
+
+BUILT_SOURCES =
+
+REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
+LXC_PROTOCOL = $(top_srcdir)/src/remote/lxc_protocol.x
+QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
+ADMIN_PROTOCOL = $(top_srcdir)/src/admin/admin_protocol.x
+
+remote_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
+		$(REMOTE_PROTOCOL)
+	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
+	  --mode=server remote REMOTE $(REMOTE_PROTOCOL) \
+	  > $(srcdir)/remote_dispatch.h
+
+lxc_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
+		$(LXC_PROTOCOL)
+	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
+	  --mode=server lxc LXC $(LXC_PROTOCOL) \
+	  > $(srcdir)/lxc_dispatch.h
+
+qemu_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
+		$(QEMU_PROTOCOL)
+	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
+	  --mode=server qemu QEMU $(QEMU_PROTOCOL) \
+	  > $(srcdir)/qemu_dispatch.h
+
+admin_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
+		$(ADMIN_PROTOCOL)
+	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
+	  --mode=server admin ADMIN $(ADMIN_PROTOCOL) \
+	  > $(srcdir)/admin_dispatch.h
+
+if WITH_LIBVIRTD
+
+# Build a convenience library, for reuse in tests/libvirtdconftest
+noinst_LTLIBRARIES = libvirtd_conf.la
+libvirtd_conf_la_SOURCES = $(LIBVIRTD_CONF_SOURCES)
+libvirtd_conf_la_CFLAGS = \
+	$(LIBXML_CFLAGS) \
+	$(XDR_CFLAGS) \
+	$(WARN_CFLAGS) $(PIE_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
+	$(NULL)
+libvirtd_conf_la_LDFLAGS =				\
+	$(RELRO_LDFLAGS)				\
+	$(PIE_LDFLAGS)					\
+	$(COVERAGE_LDFLAGS)				\
+	$(NO_INDIRECT_LDFLAGS)				\
+	$(NULL)
+libvirtd_conf_la_LIBADD = $(LIBXML_LIBS)
+
+noinst_LTLIBRARIES += libvirtd_admin.la
+libvirtd_admin_la_SOURCES = \
+		admin.c admin.h admin_server.c admin_server.h
+
+libvirtd_admin_la_CFLAGS = \
+		$(AM_CFLAGS)		\
+		$(XDR_CFLAGS)		\
+		$(PIE_CFLAGS)		\
+		$(WARN_CFLAGS)		\
+		$(LIBXML_CFLAGS)	\
+		$(COVERAGE_CFLAGS)	\
+		$(NULL)
+libvirtd_admin_la_LDFLAGS = \
+		$(PIE_LDFLAGS)		\
+		$(RELRO_LDFLAGS)	\
+		$(COVERAGE_LDFLAGS)	\
+		$(NO_INDIRECT_LDFLAGS)  \
+		$(NULL)
+libvirtd_admin_la_LIBADD =	\
+		../src/libvirt-admin.la
+
+man8_MANS = libvirtd.8
+
+sbin_PROGRAMS = libvirtd
+
+confdir = $(sysconfdir)/libvirt/
+conf_DATA = libvirtd.conf
+
+augeasdir = $(datadir)/augeas/lenses
+augeas_DATA = libvirtd.aug
+
+augeastestsdir = $(datadir)/augeas/lenses/tests
+augeastests_DATA = test_libvirtd.aug
+
+CLEANFILES += test_libvirtd.aug
+
+libvirtd_SOURCES = $(DAEMON_SOURCES)
+
+#-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L
+libvirtd_CFLAGS = \
+	$(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \
+	$(XDR_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \
+	$(WARN_CFLAGS) $(PIE_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
+	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\""
+
+libvirtd_LDFLAGS =					\
+	$(RELRO_LDFLAGS)				\
+	$(PIE_LDFLAGS)					\
+	$(COVERAGE_LDFLAGS)				\
+	$(NO_INDIRECT_LDFLAGS)				\
+	$(NULL)
+
+libvirtd_LDADD =					\
+	$(LIBXML_LIBS)					\
+	$(GNUTLS_LIBS)					\
+	$(SASL_LIBS)					\
+	$(DBUS_LIBS)					\
+	$(LIBNL_LIBS)
+
+if WITH_DTRACE_PROBES
+libvirtd_LDADD += ../src/libvirt_probes.lo
+endif WITH_DTRACE_PROBES
+
+libvirtd_LDADD += \
+	libvirtd_conf.la \
+	libvirtd_admin.la \
+	../src/libvirt-lxc.la \
+	../src/libvirt-qemu.la \
+	../src/libvirt_driver_remote.la \
+	$(NULL)
+
+if ! WITH_DRIVER_MODULES
+if WITH_QEMU
+    libvirtd_LDADD += ../src/libvirt_driver_qemu.la
+if WITH_DTRACE_PROBES
+    libvirtd_LDADD += ../src/libvirt_qemu_probes.lo
+endif WITH_DTRACE_PROBES
+endif WITH_QEMU
+
+if WITH_LXC
+    libvirtd_LDADD += ../src/libvirt_driver_lxc.la
+endif WITH_LXC
+
+if WITH_XEN
+    libvirtd_LDADD += ../src/libvirt_driver_xen.la
+endif WITH_XEN
+
+if WITH_LIBXL
+    libvirtd_LDADD += ../src/libvirt_driver_libxl.la
+endif WITH_LIBXL
+
+if WITH_UML
+    libvirtd_LDADD += ../src/libvirt_driver_uml.la
+endif WITH_UML
+
+if WITH_VBOX
+    libvirtd_LDADD += ../src/libvirt_driver_vbox.la
+endif WITH_VBOX
+
+if WITH_VZ
+    libvirtd_LDADD += ../src/libvirt_driver_vz.la
+endif WITH_VZ
+
+if WITH_STORAGE
+    libvirtd_LDADD += ../src/libvirt_driver_storage.la
+endif WITH_STORAGE
+
+if WITH_NETWORK
+    libvirtd_LDADD += ../src/libvirt_driver_network.la
+endif WITH_NETWORK
+
+if WITH_INTERFACE
+    libvirtd_LDADD += ../src/libvirt_driver_interface.la
+endif WITH_INTERFACE
+
+if WITH_NODE_DEVICES
+    libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
+endif WITH_NODE_DEVICES
+
+if WITH_SECRETS
+    libvirtd_LDADD += ../src/libvirt_driver_secret.la
+endif WITH_SECRETS
+
+if WITH_NWFILTER
+    libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la
+endif WITH_NWFILTER
+endif ! WITH_DRIVER_MODULES
+
+libvirtd_LDADD += ../src/libvirt.la
+
+if WITH_POLKIT
+if WITH_POLKIT0
+policydir = $(datadir)/PolicyKit/policy
+policyauth = auth_admin_keep_session
+else ! WITH_POLKIT0
+policydir = $(datadir)/polkit-1/actions
+policyauth = auth_admin_keep
+rulesdir = $(datadir)/polkit-1/rules.d
+rulesfile = libvirt.rules
+endif ! WITH_POLKIT0
+endif WITH_POLKIT
+
+libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status
+	$(AM_V_GEN) sed \
+	    -e 's|[@]authaction[@]|$(policyauth)|g' \
+	    < $< > $@-t && \
+	mv $@-t $@
+BUILT_SOURCES += libvirtd.policy
+
+install-data-local: install-init-redhat install-init-systemd \
+		install-init-upstart \
+		install-data-sasl install-data-polkit \
+		install-logrotate install-sysctl
+	$(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt \
+		   $(DESTDIR)$(localstatedir)/run/libvirt \
+		   $(DESTDIR)$(localstatedir)/lib/libvirt
+
+uninstall-local:: uninstall-init-redhat uninstall-init-systemd \
+		uninstall-init-upstart \
+		uninstall-data-sasl uninstall-data-polkit \
+		uninstall-logrotate uninstall-sysctl
+	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
+	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
+	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
+
+if WITH_POLKIT
+install-data-polkit::
+	$(MKDIR_P) $(DESTDIR)$(policydir)
+	$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+if ! WITH_POLKIT0
+	$(MKDIR_P) $(DESTDIR)$(rulesdir)
+	$(INSTALL_DATA) $(srcdir)/$(rulesfile) $(DESTDIR)$(rulesdir)/50-libvirt.rules
+endif ! WITH_POLKIT0
+
+uninstall-data-polkit::
+	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+	rmdir $(DESTDIR)$(policydir) || :
+if ! WITH_POLKIT0
+	rm -f $(DESTDIR)$(rulesdir)/50-libvirt.rules
+	rmdir $(DESTDIR)$(rulesdir) || :
+endif ! WITH_POLKIT0
+
+else ! WITH_POLKIT
+install-data-polkit::
+uninstall-data-polkit::
+endif ! WITH_POLKIT
+
+remote.c: $(DAEMON_GENERATED)
+remote.h: $(DAEMON_GENERATED)
+admin.c: $(DAEMON_GENERATED)
+admin.h: $(DAEMON_GENERATED)
+
+LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
+		  libvirtd.libxl.logrotate libvirtd.uml.logrotate \
+		  libvirtd.logrotate
+
+BUILT_SOURCES += $(LOGROTATE_CONFS)
+
+libvirtd.logrotate: libvirtd.logrotate.in
+	$(AM_V_GEN)sed						\
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	    < $< > $@-t && \
+	mv $@-t $@
+
+libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
+	$(AM_V_GEN)sed						\
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	    < $< > $@-t && \
+	mv $@-t $@
+
+libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
+	$(AM_V_GEN)sed						\
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	    < $< > $@-t &&					\
+	    mv $@-t $@
+
+libvirtd.libxl.logrotate: libvirtd.libxl.logrotate.in
+	$(AM_V_GEN)sed						\
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	    < $< > $@-t &&					\
+	    mv $@-t $@
+
+libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
+	$(AM_V_GEN)sed						\
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	    < $< > $@-t &&					\
+	    mv $@-t $@
+
+install-logrotate: $(LOGROTATE_CONFS)
+	$(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt/qemu/ \
+		   $(DESTDIR)$(localstatedir)/log/libvirt/lxc/ \
+		   $(DESTDIR)$(localstatedir)/log/libvirt/uml/ \
+		   $(DESTDIR)$(sysconfdir)/logrotate.d/
+	$(INSTALL_DATA) libvirtd.logrotate \
+		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
+	$(INSTALL_DATA) libvirtd.qemu.logrotate \
+		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu
+	$(INSTALL_DATA) libvirtd.lxc.logrotate \
+		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc
+	$(INSTALL_DATA) libvirtd.libxl.logrotate \
+		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl
+	$(INSTALL_DATA) libvirtd.uml.logrotate \
+		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml
+
+uninstall-logrotate:
+	rm -f $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd \
+	      $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu \
+	      $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc \
+	      $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl \
+	      $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml
+	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
+	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/lxc || :
+	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/uml || :
+	rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
+
+install-sysconfig:
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+	$(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
+	  $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
+uninstall-sysconfig:
+	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
+	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+
+if WITH_SYSCTL
+# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
+# /usr/lib/sysctl.d/ even when libdir is /usr/lib64
+install-sysctl:
+	$(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
+	$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
+	  $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
+
+uninstall-sysctl:
+	rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
+	rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
+else ! WITH_SYSCTL
+install-sysctl:
+uninstall-sysctl:
+endif ! WITH_SYSCTL
+
+if LIBVIRT_INIT_SCRIPT_RED_HAT
+
+BUILT_SOURCES += libvirtd.init
+
+install-init-redhat: install-sysconfig libvirtd.init
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
+	$(INSTALL_SCRIPT) libvirtd.init \
+	  $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
+
+uninstall-init-redhat: uninstall-sysconfig
+	rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
+	rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
+else ! LIBVIRT_INIT_SCRIPT_RED_HAT
+install-init-redhat:
+uninstall-init-redhat:
+endif ! LIBVIRT_INIT_SCRIPT_RED_HAT
+
+
+if LIBVIRT_INIT_SCRIPT_UPSTART
+
+install-init-upstart: install-sysconfig
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
+	$(INSTALL_SCRIPT) libvirtd.upstart \
+	  $(DESTDIR)$(sysconfdir)/event.d/libvirtd
+
+uninstall-init-upstart: uninstall-sysconfig
+	rm -f $(DESTDIR)$(sysconfdir)/event.d/libvirtd
+	rmdir $(DESTDIR)$(sysconfdir)/event.d || :
+else ! LIBVIRT_INIT_SCRIPT_UPSTART
+install-init-upstart:
+uninstall-init-upstart:
+endif ! LIBVIRT_INIT_SCRIPT_UPSTART
+
+
+if LIBVIRT_INIT_SCRIPT_SYSTEMD
+
+SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+BUILT_SOURCES += libvirtd.service
+
+install-init-systemd: install-sysconfig libvirtd.service
+	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+	$(INSTALL_DATA) libvirtd.service \
+	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service
+
+uninstall-init-systemd: uninstall-sysconfig
+	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service
+	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
+else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
+install-init-systemd:
+uninstall-init-systemd:
+endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD
+
+libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
+	$(AM_V_GEN)sed						\
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
+	    < $< > $@-t &&					\
+	    chmod a+x $@-t &&					\
+	    mv $@-t $@
+
+libvirtd.service: libvirtd.service.in $(top_builddir)/config.status
+	$(AM_V_GEN)sed						\
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
+	    < $< > $@-t &&					\
+	    mv $@-t $@
+
+
+check-local: check-augeas
+
+AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
+
+test_libvirtd.aug: test_libvirtd.aug.in $(srcdir)/libvirtd.conf
+	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libvirtd.conf $< $@
+
+check-augeas: test_libvirtd.aug
+	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
+	  '$(AUGPARSE)' -I $(srcdir) test_libvirtd.aug; \
+	fi
+
+
+# This must be added last, since functions it provides/replaces
+# are used by nearly every other library.
+libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET)
+
+else ! WITH_LIBVIRTD
+install-data-local: install-data-sasl
+uninstall-local:: uninstall-data-sasl
+endif ! WITH_LIBVIRTD
+
+POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)"
+
+%.8.in: %.pod
+	$(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \
+	if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
+	sed \
+		-e 's|SYSCONFDIR|\@sysconfdir\@|g' \
+		-e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
+		< $@-t1 > $@-t2 && \
+	rm -f $@-t1 && \
+	mv $@-t2 $@
+
+%.8: %.8.in $(top_srcdir)/configure.ac
+	$(AM_V_GEN)sed \
+		-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
+		-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+		< $< > $@-t && \
+	mv $@-t $@
+
+# This is needed for clients too, so can't wrap in
+# the WITH_LIBVIRTD conditional
+if WITH_SASL
+install-data-sasl:
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
+	$(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
+		$(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
+
+uninstall-data-sasl:
+	rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
+	rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
+else ! WITH_SASL
+install-data-sasl:
+uninstall-data-sasl:
+endif ! WITH_SASL
+
+
+CLEANFILES += $(BUILT_SOURCES) $(man8_MANS)
+CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
+MAINTAINERCLEANFILES = $(MANINFILES) $(DAEMON_GENERATED)
--- a/daemon/THREADS.txt
+++ b/daemon/THREADS.txt
@@ -0,0 +1,52 @@
+
+     Threading in the libvirtd daemon
+     ================================
+
+To allow efficient processing of RPC requests, the libvirtd daemon
+makes use of threads.
+
+ - The process leader. This is the initial thread of control
+   when the daemon starts running. It is responsible for
+   initializing all the state, and starting the event loop.
+   Once that's all done, this thread does nothing except
+   wait for the event loop to quit, thus indicating an orderly
+   shutdown is required.
+
+ - The event loop. This thread runs the event loop, sitting
+   in poll() on all monitored file handles, and calculating
+   and dispatching any timers that may be registered. When
+   this thread quits, the entire daemon will shutdown.
+
+ - The workers. These 'n' threads all sit around waiting to
+   process incoming RPC requests. Since RPC requests may take
+   a long time to complete, with long idle periods, there will
+   be quite a few workers running.
+
+The use of threads obviously requires locking to ensure safety when
+accessing/changing data structures.
+
+ - the top level lock is on 'struct qemud_server'. This must be
+   held before acquiring any other lock
+
+ - Each 'struct qemud_client' object has a lock. The server lock
+   must be held before acquiring it. Once the client lock is acquired
+   the server lock can (optionally) be dropped.
+
+ - The event loop has its own self-contained lock. You can ignore
+   this as a caller of virEvent APIs.
+
+
+The server lock is used in conjunction with a condition variable
+to pass jobs from the event loop thread to the workers. The main
+event loop thread handles I/O from the client socket, and once a
+complete RPC message has been read off the wire (and optionally
+decrypted), it will be placed on the 'dx' job queue for the
+associated client object. The job condition will be signalled and
+a worker will wakup and process it.
+
+The worker thread must quickly drop its locks on the server and
+client to allow the main event loop thread to continue running
+with its other work. Critically important, is that now libvirt
+API call will ever be made with the server or client locks held.
+
+-- End
--- a/daemon/admin.c
+++ b/daemon/admin.c
@@ -0,0 +1,386 @@
+/*
+ * admin.c: handlers for admin RPC method calls
+ *
+ * Copyright (C) 2014-2016 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Author: Martin Kletzander <mkletzan@redhat.com>
+ */
+
+#include <config.h>
+
+#include "internal.h"
+#include "libvirtd.h"
+#include "libvirt_internal.h"
+
+#include "admin_protocol.h"
+#include "admin.h"
+#include "admin_server.h"
+#include "datatypes.h"
+#include "viralloc.h"
+#include "virerror.h"
+#include "virlog.h"
+#include "virnetdaemon.h"
+#include "virnetserver.h"
+#include "virstring.h"
+#include "virthreadjob.h"
+#include "virtypedparam.h"
+
+#define VIR_FROM_THIS VIR_FROM_ADMIN
+
+VIR_LOG_INIT("daemon.admin");
+
+
+void
+remoteAdmClientFreeFunc(void *data)
+{
+    struct daemonAdmClientPrivate *priv = data;
+
+    virMutexDestroy(&priv->lock);
+    virObjectUnref(priv->dmn);
+    VIR_FREE(priv);
+}
+
+void *
+remoteAdmClientInitHook(virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                        void *opaque)
+{
+    struct daemonAdmClientPrivate *priv;
+
+    if (VIR_ALLOC(priv) < 0)
+        return NULL;
+
+    if (virMutexInit(&priv->lock) < 0) {
+        VIR_FREE(priv);
+        virReportSystemError(errno, "%s", _("unable to init mutex"));
+        return NULL;
+    }
+
+    /*
+     * We don't necessarily need to ref this object right now as there
+     * must be one ref being held throughout the life of the daemon,
+     * but let's just be safe for future.
+     */
+    priv->dmn = virObjectRef(opaque);
+
+    return priv;
+}
+
+/* Helpers */
+
+static virNetServerPtr
+get_nonnull_server(virNetDaemonPtr dmn, admin_nonnull_server srv)
+{
+    return virNetDaemonGetServer(dmn, srv.name);
+}
+
+static void
+make_nonnull_server(admin_nonnull_server *srv_dst,
+                    virNetServerPtr srv_src)
+{
+    ignore_value(VIR_STRDUP_QUIET(srv_dst->name, virNetServerGetName(srv_src)));
+}
+
+static virNetServerClientPtr
+get_nonnull_client(virNetServerPtr srv, admin_nonnull_client clnt)
+{
+    return virNetServerGetClient(srv, clnt.id);
+}
+
+static void
+make_nonnull_client(admin_nonnull_client *clt_dst,
+                    virNetServerClientPtr clt_src)
+{
+    clt_dst->id = virNetServerClientGetID(clt_src);
+    clt_dst->timestamp = virNetServerClientGetTimestamp(clt_src);
+    clt_dst->transport = virNetServerClientGetTransport(clt_src);
+}
+
+/* Functions */
+static int
+adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED,
+                         virNetServerClientPtr client,
+                         virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                         virNetMessageErrorPtr rerr,
+                         struct admin_connect_open_args *args)
+{
+    unsigned int flags;
+    struct daemonAdmClientPrivate *priv =
+        virNetServerClientGetPrivateData(client);
+    int ret = -1;
+
+    VIR_DEBUG("priv=%p dmn=%p", priv, priv->dmn);
+    virMutexLock(&priv->lock);
+
+    flags = args->flags;
+    virCheckFlagsGoto(0, cleanup);
+
+    ret = 0;
+ cleanup:
+    if (ret < 0)
+        virNetMessageSaveError(rerr);
+    virMutexUnlock(&priv->lock);
+    return ret;
+}
+
+static int
+adminDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED,
+                          virNetServerClientPtr client,
+                          virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                          virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED)
+{
+    virNetServerClientDelayedClose(client);
+    return 0;
+}
+
+static int
+adminConnectGetLibVersion(virNetDaemonPtr dmn ATTRIBUTE_UNUSED,
+                          unsigned long long *libVer)
+{
+    if (libVer)
+        *libVer = LIBVIR_VERSION_NUMBER;
+    return 0;
+}
+
+static int
+adminDispatchServerGetThreadpoolParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                           virNetServerClientPtr client,
+                                           virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                           virNetMessageErrorPtr rerr,
+                                           struct admin_server_get_threadpool_parameters_args *args,
+                                           struct admin_server_get_threadpool_parameters_ret *ret)
+{
+    int rv = -1;
+    virNetServerPtr srv = NULL;
+    virTypedParameterPtr params = NULL;
+    int nparams = 0;
+    struct daemonAdmClientPrivate *priv =
+        virNetServerClientGetPrivateData(client);
+
+    if (!(srv = virNetDaemonGetServer(priv->dmn, args->srv.name)))
+        goto cleanup;
+
+    if (adminServerGetThreadPoolParameters(srv, &params, &nparams,
+                                           args->flags) < 0)
+        goto cleanup;
+
+    if (nparams > ADMIN_SERVER_THREADPOOL_PARAMETERS_MAX) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Number of threadpool parameters %d exceeds max "
+                         "allowed limit: %d"), nparams,
+                       ADMIN_SERVER_THREADPOOL_PARAMETERS_MAX);
+        goto cleanup;
+    }
+
+    if (virTypedParamsSerialize(params, nparams,
+                                (virTypedParameterRemotePtr *) &ret->params.params_val,
+                                &ret->params.params_len, 0) < 0)
+        goto cleanup;
+
+    rv = 0;
+ cleanup:
+    if (rv < 0)
+        virNetMessageSaveError(rerr);
+
+    virTypedParamsFree(params, nparams);
+    virObjectUnref(srv);
+    return rv;
+}
+
+static int
+adminDispatchServerSetThreadpoolParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                           virNetServerClientPtr client,
+                                           virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                           virNetMessageErrorPtr rerr,
+                                           struct admin_server_set_threadpool_parameters_args *args)
+{
+    int rv = -1;
+    virNetServerPtr srv = NULL;
+    virTypedParameterPtr params = NULL;
+    int nparams = 0;
+    struct daemonAdmClientPrivate *priv =
+        virNetServerClientGetPrivateData(client);
+
+    if (!(srv = virNetDaemonGetServer(priv->dmn, args->srv.name))) {
+        virReportError(VIR_ERR_NO_SERVER,
+                       _("no server with matching name '%s' found"),
+                       args->srv.name);
+        goto cleanup;
+    }
+
+    if (virTypedParamsDeserialize((virTypedParameterRemotePtr) args->params.params_val,
+                                  args->params.params_len,
+                                  ADMIN_SERVER_THREADPOOL_PARAMETERS_MAX,
+                                  &params,
+                                  &nparams) < 0)
+        goto cleanup;
+
+
+    if (adminServerSetThreadPoolParameters(srv, params,
+                                           nparams, args->flags) < 0)
+        goto cleanup;
+
+    rv = 0;
+ cleanup:
+    if (rv < 0)
+        virNetMessageSaveError(rerr);
+
+    virTypedParamsFree(params, nparams);
+    virObjectUnref(srv);
+    return rv;
+}
+
+static int
+adminDispatchClientGetInfo(virNetServerPtr server ATTRIBUTE_UNUSED,
+                           virNetServerClientPtr client,
+                           virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                           virNetMessageErrorPtr rerr,
+                           struct admin_client_get_info_args *args,
+                           struct admin_client_get_info_ret *ret)
+{
+    int rv = -1;
+    virNetServerPtr srv = NULL;
+    virNetServerClientPtr clnt = NULL;
+    virTypedParameterPtr params = NULL;
+    int nparams = 0;
+    struct daemonAdmClientPrivate *priv =
+        virNetServerClientGetPrivateData(client);
+
+    if (!(srv = virNetDaemonGetServer(priv->dmn, args->clnt.srv.name))) {
+        virReportError(VIR_ERR_NO_SERVER,
+                       _("no server with matching name '%s' found"),
+                       args->clnt.srv.name);
+        goto cleanup;
+    }
+
+    if (!(clnt = virNetServerGetClient(srv, args->clnt.id))) {
+        virReportError(VIR_ERR_NO_CLIENT,
+                       _("no client with matching id '%llu' found"),
+                       (unsigned long long) args->clnt.id);
+        goto cleanup;
+    }
+
+    if (adminClientGetInfo(clnt, &params, &nparams, args->flags) < 0)
+        goto cleanup;
+
+    if (nparams > ADMIN_CLIENT_INFO_PARAMETERS_MAX) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Number of client info parameters %d exceeds max "
+                         "allowed limit: %d"), nparams,
+                       ADMIN_CLIENT_INFO_PARAMETERS_MAX);
+        goto cleanup;
+    }
+
+    if (virTypedParamsSerialize(params, nparams,
+                                (virTypedParameterRemotePtr *) &ret->params.params_val,
+                                &ret->params.params_len,
+                                VIR_TYPED_PARAM_STRING_OKAY) < 0)
+        goto cleanup;
+
+    rv = 0;
+
+ cleanup:
+    if (rv < 0)
+        virNetMessageSaveError(rerr);
+
+    virTypedParamsFree(params, nparams);
+    virObjectUnref(clnt);
+    virObjectUnref(srv);
+    return rv;
+}
+
+static int
+adminDispatchServerGetClientLimits(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                   virNetServerClientPtr client,
+                                   virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                   virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
+                                   admin_server_get_client_limits_args *args,
+                                   admin_server_get_client_limits_ret *ret)
+{
+    int rv = -1;
+    virNetServerPtr srv = NULL;
+    virTypedParameterPtr params = NULL;
+    int nparams = 0;
+    struct daemonAdmClientPrivate *priv =
+        virNetServerClientGetPrivateData(client);
+
+    if (!(srv = virNetDaemonGetServer(priv->dmn, args->srv.name)))
+        goto cleanup;
+
+    if (adminServerGetClientLimits(srv, &params, &nparams, args->flags) < 0)
+        goto cleanup;
+
+    if (nparams > ADMIN_SERVER_CLIENT_LIMITS_MAX) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Number of client processing parameters %d exceeds "
+                         "max allowed limit: %d"), nparams,
+                       ADMIN_SERVER_CLIENT_LIMITS_MAX);
+        goto cleanup;
+    }
+
+    if (virTypedParamsSerialize(params, nparams,
+                                (virTypedParameterRemotePtr *) &ret->params.params_val,
+                                &ret->params.params_len, 0) < 0)
+        goto cleanup;
+
+    rv = 0;
+ cleanup:
+    if (rv < 0)
+        virNetMessageSaveError(rerr);
+
+    virTypedParamsFree(params, nparams);
+    virObjectUnref(srv);
+    return rv;
+}
+
+static int
+adminDispatchServerSetClientLimits(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                   virNetServerClientPtr client,
+                                   virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                   virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED,
+                                   admin_server_set_client_limits_args *args)
+{
+    int rv = -1;
+    virNetServerPtr srv = NULL;
+    virTypedParameterPtr params = NULL;
+    int nparams = 0;
+    struct daemonAdmClientPrivate *priv =
+        virNetServerClientGetPrivateData(client);
+
+    if (!(srv = virNetDaemonGetServer(priv->dmn, args->srv.name))) {
+        virReportError(VIR_ERR_NO_SERVER,
+                       _("no server with matching name '%s' found"),
+                       args->srv.name);
+        goto cleanup;
+    }
+
+    if (virTypedParamsDeserialize((virTypedParameterRemotePtr) args->params.params_val,
+        args->params.params_len,
+        ADMIN_SERVER_CLIENT_LIMITS_MAX, &params, &nparams) < 0)
+        goto cleanup;
+
+    if (adminServerSetClientLimits(srv, params, nparams, args->flags) < 0)
+        goto cleanup;
+
+    rv = 0;
+ cleanup:
+    if (rv < 0)
+        virNetMessageSaveError(rerr);
+    virTypedParamsFree(params, nparams);
+    virObjectUnref(srv);
+    return rv;
+}
+#include "admin_dispatch.h"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Cole Robinson	785646a4e1	Prep for release 2.2.1	2017-05-10 16:47:43 -04:00
Jiri Denemark	99ea70b49a	spec: Avoid RPM verification errors on nwfilter XMLs /etc/libvirt/nwfilter/*.xml files are installed with no UUID, which means libvirtd will automatically alter all of them once it starts. Thus RPM verification will always fail on them. Let's use a trick similar to the default network XML and store nwfilter XMLs in /usr/share. They will be copied into /etc in %post. Additionally the /etc files are marked as %ghost so that they are uninstalled if the RPM package is removed. Note that the %post script overwrites existing files with new ones on upgrade, which is what has always been happening. https://bugzilla.redhat.com/show_bug.cgi?id=1431581 https://bugzilla.redhat.com/show_bug.cgi?id=1378774 Signed-off-by: Jiri Denemark <jdenemar@redhat.com> (cherry picked from commit `1d3963dba5`)	2017-05-10 15:42:45 -04:00
Pavel Hrdina	b23980eb3d	qemu_process: spice: don't release used port The port is stored in graphics configuration and it will also get released in qemuProcessStop in case of error. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1397440 Signed-off-by: Pavel Hrdina <phrdina@redhat.com> (cherry picked from commit `c23b7b81db`)	2017-05-10 15:42:45 -04:00
Nikolay Shirokovskiy	b6be55d7c5	qemu: Fix crash during qemuStateCleanup Rather than waiting until we've free'd up all the resources, cause the 'workerPool' thread pool to flush as soon as possible during stateCleanup. Otherwise, it's possible something waiting to run will SEGV such as is the case during race conditions of simultaneous exiting libvirtd and qemu process. Resolves the following crash: [1] crash backtrace: (bt is shortened a bit): 0 0x00007ffff7282f2b in virClassIsDerivedFrom (klass=0xdeadbeef, parent=0x55555581d650) at util/virobject.c:169 1 0x00007ffff72835fd in virObjectIsClass (anyobj=0x7fffd024f580, klass=0x55555581d650) at util/virobject.c:365 2 0x00007ffff7283498 in virObjectLock (anyobj=0x7fffd024f580) at util/virobject.c:317 3 0x00007ffff722f0a3 in virCloseCallbacksUnset (closeCallbacks=0x7fffd024f580, vm=0x7fffd0194db0, cb=0x7fffdf1af765 <qemuProcessAutoDestroy>) at util/virclosecallbacks.c:164 4 0x00007fffdf1afa7b in qemuProcessAutoDestroyRemove (driver=0x7fffd00f3a60, vm=0x7fffd0194db0) at qemu/qemu_process.c:6365 5 0x00007fffdf1adff1 in qemuProcessStop (driver=0x7fffd00f3a60, vm=0x7fffd0194db0, reason=VIR_DOMAIN_SHUTOFF_CRASHED, asyncJob=QEMU_ASYNC_JOB_NONE, flags=0) at qemu/qemu_process.c:5877 6 0x00007fffdf1f711c in processMonitorEOFEvent (driver=0x7fffd00f3a60, vm=0x7fffd0194db0) at qemu/qemu_driver.c:4545 7 0x00007fffdf1f7313 in qemuProcessEventHandler (data=0x555555832710, opaque=0x7fffd00f3a60) at qemu/qemu_driver.c:4589 8 0x00007ffff72a84c4 in virThreadPoolWorker (opaque=0x555555805da0) at util/virthreadpool.c:167 Thread 1 (Thread 0x7ffff7fb1880 (LWP 494472)): 1 0x00007ffff72a7898 in virCondWait (c=0x7fffd01c21f8, m=0x7fffd01c21a0) at util/virthread.c:154 2 0x00007ffff72a8a22 in virThreadPoolFree (pool=0x7fffd01c2160) at util/virthreadpool.c:290 3 0x00007fffdf1edd44 in qemuStateCleanup () at qemu/qemu_driver.c:1102 4 0x00007ffff736570a in virStateCleanup () at libvirt.c:807 5 0x000055555556f991 in main (argc=1, argv=0x7fffffffe458) at libvirtd.c:1660 (cherry picked from commit `97338eaa7b`)	2017-05-10 15:42:45 -04:00
Nikolay Shirokovskiy	2e66047cc0	daemon: Fix crash during daemon cleanup Do not dereference the 'dmn' until after the virStateCleanup is completed. During initialization, virStateInitialize requires/uses the "dmn" as the argument to/for the daemonInhibitCallback functions. Thus, cleanup cannot dereference 'dmn' until after calling the virStateCleanup which calls the the daemonInhibitCallback using 'dmn'; otherwise, the following crash occurs: backtrace (shortened a bit) 1 0x00007fd3a791b2e6 in virCondWait (c=<optimized out>, m=<optimized out>) at util/virthread.c:154 2 0x00007fd3a791bcb0 in virThreadPoolFree (pool=0x7fd38024ee00) at util/virthreadpool.c:266 3 0x00007fd38edaa00e in qemuStateCleanup () at qemu/qemu_driver.c:1116 4 0x00007fd3a79abfeb in virStateCleanup () at libvirt.c:808 5 0x00007fd3a85f2c9e in main (argc=<optimized out>, argv=<optimized out>) at libvirtd.c:1660 Thread 1 (Thread 0x7fd38722d700 (LWP 32256)): 0 0x00007fd3a7900910 in virClassIsDerivedFrom (klass=0xdfd36058d4853, parent=0x7fd3a8f394d0) at util/virobject.c:169 1 0x00007fd3a7900c4e in virObjectIsClass (anyobj=anyobj@entry=0x7fd3a8f2f850, klass=<optimized out>) at util/virobject.c:365 2 0x00007fd3a7900c74 in virObjectLock (anyobj=0x7fd3a8f2f850) at util/virobject.c:317 3 0x00007fd3a7a24d5d in virNetDaemonRemoveShutdownInhibition (dmn=0x7fd3a8f2f850) at rpc/virnetdaemon.c:547 4 0x00007fd38ed722cf in qemuProcessStop (driver=driver@entry=0x7fd380103810, vm=vm@entry=0x7fd38025b6d0, reason=reason@entry=VIR_DOMAIN_SHUTOFF_SHUTDOWN, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE, flags=flags@entry=0) at qemu/qemu_process.c:5786 5 0x00007fd38edd9428 in processMonitorEOFEvent (vm=0x7fd38025b6d0, driver=0x7fd380103810) at qemu/qemu_driver.c:4588 6 qemuProcessEventHandler (data=<optimized out>, opaque=0x7fd380103810) at qemu/qemu_driver.c:4632 7 0x00007fd3a791bb55 in virThreadPoolWorker (opaque=opaque@entry=0x7fd3a8f1e4c0) at util/virthreadpool.c:145 (cherry picked from commit `85c3a1820a`)	2017-05-10 15:42:45 -04:00
Ján Tomko	5d34d09321	Fix crash on usb-serial hotplug For domains with no USB address cache, we should not attempt to generate a USB address. https://bugzilla.redhat.com/show_bug.cgi?id=1387665 (cherry picked from commit `00c5386c86`)	2017-05-10 15:42:45 -04:00
Michal Privoznik	91f826810d	qemuBuildMemoryBackendStr: Don't crash if no hugetlbfs is mounted When trying to migrate a huge page enabled guest, I've noticed the following crash. Apparently, if no specific hugepages are requested: <memoryBacking> <hugepages/> </memoryBacking> and there are no hugepages configured on the destination, we try to dereference a NULL pointer. Program received signal SIGSEGV, Segmentation fault. 0x00007fcc907fb20e in qemuGetHugepagePath (hugepage=0x0) at qemu/qemu_conf.c:1447 1447 if (virAsprintf(&ret, "%s/libvirt/qemu", hugepage->mnt_dir) < 0) (gdb) bt #0 0x00007fcc907fb20e in qemuGetHugepagePath (hugepage=0x0) at qemu/qemu_conf.c:1447 #1 0x00007fcc907fb2f5 in qemuGetDefaultHugepath (hugetlbfs=0x0, nhugetlbfs=0) at qemu/qemu_conf.c:1466 #2 0x00007fcc907b4afa in qemuBuildMemoryBackendStr (size=4194304, pagesize=0, guestNode=0, userNodeset=0x0, autoNodeset=0x0, def=0x7fcc70019070, qemuCaps=0x7fcc70004000, cfg=0x7fcc5c011800, backendType=0x7fcc95087228, backendProps=0x7fcc95087218, force=false) at qemu/qemu_command.c:3297 #3 0x00007fcc907b4f91 in qemuBuildMemoryCellBackendStr (def=0x7fcc70019070, qemuCaps=0x7fcc70004000, cfg=0x7fcc5c011800, cell=0, auto_nodeset=0x0, backendStr=0x7fcc70020360) at qemu/qemu_command.c:3413 #4 0x00007fcc907c0406 in qemuBuildNumaArgStr (cfg=0x7fcc5c011800, def=0x7fcc70019070, cmd=0x7fcc700040c0, qemuCaps=0x7fcc70004000, auto_nodeset=0x0) at qemu/qemu_command.c:7470 #5 0x00007fcc907c5fdf in qemuBuildCommandLine (driver=0x7fcc5c07b8a0, logManager=0x7fcc70003c00, def=0x7fcc70019070, monitor_chr=0x7fcc70004bb0, monitor_json=true, qemuCaps=0x7fcc70004000, migrateURI=0x7fcc700199c0 "defer", snapshot=0x0, vmop=VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, standalone=false, enableFips=false, nodeset=0x0, nnicindexes=0x7fcc95087498, nicindexes=0x7fcc950874a0, domainLibDir=0x7fcc700047c0 "/var/lib/libvirt/qemu/domain-1-fedora") at qemu/qemu_command.c:9547 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> (cherry picked from commit `647db05e9a`)	2017-05-10 15:42:45 -04:00
Maxim Nestratov	dfdacfe264	util: fix crash in virClassIsDerivedFrom for CloseCallbacks objects There is a possibility that qemu driver frees by unreferencing its closeCallbacks pointer as it has the only reference to the object, while in fact not all users of CloseCallbacks called thier virCloseCallbacksUnset. Backtrace is the following: Thread #1: 0 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 1 in virCondWait (c=<optimized out>, m=<optimized out>) at util/virthread.c:154 2 in virThreadPoolFree (pool=0x7f0810110b50) at util/virthreadpool.c:266 3 in qemuStateCleanup () at qemu/qemu_driver.c:1116 4 in virStateCleanup () at libvirt.c:808 5 in main (argc=<optimized out>, argv=<optimized out>) at libvirtd.c:1660 Thread #2: 0 in virClassIsDerivedFrom (klass=0xdeadbeef, parent=0x7f0837c694d0) at util/virobject.c:169 1 in virObjectIsClass (anyobj=anyobj@entry=0x7f08101d4760, klass=<optimized out>) at util/virobject.c:365 2 in virObjectLock (anyobj=0x7f08101d4760) at util/virobject.c:317 3 in virCloseCallbacksUnset (closeCallbacks=0x7f08101d4760, vm=vm@entry=0x7f08101d47b0, cb=cb@entry=0x7f081d078fc0 <qemuProcessAutoDestroy>) at util/virclosecallbacks.c:163 4 in qemuProcessAutoDestroyRemove (driver=driver@entry=0x7f081018be50, vm=vm@entry=0x7f08101d47b0) at qemu/qemu_process.c:6368 5 in qemuProcessStop (driver=driver@entry=0x7f081018be50, vm=vm@entry=0x7f08101d47b0, reason=reason@entry=VIR_DOMAIN_SHUTOFF_SHUTDOWN, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE, flags=flags@entry=0) at qemu/qemu_process.c:5854 6 in processMonitorEOFEvent (vm=0x7f08101d47b0, driver=0x7f081018be50) at qemu/qemu_driver.c:4585 7 qemuProcessEventHandler (data=<optimized out>, opaque=0x7f081018be50) at qemu/qemu_driver.c:4629 8 in virThreadPoolWorker (opaque=opaque@entry=0x7f0837c4f820) at util/virthreadpool.c:145 9 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 10 in start_thread () from /lib64/libpthread.so.0 Let's reference CloseCallbacks object in virCloseCallbacksSet and unreference in virCloseCallbacksUnset. Signed-off-by: Maxim Nestratov <mnestratov@virtuozzo.com> (cherry picked from commit `f47b91148a`)	2017-05-10 15:42:45 -04:00
Peter Krempa	2d5c306616	storage: driver: Remove unavailable transient pools after restart If a transient storage pool is deemed inactive after libvirtd restart it would not be deleted from the list. Reuse virStoragePoolUpdateInactive along with a refactor necessary to properly update the state. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1242801 (cherry picked from commit `f3a8e80c13`)	2017-05-10 15:42:45 -04:00
Peter Krempa	87ed28f6a5	storage: driver: Split out code fixing pool state after deactivation After a pool is made inactive the definition objects need to be updated (if a new definition is prepared) and transient pools need to be completely removed. Split out the code doing these steps into a separate function for later reuse. (cherry picked from commit `aced6b2356`)	2017-05-10 15:42:45 -04:00
John Ferlan	e24ff1f38e	qemu: Don't assume secret provided for LUKS encryption https://bugzilla.redhat.com/show_bug.cgi?id=1405269 If a secret was not provided for what was determined to be a LUKS encrypted disk (during virStorageFileGetMetadata processing when called from qemuDomainDetermineDiskChain as a result of hotplug attach qemuDomainAttachDeviceDiskLive), then do not attempt to look it up (avoiding a libvirtd crash) and do not alter the format to "luks" when adding the disk; otherwise, the device_add would fail with a message such as: "unable to execute QEMU command 'device_add': Property 'scsi-hd.drive' can't find value 'drive-scsi0-0-0-0'" because of assumptions that when the format=luks that libvirt would have provided the secret to decrypt the volume. Access to unlock the volume will thus be left to the application. (cherry picked from commit `7f7d990483`)	2017-05-10 15:42:45 -04:00
Ján Tomko	47fa3d3992	conf: do not steal pointers from the pool source Since commit `fcbbb28` we steal the pointer to the storage pool source name if there was no pool name specified. Properly duplicate the string to avoid freeing it twice. https://bugzilla.redhat.com/show_bug.cgi?id=1436400 (cherry picked from commit `e9f9690958`)	2017-05-10 15:42:45 -04:00
Ján Tomko	987213ac7d	schema: do not require name for certain pool types Pool types that have the VIR_STORAGE_POOL_SOURCE_NAME flag set allow omitting the <name> element and instead fill out the pool name from the <source><name> element. Relax the schema to make <name> optional for these pools. Expressing that at least one of these is required is out of scope of the schema. (cherry picked from commit `8ef12b96fa`)	2017-05-10 15:42:44 -04:00
Andrea Bolognani	7627dcdc7d	virtlogd: Don't stop or restart along with libvirtd Commit `839a060` tied the lifecycle of virtlogd more closely to that of libvirtd. Unfortunately, while starting virtlogd when libvirtd is started is definitely a good idea, restarting virtlogd or shutting it down at any time outside of system poweroff is not. Revert part of that commit by removing the PartOf= lines, meaning that only startup requests will be propagated from libvirtd to virtlogd. Resolves: https://bugzilla.redhat.com/1372576 (cherry picked from commit `f496ce1df3`)	2017-05-10 15:24:57 -04:00
Andrea Bolognani	d4f8a0e0cd	virtlogd.socket: Tie lifecycle to libvirtd.service We already guarantee that virtlogd.socket is enabled/disabled along with libvirtd.service, but if libvirtd.service has just been installed and is started before rebooting, then virtlogd.socket will not be running and guest startup will fail. Add Requires=virtlogd.socket to libvirtd.service to make sure virtlogd.socket is always started along with libvirtd.service, and add Before=libvirtd.service to both virtlogd.socket and virtlogd.service so that virtlogd never disappears before libvirtd has exited. Also add PartOf=libvirtd.service to both virtlogd.socket and virtlogd.service, so that virtlogd can be shut down when not needed. Resolves: https://bugzilla.redhat.com/1372576 (cherry picked from commit `839a060890`)	2017-05-10 15:24:50 -04:00
Cole Robinson	5141c2be98	spec: Update version check for maint Source URL New maint release version numbers of just A.B.C format, not the old A.B.C.D format. Adjust the check that dynamically changes the Source URL for maint releases Signed-off-by: Cole Robinson <crobinso@redhat.com> Acked-by: Andrea Bolognani <abologna@redhat.com> (cherry picked from commit `1d07a5bf3c`)	2017-05-10 15:23:41 -04:00
Peter Krempa	2f469c062c	qemu: capabilities: Don't partially reprope caps on process reconnect Thanks to the complex capability caching code virQEMUCapsProbeQMP was never called when we were starting a new qemu VM. On the other hand, when we are reconnecting to the qemu process we reload the capability list from the status XML file. This means that the flag preventing the function being called was not set and thus we partially reprobed some of the capabilities. The recent addition of CPU hotplug clears the QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS if the machine does not support it. The partial re-probe on reconnect results into attempting to call the unsupported command and then killing the VM. Remove the partial reprobe and depend on the stored capabilities. If it will be necessary to reprobe the capabilities in the future, we should do a full reprobe rather than this partial one. (cherry picked from commit `b87a11340f`)	2016-11-28 13:49:42 +01:00
Laine Stump	06f5c46e5d	network: fix endless loop when starting network with multiple IPs and no dhcp commit `9065cfaa` added the ability to disable DNS services for a libvirt virtual network. If neither DNS nor DHCP is needed for a network, then we don't need to start dnsmasq, so code was added to check for this. Unfortunately, it was written with a great lack of attention to detail (I can say that, because I was the author), and the loop that checked if DHCP is needed for the network would never end if the network had multiple IP addresses and the first <ip> had no <dhcp> subelement (which would have contained a <range> or <host> subelement, thus requiring DHCP services). This patch rewrites the check to be more compact and (more importantly) finite. This bug was present in release 2.2.0 and 2.3.0, so will need to be backported to any relevant maintainence branches. Reported here: https://www.redhat.com/archives/libvirt-users/2016-October/msg00032.html https://www.redhat.com/archives/libvirt-users/2016-October/msg00045.html (cherry picked from commit `bbb333e481`)	2016-11-10 16:54:35 -05:00
Laine Stump	52cc796d1c	qemu: allow 32 slots on pcie-expander-bus, not just 1 When I added support for the pcie-expander-bus controller in commit `bc07251f`, I incorrectly thought that it only had a single slot available. Actually it has 32 slots, just like the root complex aka pcie-root (the part that I did get correct is that unlike pcie-root a pcie-expander-bus doesn't allow any integrated endpoint devices - only pcie-root-ports and dmi-to-pci-controllers are allowed). (cherry picked from commit `22afd44171`)	2016-10-06 11:54:49 +01:00
Martin Kletzander	4c052baf46	qemu: Only use memory-backend-file with NUMA if needed If this reminds you of a commit message from around a year ago, it's `41c2aa729f` and yes, we're dealing with "the same thing" again. Or `f309db1f4d` and it's similar. There is a logic in place that if there is no real need for memory-backend-file, qemuBuildMemoryBackendStr() returns 0. However that wasn't the case with hugepage backing. The reason for that was that we abused the 'pagesize' variable for storing that information, but we should rather have a separate one that specifies whether we really need the new object for hugepage backing. And that variable should be set only if this particular NUMA cell needs special treatment WRT hugepages. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1372153 Signed-off-by: Martin Kletzander <mkletzan@redhat.com> (cherry picked from commit 4372a7845acbc6974f6027ef68e7dd3eeb47f425)	2016-10-04 08:38:55 +02:00