April 2021 - Devel - libvirt List Archives

[PATCH] ci: Refresh contents
by Andrea Bolognani 15 Apr '21

15 Apr '21

Notable changes: * cross-building container images are smaller because they no longer include the native compilers; * ccache is enabled for clang builds. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the CI refresh rule. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/287122672 ci/cirrus/freebsd-12.vars | 7 ++++++- ci/cirrus/freebsd-current.vars | 7 ++++++- ci/cirrus/macos-11.vars | 7 ++++++- ci/containers/centos-7.Dockerfile | 9 ++++++--- ci/containers/centos-8.Dockerfile | 9 ++++++--- ci/containers/centos-stream.Dockerfile | 9 ++++++--- ci/containers/debian-10-cross-aarch64.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-armv6l.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-armv7l.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-i686.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mips.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mips64el.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-mipsel.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-ppc64le.Dockerfile | 10 +++++----- ci/containers/debian-10-cross-s390x.Dockerfile | 10 +++++----- ci/containers/debian-10.Dockerfile | 9 ++++++--- ci/containers/debian-sid-cross-aarch64.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-armv6l.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-armv7l.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-i686.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-mips64el.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-mipsel.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 8 ++++---- ci/containers/debian-sid-cross-s390x.Dockerfile | 8 ++++---- ci/containers/debian-sid.Dockerfile | 7 +++++-- ci/containers/fedora-32.Dockerfile | 7 +++++-- ci/containers/fedora-33.Dockerfile | 7 +++++-- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 6 ++++-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 6 ++++-- ci/containers/fedora-rawhide.Dockerfile | 7 +++++-- ci/containers/opensuse-152.Dockerfile | 9 ++++++--- ci/containers/ubuntu-1804.Dockerfile | 9 ++++++--- ci/containers/ubuntu-2004.Dockerfile | 9 ++++++--- 33 files changed, 165 insertions(+), 113 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 115fd89727..7bd875176e 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-12 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 115fd89727..0f5b704a7b 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables freebsd-current libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + PACKAGING_COMMAND='pkg' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index ba0e77d728..8965338456 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -1,5 +1,10 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool variables macos-11 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + PACKAGING_COMMAND='brew' -CC='/usr/bin/clang' CCACHE='/usr/local/bin/ccache' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile index d1de34cedf..49345fa128 100644 --- a/ci/containers/centos-7.Dockerfile +++ b/ci/containers/centos-7.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-7 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/centos:7 RUN yum update -y && \ @@ -47,6 +48,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -123,10 +125,11 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ 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/$(basename /usr/bin/gcc) + 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.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index d55115fe29..0c7292b8d2 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/centos:8 RUN dnf update -y && \ @@ -18,6 +19,7 @@ RUN dnf update -y && \ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -95,10 +97,11 @@ RUN dnf update -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/$(basename /usr/bin/gcc) + 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.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/centos-stream.Dockerfile b/ci/containers/centos-stream.Dockerfile index a6715700c9..3bc66775eb 100644 --- a/ci/containers/centos-stream.Dockerfile +++ b/ci/containers/centos-stream.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile centos-stream libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/centos:8 RUN dnf install -y centos-release-stream && \ @@ -20,6 +21,7 @@ RUN dnf install -y centos-release-stream && \ ca-certificates \ ccache \ clang \ + cpp \ cyrus-sasl-devel \ dbus-devel \ device-mapper-devel \ @@ -97,10 +99,11 @@ RUN dnf install -y centos-release-stream && \ 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/$(basename /usr/bin/gcc) + 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.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile index 50476a7f5c..e006dcc68b 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -120,7 +120,7 @@ cpu = 'aarch64'\n\ endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile index aed38f6f3d..abc3ef52db 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -119,7 +119,7 @@ cpu = 'arm'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile index 714e28ad07..2e9bedf614 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -120,7 +120,7 @@ cpu = 'armhf'\n\ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile index 7fcd38ff7b..4b88d751bd 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ @@ -119,7 +119,7 @@ cpu = 'i686'\n\ endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile index 09d0653e13..dbdc9c57a8 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips && \ @@ -119,7 +119,7 @@ cpu = 'mips'\n\ endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile index 07ce89e16f..37044e296d 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -119,7 +119,7 @@ cpu = 'mips64el'\n\ endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile index 644b822302..3587f52374 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -119,7 +119,7 @@ cpu = 'mipsel'\n\ endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile index f2e61268e9..e8699d896b 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -119,7 +119,7 @@ cpu = 'powerpc64le'\n\ endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile index e9b89c299a..b31b5fd051 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -119,7 +119,7 @@ cpu = 's390x'\n\ endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu RUN pip3 install \ - meson==0.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index fbc06b3314..d4ab8196c2 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -97,10 +99,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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/$(basename /usr/bin/gcc) + 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.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 373b9ad31a..514f42a83e 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index e32d0fd230..592c485f64 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index cc46822665..f4e9829961 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index a4cd1c1070..500e306f8b 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 76298a7e4e..1ed444d9d3 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 3c69ce545f..e30e1cf808 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index c274e106a0..430cd1176c 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 7d9120c93e..716002dbaa 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -15,13 +16,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ bash-completion \ ca-certificates \ ccache \ - clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ ebtables \ flake8 \ - gcc \ gettext \ git \ grep \ @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index d1141ea307..011b766715 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -95,7 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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/$(basename /usr/bin/gcc) + 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" diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile index 71c78c76dc..9b06bcbac5 100644 --- a/ci/containers/fedora-32.Dockerfile +++ b/ci/containers/fedora-32.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-32 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:32 RUN dnf install -y nosync && \ @@ -24,6 +25,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -103,7 +105,8 @@ exec "$@"' > /usr/bin/nosync && \ 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/$(basename /usr/bin/gcc) + 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" diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index 08cd40bc3a..2885eafbb0 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:33 RUN dnf install -y nosync && \ @@ -24,6 +25,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -103,7 +105,8 @@ exec "$@"' > /usr/bin/nosync && \ 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/$(basename /usr/bin/gcc) + 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" diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 1ac0c08e4c..139e0b145c 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -22,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \ bash-completion \ ca-certificates \ ccache \ + cpp \ cppi \ diffutils \ dnsmasq \ @@ -63,7 +65,7 @@ exec "$@"' > /usr/bin/nosync && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc RUN nosync dnf install -y \ mingw32-curl \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index 767e43639d..b24049f879 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -22,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \ bash-completion \ ca-certificates \ ccache \ + cpp \ cppi \ diffutils \ dnsmasq \ @@ -63,7 +65,7 @@ exec "$@"' > /usr/bin/nosync && \ 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-$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc RUN nosync dnf install -y \ mingw64-curl \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 7cb68dcd50..1f0abb7288 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.fedoraproject.org/fedora:rawhide RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ @@ -25,6 +26,7 @@ exec "$@"' > /usr/bin/nosync && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-devel \ @@ -104,7 +106,8 @@ exec "$@"' > /usr/bin/nosync && \ 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/$(basename /usr/bin/gcc) + 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" diff --git a/ci/containers/opensuse-152.Dockerfile b/ci/containers/opensuse-152.Dockerfile index 8688934e92..6b56641292 100644 --- a/ci/containers/opensuse-152.Dockerfile +++ b/ci/containers/opensuse-152.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile opensuse-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ @@ -15,6 +16,7 @@ RUN zypper update -y && \ ca-certificates \ ccache \ clang \ + cpp \ cppi \ cyrus-sasl-devel \ dbus-1-devel \ @@ -91,10 +93,11 @@ RUN zypper update -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/$(basename /usr/bin/gcc) + 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.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index 55b7821cba..c6c3ef5823 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -99,10 +101,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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/$(basename /usr/bin/gcc) + 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.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index 04427b81d0..78df341dca 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,8 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/ceb381dce7c901e180a621951355… +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255eca… + FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ @@ -16,6 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ ccache \ clang \ + cpp \ diffutils \ dnsmasq-base \ dwarves \ @@ -98,10 +100,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 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/$(basename /usr/bin/gcc) + 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.55.3 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" -- 2.26.3

