- Devel - libvirt List Archives

[PATCH 0/7] hw/arm/raspi4b: Add models with 4GB and 8GB of DRAM
by Philippe Mathieu-Daudé 04 Feb '25

04 Feb '25

- Deprecate the 'raspi4b' machine name, renaming it as 'raspi4b-1g' on 32-bit hosts, 'raspi4b-2g' otherwise. - Add the 'raspi4b-4g' and 'raspi4b-8g' machines, with respectively 4GB and 8GB of DRAM. Philippe Mathieu-Daudé (7): hw/arm/raspi4b: Declare machine types using DEFINE_TYPES() macro hw/arm/raspi4b: Introduce abstract raspi4-base machine type hw/arm/raspi4b: Split raspi4b_machine_class_init() in two (1g and 2g) hw/arm/raspi4b: Rename as raspi4b-1g / raspi4b-2g, deprecating old name hw/arm/raspi4b: Expose the raspi4b-1g machine on 64-bit hosts hw/arm/raspi4b: Add the raspi4b-4g machine hw/arm/raspi4b: Add the raspi4b-8g machine docs/about/deprecated.rst | 6 +++ hw/arm/raspi4b.c | 91 +++++++++++++++++++++++++++++++-------- 2 files changed, 79 insertions(+), 18 deletions(-) -- 2.47.1

5 17

[libvirt PATCH] ci: refresh with latest 'lcitool manifest'
by Pavel Hrdina 03 Feb '25

03 Feb '25