1 0

[PATCH] virsh: snapshot: Don't validate schema of XML generated by 'virsh snapshot-create-as'
by Peter Krempa 15 Apr '21

15 Apr '21

Commit 95f8e3237e5486f487324c6 which introduced XML schema validation for snapshot XMLs always asserted the validation for the XML generated by 'virsh snapshot-create-as' on the basis that it's libvirt-generated, thus valid. This unfortunately isn't true as users can influence certain bits of the XML such as the disk image path which must be a full path. Thus if a user tries to invoke virsh as: $ virsh snapshot-create-as upstream --diskspec vda,file=relative.qcow2 error: XML document failed to validate against schema: Unable to validate doc against /path/to/domainsnapshot.rng Extra element disks in interleave Element domainsnapshot failed to validate content They get a rather useless error from the libxml2 RNG validator. With this fix applied, we get to the XML parser in libvirtd which has a more reasonable error: $ virsh snapshot-create-as upstream --diskspec vda,file=relative.qcow2 error: XML error: disk snapshot image path 'relative.qcow2' must be absolute Instead users can force validation of the XML generated by 'virsh snapshot-create-as' by passing the '--validate' flag. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/manpages/virsh.rst | 4 +++- tools/virsh-snapshot.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index bccda292a2..ad91cd6356 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -6916,7 +6916,7 @@ snapshot-create-as snapshot-create-as domain {[--print-xml] [--no-metadata] [--halt] [--reuse-external]} [name] - [description] [--disk-only [--quiesce]] [--atomic] + [description] [--disk-only [--quiesce]] [--atomic] [--validate] [[--live] [--memspec memspec]] [--diskspec] diskspec]... Create a snapshot for domain *domain* with the given <name> and @@ -6988,6 +6988,8 @@ For now, it is not possible to create snapshots in a domain that has checkpoints, although this restriction will be lifted in a future release. +Optionally, the *--validate* option can be passed to validate XML document +which is internally generated by this command against the internal RNG schema. snapshot-current ---------------- diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 2bc2cb7e23..2bec722c61 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -372,6 +372,10 @@ static const vshCmdOptDef opts_snapshot_create_as[] = { .help = N_("require atomic operation") }, VIRSH_COMMON_OPT_LIVE(N_("take a live snapshot")), + {.name = "validate", + .type = VSH_OT_BOOL, + .help = N_("validate the XML against the schema"), + }, {.name = "memspec", .type = VSH_OT_STRING, .flags = VSH_OFLAG_REQ_OPT, @@ -394,7 +398,7 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) const char *desc = NULL; const char *memspec = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - unsigned int flags = VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE; + unsigned int flags = 0; const vshCmdOpt *opt = NULL; if (vshCommandOptBool(cmd, "no-metadata")) @@ -411,6 +415,8 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC; if (vshCommandOptBool(cmd, "live")) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE; + if (vshCommandOptBool(cmd, "validate")) + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 2.30.2

2 1

[libvirt PATCH v2 0/2] Fix some typos and spelling mistakes
by Tim Wiederhake 15 Apr '21

15 Apr '21

Found by codespell [1]. It would be nice to automate this, but I could not get codespell to also check code comments, and ran into a known issue [2] with codespell that prevents putting some terms with mixed letter cases on the skip list. [1] https://github.com/codespell-project/codespell [2] https://github.com/codespell-project/codespell/issues/1860 V1: https://listman.redhat.com/archives/libvir-list/2021-April/msg00562.html Changes since V1: * Added "Fixes:" to patch #1 commit message * Removed "crashes->crashers", "preferable->preferrable", and "purposedly->purposely" from patch #2 Tim Wiederhake (2): Fix spelling virlog: Remove stray "todo" in comment NEWS.rst | 10 +++++----- docs/formatdomain.rst | 6 +++--- docs/kbase/launch_security_sev.rst | 2 +- docs/manpages/virtproxyd.rst | 2 +- docs/pci-addresses.rst | 2 +- src/hyperv/hyperv_wmi.c | 2 +- src/libvirt-domain.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_domain.h | 4 ++-- src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_snapshot.c | 4 ++-- src/util/virerror.c | 3 ++- src/util/virhash.c | 2 +- src/util/virlog.c | 2 +- src/util/virnetdev.c | 2 +- src/util/virpci.c | 2 +- src/util/virpci.h | 2 +- tests/meson.build | 2 +- tools/meson.build | 2 +- 21 files changed, 31 insertions(+), 30 deletions(-) -- 2.26.2

2 3

[PATCH] vbox: Make host CPU cache init non-fatal
by Charlie Sharpsteen 15 Apr '21

15 Apr '21