Fedora and Alpine updated to latest versions. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- ci/buildenv/{alpine-319.sh => alpine-320.sh} | 0 ci/buildenv/debian-11-cross-aarch64.sh | 2 +- ci/buildenv/debian-11-cross-armv6l.sh | 2 +- ci/buildenv/debian-11-cross-armv7l.sh | 2 +- ci/buildenv/debian-11-cross-i686.sh | 2 +- ci/buildenv/debian-11-cross-mips64el.sh | 2 +- ci/buildenv/debian-11-cross-mipsel.sh | 2 +- ci/buildenv/debian-11-cross-ppc64le.sh | 2 +- ci/buildenv/debian-11-cross-s390x.sh | 2 +- ci/buildenv/debian-11.sh | 2 +- ci/buildenv/debian-12-cross-aarch64.sh | 2 +- ci/buildenv/debian-12-cross-armv6l.sh | 2 +- ci/buildenv/debian-12-cross-armv7l.sh | 2 +- ci/buildenv/debian-12-cross-i686.sh | 2 +- ci/buildenv/debian-12-cross-mips64el.sh | 2 +- ci/buildenv/debian-12-cross-mipsel.sh | 2 +- ci/buildenv/debian-12-cross-ppc64le.sh | 2 +- ci/buildenv/debian-12-cross-s390x.sh | 2 +- ci/buildenv/debian-12.sh | 2 +- ci/buildenv/debian-sid-cross-aarch64.sh | 2 +- ci/buildenv/debian-sid-cross-armv6l.sh | 2 +- ci/buildenv/debian-sid-cross-armv7l.sh | 2 +- ci/buildenv/debian-sid-cross-i686.sh | 2 +- ci/buildenv/debian-sid-cross-mips64el.sh | 2 +- ci/buildenv/debian-sid-cross-ppc64le.sh | 2 +- ci/buildenv/debian-sid-cross-s390x.sh | 2 +- ci/buildenv/debian-sid.sh | 2 +- ...-mingw32.sh => fedora-41-cross-mingw32.sh} | 2 +- ...-mingw64.sh => fedora-41-cross-mingw64.sh} | 2 +- ci/buildenv/{fedora-39.sh => fedora-41.sh} | 3 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ...e-319.Dockerfile => alpine-320.Dockerfile} | 2 +- .../debian-11-cross-aarch64.Dockerfile | 2 +- .../debian-11-cross-armv6l.Dockerfile | 2 +- .../debian-11-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-11-cross-i686.Dockerfile | 2 +- .../debian-11-cross-mips64el.Dockerfile | 2 +- .../debian-11-cross-mipsel.Dockerfile | 2 +- .../debian-11-cross-ppc64le.Dockerfile | 2 +- .../debian-11-cross-s390x.Dockerfile | 2 +- ci/containers/debian-11.Dockerfile | 2 +- .../debian-12-cross-aarch64.Dockerfile | 2 +- .../debian-12-cross-armv6l.Dockerfile | 2 +- .../debian-12-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-12-cross-i686.Dockerfile | 2 +- .../debian-12-cross-mips64el.Dockerfile | 2 +- .../debian-12-cross-mipsel.Dockerfile | 2 +- .../debian-12-cross-ppc64le.Dockerfile | 2 +- .../debian-12-cross-s390x.Dockerfile | 2 +- ci/containers/debian-12.Dockerfile | 2 +- .../debian-sid-cross-aarch64.Dockerfile | 2 +- .../debian-sid-cross-armv6l.Dockerfile | 2 +- .../debian-sid-cross-armv7l.Dockerfile | 2 +- .../debian-sid-cross-i686.Dockerfile | 2 +- .../debian-sid-cross-mips64el.Dockerfile | 2 +- .../debian-sid-cross-ppc64le.Dockerfile | 2 +- .../debian-sid-cross-s390x.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ...ile => fedora-41-cross-mingw32.Dockerfile} | 4 +- ...ile => fedora-41-cross-mingw64.Dockerfile} | 4 +- ...ora-39.Dockerfile => fedora-41.Dockerfile} | 5 +- ci/gitlab.yml | 1 + ci/gitlab/build-templates.yml | 4 +- ci/gitlab/builds.yml | 54 +++++++++---------- ci/gitlab/containers.yml | 26 ++++----- ci/integration.yml | 20 +++---- ci/manifest.yml | 18 +++---- 68 files changed, 128 insertions(+), 125 deletions(-) rename ci/buildenv/{alpine-319.sh => alpine-320.sh} (100%) rename ci/buildenv/{fedora-40-cross-mingw32.sh => fedora-41-cross-mingw32.sh} (98%) rename ci/buildenv/{fedora-40-cross-mingw64.sh => fedora-41-cross-mingw64.sh} (98%) rename ci/buildenv/{fedora-39.sh => fedora-41.sh} (97%) rename ci/containers/{alpine-319.Dockerfile => alpine-320.Dockerfile} (98%) rename ci/containers/{fedora-40-cross-mingw32.Dockerfile => fedora-41-cross-mingw32.Dockerfile} (96%) rename ci/containers/{fedora-40-cross-mingw64.Dockerfile => fedora-41-cross-mingw64.Dockerfile} (96%) rename ci/containers/{fedora-39.Dockerfile => fedora-41.Dockerfile} (96%) diff --git a/ci/buildenv/alpine-319.sh b/ci/buildenv/alpine-320.sh similarity index 100% rename from ci/buildenv/alpine-319.sh rename to ci/buildenv/alpine-320.sh diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11-cross-aarch64.sh index 6600b73e74..a52164a851 100644 --- a/ci/buildenv/debian-11-cross-aarch64.sh +++ b/ci/buildenv/debian-11-cross-aarch64.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-cross-armv6l.sh index 761d813df0..caef8e80a4 100644 --- a/ci/buildenv/debian-11-cross-armv6l.sh +++ b/ci/buildenv/debian-11-cross-armv6l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-cross-armv7l.sh index 6c016bd90b..81d92e6386 100644 --- a/ci/buildenv/debian-11-cross-armv7l.sh +++ b/ci/buildenv/debian-11-cross-armv7l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh index b9705f1c3c..7ab7242654 100644 --- a/ci/buildenv/debian-11-cross-i686.sh +++ b/ci/buildenv/debian-11-cross-i686.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-11-cross-mips64el.sh index 065c61ba57..f983ab2981 100644 --- a/ci/buildenv/debian-11-cross-mips64el.sh +++ b/ci/buildenv/debian-11-cross-mips64el.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-cross-mipsel.sh index 89a0a8904b..55a99b861f 100644 --- a/ci/buildenv/debian-11-cross-mipsel.sh +++ b/ci/buildenv/debian-11-cross-mipsel.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11-cross-ppc64le.sh index c898939f09..b7d26e67fd 100644 --- a/ci/buildenv/debian-11-cross-ppc64le.sh +++ b/ci/buildenv/debian-11-cross-ppc64le.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh index f1b94ac872..ac259c5625 100644 --- a/ci/buildenv/debian-11-cross-s390x.sh +++ b/ci/buildenv/debian-11-cross-s390x.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh index 9ba9e80183..affdf6e445 100644 --- a/ci/buildenv/debian-11.sh +++ b/ci/buildenv/debian-11.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index b4a056d940..1d69c099a4 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index 07ffb3da37..db2ee46af5 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 6f88f6cc06..9ab435d0d7 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index 5da816d086..fbc6da5dd4 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index 09c445758c..f7067dfeb3 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index a762d1e3b8..6dd5333ae4 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index fe7b672799..97de655904 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 1ca0768d14..725d1ee113 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index fcd5291f22..5e5b759f08 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index b4a056d940..1d69c099a4 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index 53d2d79b38..ac03caeb5c 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 4e60877e77..c540104cb0 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 98e08b2397..b558576fca 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 09c445758c..f7067dfeb3 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index fe7b672799..97de655904 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 1ca0768d14..725d1ee113 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index fcd5291f22..5e5b759f08 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/fedora-40-cross-mingw32.sh b/ci/buildenv/fedora-41-cross-mingw32.sh similarity index 98% rename from ci/buildenv/fedora-40-cross-mingw32.sh rename to ci/buildenv/fedora-41-cross-mingw32.sh index 9104b2e20e..b19f0dccb2 100644 --- a/ci/buildenv/fedora-40-cross-mingw32.sh +++ b/ci/buildenv/fedora-41-cross-mingw32.sh @@ -8,7 +8,7 @@ function install_buildenv() { dnf update -y dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/buildenv/fedora-40-cross-mingw64.sh b/ci/buildenv/fedora-41-cross-mingw64.sh similarity index 98% rename from ci/buildenv/fedora-40-cross-mingw64.sh rename to ci/buildenv/fedora-41-cross-mingw64.sh index 35120064ec..20dca703b5 100644 --- a/ci/buildenv/fedora-40-cross-mingw64.sh +++ b/ci/buildenv/fedora-41-cross-mingw64.sh @@ -8,7 +8,7 @@ function install_buildenv() { dnf update -y dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/buildenv/fedora-39.sh b/ci/buildenv/fedora-41.sh similarity index 97% rename from ci/buildenv/fedora-39.sh rename to ci/buildenv/fedora-41.sh index e45ac2230f..c32a689fbd 100644 --- a/ci/buildenv/fedora-39.sh +++ b/ci/buildenv/fedora-41.sh @@ -9,7 +9,7 @@ function install_buildenv() { dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -82,6 +82,7 @@ function install_buildenv() { systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index fbcd613095..56b66e3b2a 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars index 3002987cbd..fb665d16ee 100644 --- a/ci/cirrus/freebsd-14.vars +++ b/ci/cirrus/freebsd-14.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/containers/alpine-319.Dockerfile b/ci/containers/alpine-320.Dockerfile similarity index 98% rename from ci/containers/alpine-319.Dockerfile rename to ci/containers/alpine-320.Dockerfile index 2e4842ef3e..1b95c92e65 100644 --- a/ci/containers/alpine-319.Dockerfile +++ b/ci/containers/alpine-320.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.19 +FROM docker.io/library/alpine:3.20 RUN apk update && \ apk upgrade && \ diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index f8d4ea8ed2..79c359f9fa 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index f974163000..27bd6c578b 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index ced175c7c0..3b413673a6 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index c1ee60f3b6..ab5173f2f1 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index 98c40beef4..04fa68f688 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index e3531a9fac..558382ad25 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 8f9f729909..ed68e8f0af 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index b09076b148..62791ac154 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile index 1660bd9c52..48c59e3aab 100644 --- a/ci/containers/debian-11.Dockerfile +++ b/ci/containers/debian-11.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index f4d587177b..ebccfbc203 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index d8f2a3bc42..a6f51c80fd 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index 1abfb79931..132938ce10 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 5681121d80..3a76ee4e76 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index a4f2aabe10..c8009062ef 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index a3f0652818..efb4639a26 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index caf8229a8e..3b0cfab7ef 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index c4f8479c13..c730b44e03 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 3e6d0597e2..778f6962d9 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 3a06f01c5c..2d0e4d8a98 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index fdf129aa04..d3034c0131 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 8dbb705d69..30234b6755 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index f856306a62..2c2c4772c8 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 468c5fbc3e..0af87394cc 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 37c256fe1e..d91a84c65b 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 232a8d7844..147c5e992f 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index febd286d86..daa750324b 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/fedora-40-cross-mingw32.Dockerfile b/ci/containers/fedora-41-cross-mingw32.Dockerfile similarity index 96% rename from ci/containers/fedora-40-cross-mingw32.Dockerfile rename to ci/containers/fedora-41-cross-mingw32.Dockerfile index ed8566f273..6ab14be6fc 100644 --- a/ci/containers/fedora-40-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-41-cross-mingw32.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/containers/fedora-40-cross-mingw64.Dockerfile b/ci/containers/fedora-41-cross-mingw64.Dockerfile similarity index 96% rename from ci/containers/fedora-40-cross-mingw64.Dockerfile rename to ci/containers/fedora-41-cross-mingw64.Dockerfile index b030427e0c..a0ec65d74a 100644 --- a/ci/containers/fedora-40-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-41-cross-mingw64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/containers/fedora-39.Dockerfile b/ci/containers/fedora-41.Dockerfile similarity index 96% rename from ci/containers/fedora-39.Dockerfile rename to ci/containers/fedora-41.Dockerfile index 2e35ca426d..a46f220de0 100644 --- a/ci/containers/fedora-39.Dockerfile +++ b/ci/containers/fedora-41.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -20,7 +20,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -93,6 +93,7 @@ exec "$@"\n' > /usr/bin/nosync && \ systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel && \ nosync dnf autoremove -y && \ diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 0daab12676..0e6de9f36d 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -55,6 +55,7 @@ variables: RUN_UPSTREAM_NAMESPACE: libvirt + CONTAINER_UPSTREAM_NAMESPACE: libvirt FF_SCRIPT_SECTIONS: 1 diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 5ba91ffc67..a4b76e06d0 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -35,7 +35,7 @@ fi - cat /packages.txt variables: - IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest + IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest rules: ### PUSH events @@ -179,7 +179,7 @@ fi - cat /packages.txt variables: - IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest + IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest rules: ### PUSH events diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 3e7f36802e..fc0001b70a 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -33,15 +33,15 @@ x86_64-almalinux-9-clang: TARGET_BASE_IMAGE: docker.io/library/almalinux:9 -x86_64-alpine-319: +x86_64-alpine-320: extends: .native_build_job needs: - - job: x86_64-alpine-319-container + - job: x86_64-alpine-320-container optional: true allow_failure: false variables: - NAME: alpine-319 - TARGET_BASE_IMAGE: docker.io/library/alpine:3.19 + NAME: alpine-320 + TARGET_BASE_IMAGE: docker.io/library/alpine:3.20 x86_64-alpine-edge: @@ -127,21 +127,6 @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-39: - extends: .native_build_job - needs: - - job: x86_64-fedora-39-container - optional: true - allow_failure: false - variables: - NAME: fedora-39 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - - x86_64-fedora-40: extends: .native_build_job needs: @@ -157,6 +142,21 @@ x86_64-fedora-40: - libvirt-rpms +x86_64-fedora-41: + extends: .native_build_job + needs: + - job: x86_64-fedora-41-container + optional: true + allow_failure: false + variables: + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + + x86_64-fedora-rawhide: extends: .native_build_job needs: @@ -544,29 +544,29 @@ s390x-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mingw32-fedora-40: +mingw32-fedora-41: extends: .cross_build_job needs: - - job: mingw32-fedora-40-container + - job: mingw32-fedora-41-container optional: true allow_failure: false variables: CROSS: mingw32 JOB_OPTIONAL: 1 - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 -mingw64-fedora-40: +mingw64-fedora-41: extends: .cross_build_job needs: - - job: mingw64-fedora-40-container + - job: mingw64-fedora-41-container optional: true allow_failure: false variables: CROSS: mingw64 - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 mingw32-fedora-rawhide: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 55137dc1c3..b4244650c3 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,11 +14,11 @@ x86_64-almalinux-9-container: NAME: almalinux-9 -x86_64-alpine-319-container: +x86_64-alpine-320-container: extends: .container_job allow_failure: false variables: - NAME: alpine-319 + NAME: alpine-320 x86_64-alpine-edge-container: @@ -57,13 +57,6 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-39-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-39 - - x86_64-fedora-40-container: extends: .container_job allow_failure: false @@ -71,6 +64,13 @@ x86_64-fedora-40-container: NAME: fedora-40 +x86_64-fedora-41-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-41 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: true @@ -292,19 +292,19 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x -mingw32-fedora-40-container: +mingw32-fedora-41-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: fedora-40-cross-mingw32 + NAME: fedora-41-cross-mingw32 -mingw64-fedora-40-container: +mingw64-fedora-41-container: extends: .container_job allow_failure: false variables: - NAME: fedora-40-cross-mingw64 + NAME: fedora-41-cross-mingw64 mingw32-fedora-rawhide-container: diff --git a/ci/integration.yml b/ci/integration.yml index 2fc8d02956..2c5e5a65bc 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -29,23 +29,23 @@ centos-stream-9-tests: # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -fedora-39-tests: +fedora-41-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-39 + DISTRO: fedora-41 # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG needs: - - x86_64-fedora-39 + - x86_64-fedora-41 - project: libvirt/libvirt-perl - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true @@ -53,22 +53,22 @@ fedora-39-tests: # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -.fedora-39-upstream-qemu-tests: +.fedora-41-upstream-qemu-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-39 + DISTRO: fedora-41 # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG needs: - - x86_64-fedora-39 + - x86_64-fedora-41 - project: libvirt/libvirt-perl - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 43b9995717..cd68f5f7cb 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,7 +19,7 @@ targets: RPM: skip CC: clang - alpine-319: x86_64 + alpine-320: x86_64 alpine-edge: jobs: @@ -144,14 +144,6 @@ targets: containers: false builds: false - fedora-39: - jobs: - - arch: x86_64 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - fedora-40: jobs: - arch: x86_64 @@ -160,6 +152,14 @@ targets: paths: - libvirt-rpms + fedora-41: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + - arch: mingw32 builds: false -- 2.48.1

2 3

[libvirt PATCH] libvirt.spec.in: fix indentation
by Pavel Hrdina 03 Feb '25

03 Feb '25

Fixes: cf32953f5b6ec30386f71b40cf458467752a6dca Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed libvirt.spec.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index be91fa6bb4..cb41ea1de1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -541,10 +541,10 @@ Requires(posttrans): /usr/bin/systemctl Requires(preun): /usr/bin/systemctl # libvirtd depends on 'messagebus' service Requires: dbus -%if %{with_account_add} + %if %{with_account_add} # For uid creation during pre Requires(pre): shadow-utils -%endif + %endif # Needed by /usr/libexec/libvirt-guests.sh script. %if 0%{?fedora} Requires: gettext-runtime @@ -1103,10 +1103,10 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic. %package login-shell Summary: Login shell for connecting users to an LXC container Requires: libvirt-libs = %{version}-%{release} -%if %{with_account_add} + %if %{with_account_add} # For uid creation during pre Requires(pre): shadow-utils -%endif + %endif %description login-shell Provides the set-uid virt-login-shell binary that is used to @@ -1806,12 +1806,12 @@ export VIR_TEST_DEBUG=1 %pre daemon-common %libvirt_sysconfig_pre libvirt-guests %libvirt_systemd_oneshot_pre libvirt-guests -%if %{with_account_add} + %if %{with_account_add} # 'libvirt' group is just to allow password-less polkit access to libvirt # daemons. The uid number is irrelevant, so we use dynamic allocation. getent group libvirt >/dev/null || groupadd -r libvirt exit 0 -%endif + %endif %posttrans daemon-common %libvirt_sysconfig_posttrans libvirt-guests @@ -1934,7 +1934,7 @@ exit 0 %libvirt_sysconfig_pre virtqemud %libvirt_systemd_unix_pre virtqemud -%if %{with_account_add} + %if %{with_account_add} # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name. # See https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/ @@ -1950,7 +1950,7 @@ if ! getent passwd 'qemu' >/dev/null; then fi fi exit 0 -%endif + %endif %posttrans daemon-driver-qemu %libvirt_sysconfig_posttrans virtqemud @@ -2077,10 +2077,10 @@ done %if %{with_lxc} %pre login-shell -%if %{with_account_add} + %if %{with_account_add} getent group virtlogin >/dev/null || groupadd -r virtlogin exit 0 -%endif + %endif %endif %endif -- 2.48.1

1 0

[PATCH] qemu: introduce load qemu.conf for "virt-qemu-run"
by Adam Julis 31 Jan '25

31 Jan '25

Adding a new option --config (or -c) for specifying a custom qemu.conf file. Previously, virt-qemu-run loaded default configuration values for QEMU via qemuStateInitialize(). The configuration was loaded from a temporary ../etc/ directory using virQEMUDriverConfigLoadFile(), and any qemu.conf file present in that directory was also loaded automatically. This patch allows users to specify a custom configuration file, which is copied into the temporary directory (or a permanent folder if the -r option is used) before loading the configuration. If an existing qemu.conf is present, it is properly backed up and restored in case of a permanent folder. The custom qemu.conf is always removed when the program exits. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/723 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- docs/manpages/virt-qemu-run.rst | 9 +++ src/qemu/qemu_shim.c | 121 +++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 1 deletion(-) diff --git a/docs/manpages/virt-qemu-run.rst b/docs/manpages/virt-qemu-run.rst index 4d546ff8cc..ba1c90b52a 100644 --- a/docs/manpages/virt-qemu-run.rst +++ b/docs/manpages/virt-qemu-run.rst @@ -72,6 +72,15 @@ whose UUID should match a secret referenced in the guest domain XML. Display verbose information about startup. +``-c`` *QEMU-CONF-FILE*, +``--config``\ =\ *QEMU-CONF-FILE* + +Specify the QEMU configuration file to be used for starting the VM. +*QEMU-CONF-FILE* is the full path to the QEMU configuration file. + +If this parameter is omitted, the default configuration values will +be used. + ``-h``, ``--help`` Display the command line help. diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index 7fdd69b538..64c87ab264 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdbool.h> #include <unistd.h> +#include <fcntl.h> #include "virfile.h" #include "virgettext.h" @@ -132,6 +133,100 @@ qemuShimQuench(void *userData G_GNUC_UNUSED, { } +/* Load specific QEMU config file, is the -c option is used */ +static int +qemuAddConfigFile(const char *source_file, const char *root, bool *config_to_delete, long long deltams) +{ + int ret = -1; + struct stat st; + VIR_AUTOCLOSE srcFD = -1; + VIR_AUTOCLOSE dstFD = -1; + g_autofree char *config_dir = NULL; + g_autofree char *source_file_real = NULL; + g_autofree char *config_path_file = NULL; + g_autofree char *config_path_file_real = NULL; + + if ((srcFD = open(source_file, O_RDONLY)) < 0) { + g_printerr("Couldn't open specific config file\n"); + goto cleanup; + } + + if (fstat(srcFD, &st) != 0) { + g_printerr("Specific config file does not exist\n"); + goto cleanup; + } + if (!S_ISREG(st.st_mode)) { + g_printerr("Specific config is not a regular file\n"); + goto cleanup; + } + + /* Since source file exists, make the destination path or + * validate that it already exists */ + config_dir = g_strdup_printf("%s/etc/", root); + + if (g_mkdir_with_parents(config_dir, 0777) < 0) { + g_printerr("Couldn't make the directory for specific config file\n"); + goto cleanup; + } + + config_path_file = g_strdup_printf("%sqemu.conf", config_dir); + + /* If the source file is same as the destination file, no action needed */ + if ((source_file_real = realpath(source_file, NULL)) && + (config_path_file_real = realpath(config_path_file, NULL))) { + if (STREQ(source_file_real, config_path_file_real)) { + ret = 0; + goto cleanup; + } + } + + /* Check already existing qemu.conf in the subfolder, if so, renamed + * (appended via deltams constant - should be unique). Final cleanup + * at main() will revert this change */ + if (access(config_path_file, R_OK) == 0) { + if (rename(config_path_file, g_strdup_printf("%sqemu_old_%lld.conf", + config_dir, deltams)) != 0) { + g_printerr("Couldn't rename old config file, try delete it\n"); + goto cleanup; + } + } + + if ((dstFD = open(config_path_file, O_WRONLY | O_CREAT | O_TRUNC, 0644)) < 0) { + g_printerr("Couldn't open file for define specific config\n"); + goto cleanup; + } + + /* Set the flag for deleting the new/modified config in main() cleanup, + * for ensure that behaviour without the user config will be always + * consistent and take default value */ + *config_to_delete = true; + + do { + char buffer[1024]; + ssize_t readed = 0; + + readed = saferead(srcFD, buffer, 1024); + + if (readed < 0) { + g_printerr("Couldn't read from specific config\n"); + goto cleanup; + } else if (readed == 0) { + break; + } else { + ssize_t writed = safewrite(dstFD, buffer, readed); + if (writed != readed) { + g_printerr("Couldn't write to file for define specific config\n"); + goto cleanup; + } + } + } while (1); + + ret = 0; + + cleanup: + return ret; +} + int main(int argc, char **argv) { g_autoptr(virIdentity) sysident = NULL; @@ -142,8 +237,11 @@ int main(int argc, char **argv) g_autofree char *uri = NULL; g_autofree char *suri = NULL; const char *root = NULL; + const char *config = NULL; + long long delta_ms = 0; g_autofree char *escaped = NULL; bool tmproot = false; + bool config_to_delete = false; int ret = 1; g_autoptr(GError) error = NULL; g_auto(GStrv) secrets = NULL; @@ -156,6 +254,7 @@ int main(int argc, char **argv) { "root", 'r', 0, G_OPTION_ARG_STRING, &root, "Root directory", "DIR" }, { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, "Debug output", NULL }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Verbose output", NULL }, + { "config", 'c', 0, G_OPTION_ARG_STRING, &config, "Load specific QEMU configuration file", "QEMU-CONF-FILE"}, { 0 } }; int quitfd[2] = {-1, -1}; @@ -172,7 +271,7 @@ int main(int argc, char **argv) return 1; } - if (argc != 2) { + if (argc != 2 && argc != 3) { g_autofree char *help = g_option_context_get_help(ctx, TRUE, NULL); g_printerr("%s", help); return 1; @@ -234,6 +333,10 @@ int main(int argc, char **argv) goto cleanup; } + delta_ms = deltams(); + if (config && (qemuAddConfigFile(config, root, &config_to_delete, delta_ms) < 0)) + g_printerr("Specific config file was not loaded, default was used\n"); + escaped = g_uri_escape_string(root, NULL, true); virFileActivateDirOverrideForProg(argv[0]); @@ -402,6 +505,22 @@ int main(int argc, char **argv) VIR_FORCE_CLOSE(quitfd[0]); VIR_FORCE_CLOSE(quitfd[1]); + if (config_to_delete) { + g_autofree char *possible_old_file = g_strdup_printf("%s/etc/qemu_old_%lld.conf", + root, delta_ms); + g_autofree char *to_delete = g_strdup_printf("%s/etc/qemu.conf", root); + + if (remove(to_delete) != 0) + g_printerr("Deleting specific config failed, located in: %s\n", + to_delete); + + if (access(possible_old_file, R_OK) == 0) { + if (rename(possible_old_file, to_delete) != 0) + g_printerr("Renaming your old qemu.conf failed, ups, located in %s\n", + possible_old_file); + } + } + if (dom != NULL) virDomainFree(dom); if (sconn != NULL) -- 2.47.1

3 3

[PATCH 0/5] Drop support for VirtualBox-6.1
by Michal Privoznik 31 Jan '25

31 Jan '25

This was initiated by the following issue: https://gitlab.com/libvirt/libvirt/-/issues/681 and I tried to add support for VBOX-7.1 but unfortunately got hit by a bug in VBOX which renders the way we initialize C bindings useless. I've reported the bug here: https://www.virtualbox.org/ticket/22224 but it didn't get any attention. Michal Prívozník (5): vbox: Use g_autofree in tryLoadOne() vbox: Report an error when VBox CAPI initialization fails vbox: Drop support for VirtualBox-6.1.x vbox: Drop code supporting old VBox version NEWS: Document VBOX-6.1 removal NEWS.rst | 5 + src/vbox/meson.build | 1 - src/vbox/vbox_CAPI_v6_1.h | 32896 -------------------------------- src/vbox/vbox_V6_1.c | 13 - src/vbox/vbox_XPCOMCGlue.c | 5 +- src/vbox/vbox_XPCOMCGlue.h | 2 +- src/vbox/vbox_common.h | 4 +- src/vbox/vbox_storage.c | 4 +- src/vbox/vbox_tmpl.c | 30 +- src/vbox/vbox_uniformed_api.h | 1 - 10 files changed, 16 insertions(+), 32945 deletions(-) delete mode 100644 src/vbox/vbox_CAPI_v6_1.h delete mode 100644 src/vbox/vbox_V6_1.c -- 2.45.2

2 6

[PATCH V2 0/3] qemu: Improve opening and verifying save images
by Jim Fehlig 31 Jan '25

31 Jan '25

V2 of https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/DAT… Changes in V2: * Move unlinking corrupt save images from qemuSaveImageOpen to the only caller using that functionality * Add a function to read save image header * Correctly position file pointer of save image for QEMU Jim Fehlig (3): qemu: Move unlinking corrupt save image file to caller qemu: Decompose qemuSaveImageOpen qemu: Check for valid save image format when verifying image header src/qemu/qemu_driver.c | 46 ++++--- src/qemu/qemu_saveimage.c | 268 +++++++++++++++++++++++--------------- src/qemu/qemu_saveimage.h | 21 ++- src/qemu/qemu_snapshot.c | 9 +- 4 files changed, 207 insertions(+), 137 deletions(-) -- 2.43.0

2 4

[PATCH 0/2] qemu: Improve opening and verifying save images
by Jim Fehlig 31 Jan '25

31 Jan '25

qemuSaveImageOpen does a lot of stuff. When bypass-cache is specified, it creates a virFileWrapperFd, which is not cleaned up in the subsequent failure paths. This results in errors from the iohelper, which can overwrite the actual error. E.g. consider libvirt attempting to restore an image saved in an unknown format # virsh restore --bypass-cache /data/test.sav.sparse error: Failed to restore domain from /data/test.sav.sparse error: internal error: Child process (LIBVIRT_LOG_OUTPUTS=1:stderr /usr/lib64/libvirt/libvirt_iohelper /data/test.sav.sparse 0) unexpected fatal signal 13 When not using the iohelper, and not creating a virFileWrapperFd, we see the real error: # virsh restore /data/test.sav.sparse error: Failed to restore domain from /data/test.sav.sparse error: operation failed: Invalid compressed save format 6 Although that error highlights a spot I missed when removing the "compression" implications around the 'foo_image_format' settings in qemu.conf with commit bd6d7ebf622 :-). IMO, the error message would be best fixed by checking for valid values when reading the save image metadata. Patch 1 decomposes qemuSaveImageOpen to allow for better error handling and more flexibility. Patch 2 checks for a valid format when checking the other header fields. Jim Fehlig (2): qemu: Decompose qemuSaveImageOpen qemu: Check for valid save image format when verifying image header src/qemu/qemu_driver.c | 37 +++++++-------- src/qemu/qemu_saveimage.c | 95 +++++++++++++++++++++++++-------------- src/qemu/qemu_saveimage.h | 16 ++++--- src/qemu/qemu_snapshot.c | 9 ++-- 4 files changed, 95 insertions(+), 62 deletions(-) -- 2.43.0

2 8

[PATCH 0/2] finish sysusers support
by Daniel P. Berrangé 30 Jan '25

30 Jan '25

This fixes another missing sysusers file and changes the RPM spec to take account of new RPM processing of sysusers files at install time. Daniel P. Berrangé (2): tools: add sysusers file to create 'virtlogin' group rpm: disable account creation for Fedora >= 42 libvirt.spec.in | 19 +++++++++++++++++++ tools/libvirt-login-shell.sysusers.conf | 1 + tools/meson.build | 7 +++++++ 3 files changed, 27 insertions(+) create mode 100644 tools/libvirt-login-shell.sysusers.conf -- 2.47.1

2 6

[RFC PATCH 0/5] qemu: Route hostdevs to multiple nested SMMUs
by Nathan Chen 30 Jan '25

30 Jan '25

Hi, This is a draft solution for supporting multiple vSMMU instances in a qemu VM. Based on discussions/suggestions received for a previous RFC by Nicolin here[0], the association of vSMMUs to VFIO devices in VM PCIe topology should be moved out of qemu into libvirt. In addition, the nested SMMU nodes should be passed to qemu as pluggable devices. To address these changes, this patch series introduces a new "nestedSmmuv3" IOMMU model and "nestedSmmuv3" device type. Upon specifying the nestedSmmuv3 IOMMU model, nestedSmmuv3 devices will be auto-added to the VM definition based on the available SMMU nodes in the host's sysfs. The nestedSmmuv3 devices will each be attached to a separate PXB controller, and VFIO devices will be routed to PXBs based on their association with host SMMU nodes. This will maintain a VM PCIe topology that allows for multiple nested SMMUs per Nicolin's original qemu patch series in [0] and Shameer's work in [1] to remove VM topology changes from qemu and allow the nested SMMUs to be specified as pluggable devices. For instance, if we specify the nestedSmmuv3 IOMMU model and a hostdev for passthrough: <devices> <hostdev mode='subsystem' type='pci' managed='no'> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> </hostdev> <iommu model='nestedSmmuv3'/> </devices> Libvirt will scan sysfs and populate the VM definition with controllers and nestedSmmuv3 devices based on host config. So if /sys/bus/pci/devices/0009:01:00.0/iommu is a symlink to the host SMMU node represented by /sys/devices/platform/arm-smmu-v3.8.auto/iommu/smmu3.0x0000000016000000 and there are 3 host SMMU nodes under /sys/class/iommu/, we'll see three auto-added nestedSmmuv3 devices, each routed to a pcie-expander-bus controller. Then the hostdev will be routed to a PXB controller that has a matching host SMMU node associated with it: <devices> ... <controller type='pci' index='1' model='pcie-expander-bus'> <model name='pxb-pcie'/> <target busNr='254'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='2' model='pcie-expander-bus'> <model name='pxb-pcie'/> <target busNr='251'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </controller> <controller type='pci' index='3' model='pcie-expander-bus'> <model name='pxb-pcie'/> <target busNr='249'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </controller> <controller type='pci' index='4' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='7' port='0x8'/> <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/> </controller> <hostdev mode='subsystem' type='pci' managed='no'> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> </hostdev> <iommu model='nestedSmmuv3'/> <nestedSmmuv3> <name>smmu3.0x0000000012000000</name> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </nestedSmmuv3> <nestedSmmuv3> <name>smmu3.0x0000000016000000</name> <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> </nestedSmmuv3> <nestedSmmuv3> <name>smmu3.0x0000000011000000</name> <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> </nestedSmmuv3> <iommu model='nestedSmmuv3'/> </devices> TODO: - No DMA mapping can found by UEFI when specifying multiple passthrough devices in the VM definition, and VM boot is subsequently blocked. We need to investigate this for the next revision, but we don't encounter this issue when passing through a single device. We'll include iommufd support in the next revision to narrow down whether the required fix would be outside of libvirt. - Shameer's qemu branch specifies nestedSmmuv3 bus number with "pci-bus" instead of "bus", so the libvirt compilation test args and qemu args in qemuBuildPCINestedSmmuv3DevProps() need to be modified to match this revision of qemu. It will be reverted to using "bus" in the next qemu revision. - This patchset decrements PXB busNr based on how many devices are attached downstream, and the libvirt documentation states we must reserve busNr for the PXB itself in addition to any devices attached downstream. When I launch a VM and a PXB has a pcie-root-port and hostdev attached downstream, busNrs 253, 252, and 251 are reserved. But the PXB itself already has a bus number assigned via the <address/> attribute, and I see 253 and 252 assigned to the hostdev and pcie-root-port in the VM but not 251. Should we decrement busNr based on libvirt documentation or do we only need two busNrs 253 and 252 in the example here? This series is on Github: https://github.com/NathanChenNVIDIA/libvirt/tree/nested-smmuv3-12-05-24 Thanks, Nathan [0] https://lore.kernel.org/qemu-devel/cover.1719361174.git.nicolinc@nvidia.com/ [1] https://lore.kernel.org/qemu-devel/20241108125242.60136-1-shameerali.koloth… Signed-off-by: Nathan Chen <nathanc(a)nvidia.com> Nathan Chen (5): conf: Add a nestedSmmuv3 IOMMU model qemu: Implement and auto-add a nestedSmmuv3 device type qemu: Create PXBs and auto-assign VFIO devs and nested SMMUs qemu: Update PXB busNr for nestedSmmuv3 controllers qemu: Add test case for specifying multiple nested SMMUs docs/formatdomain.rst | 25 ++- src/ch/ch_domain.c | 1 + src/conf/domain_addr.c | 26 ++- src/conf/domain_addr.h | 4 +- src/conf/domain_conf.c | 188 +++++++++++++++++ src/conf/domain_conf.h | 15 ++ src/conf/domain_postparse.c | 1 + src/conf/domain_validate.c | 24 +++ src/conf/schemas/domaincommon.rng | 17 ++ src/conf/virconftypes.h | 2 + src/libvirt_private.syms | 2 + src/lxc/lxc_driver.c | 6 + src/qemu/qemu_command.c | 64 +++++- src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain_address.c | 193 ++++++++++++++++++ src/qemu/qemu_driver.c | 3 + src/qemu/qemu_hotplug.c | 5 + src/qemu/qemu_postparse.c | 1 + src/qemu/qemu_validate.c | 16 ++ src/test/test_driver.c | 4 + tests/meson.build | 1 + .../iommu-nestedsmmuv3.aarch64-latest.args | 38 ++++ .../iommu-nestedsmmuv3.aarch64-latest.xml | 61 ++++++ tests/qemuxmlconfdata/iommu-nestedsmmuv3.xml | 29 +++ tests/qemuxmlconftest.c | 4 +- tests/schemas/device.rng.in | 1 + tests/virnestedsmmuv3mock.c | 57 ++++++ 28 files changed, 788 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxmlconfdata/iommu-nestedsmmuv3.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/iommu-nestedsmmuv3.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommu-nestedsmmuv3.xml create mode 100644 tests/virnestedsmmuv3mock.c -- 2.34.1

4 18

[PATCH v2 00/15] qemu: Store I/O error messages for disks
by Peter Krempa 30 Jan '25

30 Jan '25

v2: - ACK'd patches were pushed - the QEMU 'qom-path' regression is no longer mentioned - it's worker around by prefering lookup via node-name - the patch is justified without the need to mention it - 'qom-path' is now properly used for lookup of the disk - I/O error messages are now stored in virStorageSource - the messages can be viewed via virDomainGetMessages() - various refactors to make the addition clean added - news added Peter Krempa (15): qemu: Handle quirks of 'device' field of BLOCK_IO_ERROR event in monitor code qemu: Rename 'diskAlias' to 'device' in qemu IO error event handling qemuProcessHandleIOError: Rename local variables qemuMonitorJSONHandleIOError: Do not munge 'reason' field of IO error event qemuProcessHandleIOError: Prefer lookup by node name qemuMonitorJSONHandleIOError: Propagate new 'qom-path' field virStorageSource: Add fields for storing last I/O error message qemuProcessHandleIOError: Populate I/O error reason to virStorageSource qemuProcessHandleIOError: Log IO errors in the VM log file libxlDomainGetMessages: Add existing flags to 'virCheckFlags' virDomainObjGetMessages: Refactor using GPtrArray virDomainGetMessages: Introduce VIR_DOMAIN_MESSAGE_IOERRORS include: libvirt-domain: Reword documentation for @reason of VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON include: libvirt-domain: Add 'hypervisor-message' @reason of VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON NEWS: Mention preserving I/O error messages for qemu VMs NEWS.rst | 6 +++ include/libvirt/libvirt-domain.h | 19 ++++++-- src/conf/domain_conf.c | 80 +++++++++++++++++++++----------- src/conf/domain_conf.h | 9 +++- src/conf/storage_source_conf.c | 5 ++ src/conf/storage_source_conf.h | 6 +++ src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 13 +++++- src/qemu/qemu_driver.c | 24 +++++++++- src/qemu/qemu_monitor.c | 6 ++- src/qemu/qemu_monitor.h | 8 +++- src/qemu/qemu_monitor_json.c | 23 ++++++--- src/qemu/qemu_process.c | 61 +++++++++++++++--------- src/test/test_driver.c | 12 ++++- 14 files changed, 202 insertions(+), 71 deletions(-) -- 2.48.1

2 32