This commit updates the vbox driver to log a warning if the virCapabilitiesInitCaches function fails instead of treating failure as a fatal error. CPU cache initialization requires the sysfs filesystem in order to complete successfully and thus fails on platforms such as macOS. This commit is similar to ace6528ae19, which made the same change to the VMware driver. Signed-off-by: Charlie Sharpsteen <source(a)sharpsteen.net> --- src/vbox/vbox_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 5a5de85eab..933851346b 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -98,7 +98,7 @@ vboxCapsInit(void) return NULL; if (virCapabilitiesInitCaches(caps) < 0) - return NULL; + VIR_WARN("Failed to get host CPU cache info"); if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, -- 2.31.1

2 1

Broken link in documentation for networking
by Thomas Kettenbach 15 Apr '21

15 Apr '21

Hi, keeping it short: The anchor href for one example script seems to be outdated: In Section 1.4 Forwarding Incoming Connections >> Use the basic script below or see an "advanced" version, which can handle several different machines and port mappings here 'here' points to: http://git.zaytsev.net/?p=anubis-puppet.git;a=blob;f=manifests/files/puppet… However this seems to have moved to https://github.com/nest/anubis-puppet/blob/master/manifests/files/puppet/li… Please check if this is correct and update the broken link, if it is feasible. BR, Thomas

2 1

[libvirt PATCH 0/2] Always validate XML for (hypervisor-)cpu-compare
by Tim Wiederhake 15 Apr '21

15 Apr '21

XML schema validation for `virsh (hypervisor-)cpu-compare` has to be enabled explicitly by passing the `--validate` flag. Having invalid XML domain / cpu specification that appear to work can lead to hard to find problems down the line, when e.g. migration of VMs does not work as expected. This series fixes a bug in the validation code and logs the schema validation error to libvirtd's log file. User facing behaviour stays unchanged. See this conversation for more background: https://listman.redhat.com/archives/libvir-list/2021-March/msg01214.html Tim Wiederhake (2): virxml: Fix schema validation of individual nodes virCPUDefParseXML: Log schema validation errors src/conf/cpu_conf.c | 16 +++++++--------- src/util/virxml.c | 13 ++++++------- src/util/virxml.h | 1 - 3 files changed, 13 insertions(+), 17 deletions(-) -- 2.26.2

3 4

[PATCH v2 0/2] qemu: virtiofs: support <sandbox mode='chroot'/>
by Cole Robinson 15 Apr '21

15 Apr '21

Add support for virtiofsd -o sandbox=chroot|namespace v2: Add link to virtiofsd docs in libvirt docs validate the new field for qemu break up the patch Cole Robinson (2): conf: Introduce <sandbox mode='chroot'/> for <filesystem><binary> qemu: virtiofs: support <sandbox mode='chroot'/> docs/formatdomain.rst | 6 +++++ docs/schemas/domaincommon.rng | 12 ++++++++++ src/conf/domain_conf.c | 23 +++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_validate.c | 7 ++++++ src/qemu/qemu_virtiofs.c | 2 ++ .../vhost-user-fs-fd-memory.xml | 1 + 8 files changed, 62 insertions(+) -- 2.30.2

2 3

[libvirt PATCH v2 1/3] qemu: remove unnecessary null check
by Jonathon Jongsma 15 Apr '21

15 Apr '21

virMediatedDeviceGetSysfsPath() (via g_strdup_printf()) is guaranteed to return a non-NULL value, so remove the unnecessary checks for NULL. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> Reviewed-by: Laine Stump <laine(a)redhat.com> --- Changes in v2: - remove NULL checks from 2 additional locations src/qemu/qemu_command.c | 4 +--- src/util/virmdev.c | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 83bebdd2a8..fbe387253e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5138,9 +5138,7 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *def, g_autofree char *mdevPath = NULL; const char *dev_str = NULL; - if (!(mdevPath = virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr))) - return NULL; - + mdevPath = virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr); dev_str = qemuBuildHostdevMdevModelTypeString(mdevsrc); if (!dev_str) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 7f4a499536..5f112c775f 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -140,9 +140,7 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model) g_autoptr(virMediatedDevice) dev = NULL; g_autofree char *sysfspath = NULL; - if (!(sysfspath = virMediatedDeviceGetSysfsPath(uuidstr))) - return NULL; - + sysfspath = virMediatedDeviceGetSysfsPath(uuidstr); if (!virFileExists(sysfspath)) { virReportError(VIR_ERR_DEVICE_MISSING, _("mediated device '%s' not found"), uuidstr); @@ -208,9 +206,6 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) g_autofree char *iommu_path = NULL; g_autofree char *dev_path = virMediatedDeviceGetSysfsPath(uuidstr); - if (!dev_path) - return NULL; - iommu_path = g_strdup_printf("%s/iommu_group", dev_path); if (!virFileExists(iommu_path)) { -- 2.26.3

2 5

[libvirt PATCH 0/2] Fix some typos and spelling mistakes
by Tim Wiederhake 14 Apr '21

14 Apr '21

Found by codespell [1]. It would be nice to automate this, but I could not get codespell to also check code comments, and ran into a known issue [2] with codespell that prevents putting some terms with mixed letter cases on the skip list. [1] https://github.com/codespell-project/codespell [2] https://github.com/codespell-project/codespell/issues/1860 Tim Wiederhake (2): Fix spelling virlog: Remove stray "todo" in comment NEWS.rst | 12 ++++++------ docs/formatdomain.rst | 6 +++--- docs/glib-adoption.rst | 2 +- docs/kbase/launch_security_sev.rst | 2 +- docs/manpages/virtproxyd.rst | 2 +- docs/pci-addresses.rst | 2 +- src/hyperv/hyperv_wmi.c | 2 +- src/libvirt-domain.c | 2 +- src/libxl/libxl_logger.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_domain.h | 4 ++-- src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_snapshot.c | 4 ++-- src/util/virerror.c | 3 ++- src/util/virhash.c | 2 +- src/util/virlog.c | 2 +- src/util/virnetdev.c | 2 +- src/util/virpci.c | 2 +- src/util/virpci.h | 2 +- tests/meson.build | 2 +- tools/meson.build | 2 +- 23 files changed, 34 insertions(+), 33 deletions(-) -- 2.26.2

2 5

[PATCH v2] qemu: Expose disk serial in virDomainGetGuestInfo()
by Michal Privoznik 14 Apr '21

14 Apr '21

When querying guest info via virDomainGetGuestInfo() the 'guest-get-disks' agent command is called. It may report disk serial number which we parse, but never report nor use for anything else. As it turns out, it may help management application find matching disk in their internals. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2021-April/msg00552.html diff to v1: - Filled virsh documentation - Documented that the param is optional and type of string docs/manpages/virsh.rst | 1 + src/libvirt-domain.c | 1 + src/qemu/qemu_driver.c | 19 ++++++++++++++----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 813fb0bd60..bccda292a2 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -2787,6 +2787,7 @@ returned: * ``disk.<num>.partition`` - whether this is a partition or disk * ``disk.<num>.dependency.count`` - the number of device dependencies * ``disk.<num>.dependency.<num>.name`` - a dependency name +* ``disk.<num>.serial`` - optional disk serial number * ``disk.<num>.alias`` - the device alias of the disk (e.g. sda) * ``disk.<num>.guest_alias`` - optional alias assigned to the disk diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 83ff7df9fe..509b7a6d88 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12561,6 +12561,7 @@ virDomainSetVcpu(virDomainPtr domain, * hold the list of PVs, for LUKS encrypted volume this will * contain the disk where the volume is placed. (Linux) * "disk.<num>.dependency.<num>.name" - a dependency + * "disk.<num>.serial" - optional disk serial number (as string) * "disk.<num>.alias" - the device alias of the disk (e.g. sda) * "disk.<num>.guest_alias" - optional alias assigned to the disk, on Linux * this is a name assigned by device mapper diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 90b5477f00..88ee9e5d5e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19951,15 +19951,24 @@ qemuAgentDiskInfoFormatParams(qemuAgentDiskInfo **info, } if (info[i]->address) { + qemuAgentDiskAddress *address = info[i]->address; virDomainDiskDef *diskdef = NULL; + if (address->serial) { + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "disk.%zu.serial", i); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, address->serial) < 0) + return; + } + /* match the disk to the target in the vm definition */ diskdef = virDomainDiskByAddress(vmdef, - &info[i]->address->pci_controller, - info[i]->address->ccw_addr, - info[i]->address->bus, - info[i]->address->target, - info[i]->address->unit); + &address->pci_controller, + address->ccw_addr, + address->bus, + address->target, + address->unit); if (diskdef) { g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, "disk.%zu.alias", i); -- 2.26.3

3 2