- Devel - libvirt List Archives

[libvirt PATCH] ci: switch all non-released distros to be non-gating
by Daniel P. Berrangé 20 Oct '21

20 Oct '21

The non-released distros have reasonably frequent package installation failures that can last for days at a time. This makes them unsuitable for use as gating CI jobs. This ensures all of the jobs in Debian Sid, Fedora Rawhide, openSUSE Tumbleweed and FreeBSD Current are marked "allow-failure: true". This means the jobs still run, but any failure will not be considered fatal to the pipeline. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- ci/gitlab.yml | 20 ++++++++++---------- ci/manifest.yml | 6 ++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 0678cb7ba0..cbe7d0f9e9 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -109,7 +109,7 @@ x86_64-debian-11-container: x86_64-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: NAME: debian-sid @@ -144,7 +144,7 @@ x86_64-opensuse-leap-152-container: x86_64-opensuse-tumbleweed-container: extends: .container_job - allow_failure: false + allow_failure: true variables: NAME: opensuse-tumbleweed @@ -287,7 +287,7 @@ s390x-debian-11-container: aarch64-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: NAME: debian-sid-cross-aarch64 @@ -308,7 +308,7 @@ armv7l-debian-sid-container: i686-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: NAME: debian-sid-cross-i686 @@ -336,7 +336,7 @@ ppc64le-debian-sid-container: s390x-debian-sid-container: extends: .container_job - allow_failure: false + allow_failure: true variables: NAME: debian-sid-cross-s390x @@ -419,7 +419,7 @@ x86_64-debian-sid: extends: .native_build_job needs: - x86_64-debian-sid-container - allow_failure: false + allow_failure: true variables: NAME: debian-sid @@ -476,7 +476,7 @@ x86_64-opensuse-tumbleweed: extends: .native_build_job needs: - x86_64-opensuse-tumbleweed-container - allow_failure: false + allow_failure: true variables: NAME: opensuse-tumbleweed RPM: skip @@ -582,7 +582,7 @@ aarch64-debian-sid: extends: .cross_build_job needs: - aarch64-debian-sid-container - allow_failure: false + allow_failure: true variables: NAME: debian-sid CROSS: aarch64 @@ -592,7 +592,7 @@ i686-debian-sid: extends: .cross_build_job needs: - i686-debian-sid-container - allow_failure: false + allow_failure: true variables: NAME: debian-sid CROSS: i686 @@ -602,7 +602,7 @@ s390x-debian-sid: extends: .cross_build_job needs: - s390x-debian-sid-container - allow_failure: false + allow_failure: true variables: NAME: debian-sid CROSS: s390x diff --git a/ci/manifest.yml b/ci/manifest.yml index 878c4773a3..49d5fe7064 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -94,8 +94,10 @@ targets: debian-sid: jobs: - arch: x86_64 + allow-failure: true - arch: aarch64 + allow-failure: true - arch: armv6l allow-failure: true @@ -106,6 +108,7 @@ targets: builds: false - arch: i686 + allow-failure: true - arch: mips64el allow-failure: true @@ -120,6 +123,7 @@ targets: builds: false - arch: s390x + allow-failure: true fedora-33: x86_64 @@ -150,6 +154,7 @@ targets: freebsd-current: jobs: - arch: x86_64 + allow-failure: true builds: False opensuse-leap-152: @@ -161,6 +166,7 @@ targets: opensuse-tumbleweed: jobs: - arch: x86_64 + allow-failure: true variables: RPM: skip -- 2.31.1

2 1

[libvirt PATCH] ci: refresh configuration from manifest
by Daniel P. Berrangé 20 Oct '21

20 Oct '21

The layering of the cross containers is fixed to move arch specific ccache setup out of the common base layer. A missing Cirrus CI variable substitution is added, though this is irrelevant given libvirt's package list. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- ci/containers/debian-10-cross-aarch64.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-armv6l.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-i686.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-mips.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-mips64el.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-mipsel.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-ppc64le.Dockerfile | 12 ++++++------ ci/containers/debian-10-cross-s390x.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-aarch64.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-armv6l.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-i686.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-mips64el.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-mipsel.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-ppc64le.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-s390x.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-aarch64.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-armv6l.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-i686.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-mips64el.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-mipsel.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-ppc64le.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-s390x.Dockerfile | 12 ++++++------ .../fedora-rawhide-cross-mingw32.Dockerfile | 12 ++++++------ .../fedora-rawhide-cross-mingw64.Dockerfile | 12 ++++++------ ci/gitlab.yml | 1 + 28 files changed, 163 insertions(+), 162 deletions(-) diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile index 3f0010d081..38013eb84b 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -115,7 +111,11 @@ pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'aarch64'\n\ cpu = 'aarch64'\n\ -endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc RUN pip3 install \ meson==0.56.0 diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile index 853844d3f1..f9bfa031fa 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'arm'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi +endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc RUN pip3 install \ meson==0.56.0 diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile index 4d00116849..0ddb3c65f5 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -115,7 +111,11 @@ pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'armhf'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf +endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc RUN pip3 install \ meson==0.56.0 diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile index 9c50fe0674..da14c20b3a 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'x86'\n\ cpu = 'i686'\n\ -endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc RUN pip3 install \ meson==0.56.0 diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile index fbeb8db795..efaf7a155b 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/mips-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips'\n\ cpu = 'mips'\n\ -endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu +endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc RUN pip3 install \ meson==0.56.0 diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile index 5212a02999..896a730ebe 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips64'\n\ cpu = 'mips64el'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 +endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc RUN pip3 install \ meson==0.56.0 diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile index 2e9e716b21..d50c2bcc8a 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips'\n\ cpu = 'mipsel'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc RUN pip3 install \ meson==0.56.0 diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile index 2f1a56a624..8cbea4bee8 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'ppc64'\n\ cpu = 'powerpc64le'\n\ -endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc RUN pip3 install \ meson==0.56.0 diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile index d7b06ec383..3ad9a772c8 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -54,11 +54,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 's390x'\n\ cpu = 's390x'\n\ -endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc RUN pip3 install \ meson==0.56.0 diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index 2e03f44d9e..a8b5ff293c 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'aarch64'\n\ cpu = 'aarch64'\n\ -endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index c021ddd7c7..53c6759085 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'arm'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi +endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index 8ccb61680d..4d41db399f 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'armhf'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf +endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index fce6d29a82..0693c03e48 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'x86'\n\ cpu = 'i686'\n\ -endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index 2a1f0388ca..0c2e4b6cc7 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips64'\n\ cpu = 'mips64el'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 +endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index b678ad0b00..5a5c4c2a35 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips'\n\ cpu = 'mipsel'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 66cf48506f..fdbe884a5c 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'ppc64'\n\ cpu = 'powerpc64le'\n\ -endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index a208c25d37..be4981d22f 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 's390x'\n\ cpu = 's390x'\n\ -endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc ENV 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 e481c63388..883a5fe526 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'aarch64'\n\ cpu = 'aarch64'\n\ -endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index 3f63b3e86f..418b5295b4 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'arm'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi +endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 55f527b207..8116ee3475 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -114,7 +110,11 @@ pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'arm'\n\ cpu = 'armhf'\n\ -endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf +endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index 719547ab31..63f770a366 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'x86'\n\ cpu = 'i686'\n\ -endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index e1fac818a1..fb7b02ce88 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips64'\n\ cpu = 'mips64el'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 +endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 3684fe3bf9..6c2d871a08 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'mips'\n\ cpu = 'mipsel'\n\ -endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 1d1aa18e33..abcf271072 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 'ppc64'\n\ cpu = 'powerpc64le'\n\ -endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu +endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 5d2fdd6a1b..00a999a284 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -53,11 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc + dpkg-reconfigure locales RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -113,7 +109,11 @@ pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system = 'linux'\n\ cpu_family = 's390x'\n\ cpu = 's390x'\n\ -endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu +endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc ENV 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 6f00940347..8b9a9d61ae 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -61,11 +61,7 @@ exec "$@"' > /usr/bin/nosync && \ sheepdog \ zfs-fuse && \ nosync dnf autoremove -y && \ - nosync dnf clean all -y && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc + nosync dnf clean all -y RUN nosync dnf install -y \ mingw32-curl \ @@ -81,7 +77,11 @@ RUN nosync dnf install -y \ mingw32-pkg-config \ mingw32-portablexdr \ mingw32-readline && \ - nosync dnf clean all -y + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index 48c2a755d3..6293658420 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -61,11 +61,7 @@ exec "$@"' > /usr/bin/nosync && \ sheepdog \ zfs-fuse && \ nosync dnf autoremove -y && \ - nosync dnf clean all -y && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc + nosync dnf clean all -y RUN nosync dnf install -y \ mingw64-curl \ @@ -81,7 +77,11 @@ RUN nosync dnf install -y \ mingw64-pkg-config \ mingw64-portablexdr \ mingw64-readline && \ - nosync dnf clean all -y + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 0678cb7ba0..2dfe2222de 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -57,6 +57,7 @@ -e "s|[@]PYTHON@|$PYTHON|g" -e "s|[@]PIP3@|$PIP3|g" -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" + -e "s|[@]XML_CATALOG_FILES@|$XML_CATALOG_FILES|g" <ci/cirrus/build.yml >ci/cirrus/$NAME.yml - cat ci/cirrus/$NAME.yml - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml -- 2.31.1

2 1

[PATCH 0/8] qemu: Report proper stats when a backup job is running
by Peter Krempa 20 Oct '21

20 Oct '21

Patch 1 fixes the bug this series is about, patch 2 fixes same thing in the bulk stats. Patches 3-6 remove some pointless cleanup sections and patches 7-8 remove the 'backingChain' argument as we always want to fetch all stats. Peter Krempa (8): qemuDomainBlocksStatsGather: Always fetch stats for the full backing chain qemuDomainGetStatsBlock: Always fetch stats for the full backing chain qemuMonitorJSONBlockStatsUpdateCapacity: Refactor cleanup qemuMonitorJSONBlockStatsUpdateCapacityOne: Refactor cleanup qemuDomainGetStatsBlock: Refactor cleanup qemuMonitorJSONQueryBlockstats: Refactor cleanup qemuMonitorGetAllBlockStatsInfo: Remove 'backingChain' argument qemuMonitorBlockStatsUpdateCapacity: Remove 'backingChain' argument src/qemu/qemu_driver.c | 31 ++++++------- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 20 +++------ src/qemu/qemu_monitor.h | 6 +-- src/qemu/qemu_monitor_json.c | 74 +++++++++++--------------------- src/qemu/qemu_monitor_json.h | 6 +-- tests/qemumonitorjsontest.c | 2 +- 7 files changed, 48 insertions(+), 93 deletions(-) -- 2.31.1

2 9

[libvirt PATCH v6 0/5] Add a PCI/PCIe device VPD Capability
by Dmitrii Shcherbakov 19 Oct '21

19 Oct '21

Add support for deserializing the binary PCI/PCIe VPD format and exposing VPD resources as XML elements in a new nested capability of PCI/PCIe devices called 'vpd'. The series contains the following incremental changes: * The PCI VPD parser module, in-memory resource representation and tests; * VPD-related helpers added to the virpci module; * VPD capability support: XML serialization/deserialization from/into VPD resource data structures; * Documentation. The VPD format is specified in "I.3. VPD Definitions" in PCI specs (2.2+) and "6.28.1 VPD Format" PCIe 4.0. As section 6.28 in PCIe 4.0 notes, the PCI Local Bus and PCIe VPD formats are binary compatible and PCIe 4.0 merely started incorporating what was already present in PCI specs. Linux kernel exposes a binary blob in the VPD format via sysfs since v2.6.26 (commit 94e6108803469a37ee1e3c92dafdd1d59298602f) which requires a parser to interpret. There are usage scenarios where information such as the board serial number needs to be retrieved from PCI(e) VPD. Projects like Nova can utilize this information for cases which involve virtual interface plugging on SmartNIC DPUs but there may be other scenarios and types of information useful to retrieve from VPD. The fact that the format is binary requires proper parsing instead of substring searching hence the full parser is proposed. Likewise, checksum validation requires proper parsing as well. A usage example is present here: https://review.opendev.org/c/openstack/nova/+/808199 The patch follows a prior discussion on the mailing list which has additional context about the use-case but a narrower proposal: https://listman.redhat.com/archives/libvir-list/2021-May/msg00873.html https://www.mail-archive.com/libvir-list@redhat.com/msg218165.html The new functionality is mostly contained in virpcivpd with a couple of new functions added to virpci. Additionally, the necessary XML serialization/deserialization and glue code is added to expose the VPD capability to external clients as XML. A new capability flag is added along with a new capability in order to allow for filtering of PCI devices with the VPD capability using virsh: virsh nodedev-list --cap vpd sudo virsh nodedev-dumpxml --device pci_dddd_bb_ss_f In this example having the root uid is required in order to access the vpd sysfs entry, therefore, the nodedev XML output will only contain the VPD capability if virsh is run as root. The capability is treated as dynamic due to the presence of read-write sections in the VPD format per PCI/PCIe specs (the idea being that read-write resource fields may potentially be altered by the DPU OS over time independently from the host OS). Unit tests cover the parser functionality (including many possible invalid cases), in-memory representation as well as XML serialization and deserialization. Manual functional testing was performed with 2 DPUs and several other NIC models which expose PCI(e) VPD. Testing have also been performed for devices that do not have VPD or those that expose a VPD capability but exhibit invalid behavior (I/O errors while reading a sysfs entry). v6 changes: * Reworked in-memory data structures according to the feedback from Daniel: virPCIVPDResource is now a struct with nested structures for read-only and read-write parts of the VPD. Custom fields (vendor, system are now stored in GPtrArray instances; * Reworked XML element naming: well-known fields from the spec now have human-readable names. Legacy PICMIG fields and binary fields are omitted as before; * The fieldValueFormats hash table is now initialized in a thread-safe manner using VIR_ONCE_GLOBAL_INIT. The values are still duplicated since the GHashTable requires non-const pointers; * VPD field value validation now uses a simpler character set validation instead of Glib-provided regular expressions as was suggested in comments to v5; * virPCIVPDParse no longer attempts to close the fd passed to it and leaves that for the caller to do; * Extended XML schema testing with RW section validation and reworked the RNG schema to account for the new XML formatting structure; * Improved test coverage in multiple places; * Refactoring: replaced gchar and gboolean usage with char and bool per the mailing list discussion. Build & test results for targets in ci/manifest.yaml: ci/helper test --meson-args='-Dexpensive_tests=enabled' <target> https://gist.github.com/dshcherb/867d87a7419b91bb68388518ca5a9c32 Dmitrii Shcherbakov (5): Add a PCI/PCIe device VPD Parser Add PCI VPD-related helper functions to virpci Add PCI VPD Capability Support Add PCI VPD Capability Documentation news: Add PCI VPD parser & capability notes NEWS.rst | 22 + build-aux/syntax-check.mk | 4 +- docs/drvnodedev.html.in | 69 ++ docs/formatnode.html.in | 63 +- docs/schemas/nodedev.rng | 96 +++ include/libvirt/libvirt-nodedev.h | 1 + po/POTFILES.in | 1 + src/conf/node_device_conf.c | 293 +++++++ src/conf/node_device_conf.h | 7 +- src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 20 + src/node_device/node_device_driver.c | 2 + src/node_device/node_device_udev.c | 2 + src/util/meson.build | 1 + src/util/virpci.c | 70 ++ src/util/virpci.h | 4 + src/util/virpcivpd.c | 743 +++++++++++++++++ src/util/virpcivpd.h | 111 +++ src/util/virpcivpdpriv.h | 48 ++ tests/meson.build | 1 + .../pci_0000_42_00_0_vpd.xml | 42 + .../pci_0000_42_00_0_vpd.xml | 1 + tests/nodedevxml2xmltest.c | 1 + tests/testutils.c | 35 + tests/testutils.h | 4 + tests/virpcimock.c | 30 + tests/virpcitest.c | 39 + tests/virpcivpdtest.c | 768 ++++++++++++++++++ tools/virsh-nodedev.c | 3 + 29 files changed, 2483 insertions(+), 5 deletions(-) create mode 100644 src/util/virpcivpd.c create mode 100644 src/util/virpcivpd.h create mode 100644 src/util/virpcivpdpriv.h create mode 100644 tests/nodedevschemadata/pci_0000_42_00_0_vpd.xml create mode 120000 tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml create mode 100644 tests/virpcivpdtest.c -- 2.30.2

2 9

[PATCH] rpc: Temporarily stop accept()-ing new clients on EMFILE
by Michal Privoznik 19 Oct '21

19 Oct '21

This commit is related to 5de203f879 which I pushed a few days ago. While that commit prioritized closing clients socket over the rest of I/O process, this one goes one step further and temporarily suspends processing new connection requests. A brief recapitulation of the problem: 1) assume that libvirt is at the top of RLIMIT_NOFILE (that is no new FDs can be opened). 2) we have a client trying to connect to a UNIX/TCP socket Because of 2) our event loop sees POLLIN on the socket and thus calls virNetServerServiceAccept(). But since no new FDs can be opened (because of 1)) the request is not handled and we will get the same event on next iteration. The poll() will exit immediately because there is an event on the socket. Thus we end up in an endless loop. To break the loop and stop burning CPU cycles we can stop listening for events on the socket and set up a timer tho enable listening again after some time (I chose 5 seconds because of no obvious reason). There's another area where we play with temporarily suspending accept() of new clients - when a client disconnects and we check max_clients against number of current clients. Problem here is that max_clients can be orders of magnitude larger than RLIMIT_NOFILE but more importantly, what this code considers client disconnect is not equal to closing client's FD. A client disconnecting means that the corresponding client structure is removed from the internal list of clients. Closing of the client's FD is done from event loop - asynchronously. To avoid this part stepping on the toes of my fix, let's make the code NOP if socket timer (as described above) is active. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt_remote.syms | 1 + src/rpc/virnetserver.c | 9 ++++++ src/rpc/virnetserverservice.c | 53 ++++++++++++++++++++++++++++++++++- src/rpc/virnetserverservice.h | 2 ++ src/rpc/virnetsocket.c | 15 ++++++++++ 5 files changed, 79 insertions(+), 1 deletion(-) diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index b4265adf2e..942e1013a6 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -221,6 +221,7 @@ virNetServerServiceNewTCP; virNetServerServiceNewUNIX; virNetServerServicePreExecRestart; virNetServerServiceSetDispatcher; +virNetServerServiceTimerActive; virNetServerServiceToggle; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index b3214883ee..dc8f32b095 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -252,6 +252,15 @@ virNetServerDispatchNewMessage(virNetServerClient *client, static void virNetServerCheckLimits(virNetServer *srv) { + size_t i; + + for (i = 0; i < srv->nservices; i++) { + if (virNetServerServiceTimerActive(srv->services[i])) { + VIR_DEBUG("Skipping client-related limits evaluation"); + return; + } + } + VIR_DEBUG("Checking client-related limits to re-enable or temporarily " "suspend services: nclients=%zu nclients_max=%zu " "nclients_unauth=%zu nclients_unauth_max=%zu", diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 0c4c437a49..214eae1acb 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -43,6 +43,8 @@ struct _virNetServerService { int auth; bool readonly; size_t nrequests_client_max; + int timer; + bool timerActive; virNetTLSContext *tls; @@ -71,9 +73,25 @@ static void virNetServerServiceAccept(virNetSocket *sock, { virNetServerService *svc = opaque; virNetSocket *clientsock = NULL; + int rc; - if (virNetSocketAccept(sock, &clientsock) < 0) + rc = virNetSocketAccept(sock, &clientsock); + if (rc < 0) { + if (rc == -2) { + /* Could not accept new client due to EMFILE. Suspend listening on + * the socket and set up a timer to enable it later. Hopefully, + * some FDs will be closed meanwhile. */ + VIR_DEBUG("Temporarily suspending listening on svc=%p because accept() on sock=%p failed (errno=%d)", + svc, sock, errno); + + virNetServerServiceToggle(svc, false); + + svc->timerActive = true; + /* Retry in 5 seconds. */ + virEventUpdateTimeout(svc->timer, 5 * 1000); + } goto cleanup; + } if (!clientsock) /* Connection already went away */ goto cleanup; @@ -88,6 +106,21 @@ static void virNetServerServiceAccept(virNetSocket *sock, } +static void +virNetServerServiceTimerFunc(int timer, + void *opaque) +{ + virNetServerService *svc = opaque; + + VIR_DEBUG("Resuming listening on service svc=%p after previous suspend", svc); + + virNetServerServiceToggle(svc, true); + + virEventUpdateTimeout(timer, -1); + svc->timerActive = false; +} + + static virNetServerService * virNetServerServiceNewSocket(virNetSocket **socks, size_t nsocks, @@ -117,6 +150,14 @@ virNetServerServiceNewSocket(virNetSocket **socks, svc->nrequests_client_max = nrequests_client_max; svc->tls = virObjectRef(tls); + virObjectRef(svc); + svc->timer = virEventAddTimeout(-1, virNetServerServiceTimerFunc, + svc, virObjectFreeCallback); + if (svc->timer < 0) { + virObjectUnref(svc); + goto error; + } + for (i = 0; i < svc->nsocks; i++) { if (virNetSocketListen(svc->socks[i], max_queued_clients) < 0) goto error; @@ -407,6 +448,9 @@ void virNetServerServiceDispose(void *obj) virNetServerService *svc = obj; size_t i; + if (svc->timer >= 0) + virEventRemoveTimeout(svc->timer); + for (i = 0; i < svc->nsocks; i++) virObjectUnref(svc->socks[i]); g_free(svc->socks); @@ -438,3 +482,10 @@ void virNetServerServiceClose(virNetServerService *svc) virNetSocketClose(svc->socks[i]); } } + + +bool +virNetServerServiceTimerActive(virNetServerService *svc) +{ + return svc->timerActive; +} diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h index ab5798938e..f3d55a9cc0 100644 --- a/src/rpc/virnetserverservice.h +++ b/src/rpc/virnetserverservice.h @@ -78,3 +78,5 @@ void virNetServerServiceToggle(virNetServerService *svc, bool enabled); void virNetServerServiceClose(virNetServerService *svc); + +bool virNetServerServiceTimerActive(virNetServerService *svc); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 212089520d..60dff71718 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -2067,6 +2067,19 @@ int virNetSocketListen(virNetSocket *sock, int backlog) return 0; } + +/** + * virNetSocketAccept: + * @sock: socket to accept connection on + * @clientsock: returned client socket + * + * For given socket @sock accept incoming connection and create + * @clientsock representation of the new accepted connection. + * + * Returns: 0 on success, + * -2 if accepting failed due to EMFILE error, + * -1 otherwise. + */ int virNetSocketAccept(virNetSocket *sock, virNetSocket **clientsock) { int fd = -1; @@ -2087,6 +2100,8 @@ int virNetSocketAccept(virNetSocket *sock, virNetSocket **clientsock) errno == EAGAIN) { ret = 0; goto cleanup; + } else if (errno == EMFILE) { + ret = -2; } virReportSystemError(errno, "%s", -- 2.32.0

2 1

Plans for the next release
by Jiri Denemark 19 Oct '21

19 Oct '21

We are getting close to the next release of libvirt. To aim for the release on Nov 01 I suggest entering the freeze on Tuesday Oct 26 and tagging RC2 on Friday Oct 29. I hope this works for everyone. Jirka

1 0

[PATCH v4] qemu: tpm: Run swtpm_setup --create-config-files in session mode
by Stefan Berger 19 Oct '21

19 Oct '21

Using swtpm v0.7.0 we can run swtpm_setup to create default config files for swtpm_setup and swtpm-localca in session mode. Now a user can start a VM with an attached TPM without having to run this program on the command line before. This program needs to run once. This patch addresses the issue raised in https://bugzilla.redhat.com/show_bug.cgi?id=2010649 Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- v4: - Append stderr output to virReportError if swtpm_setup fails v3: - Removed logfile parameter v2: - fixed return code if swtpm_setup doesn't support the option --- src/qemu/qemu_tpm.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + 3 files changed, 44 insertions(+) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 100481503c..f797a87fdc 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -385,6 +385,45 @@ qemuTPMSetupEncryption(const unsigned char *secretuuid, return virCommandSetSendBuffer(cmd, g_steal_pointer(&secret), secret_len); } + +/* + * qemuTPMCreateConfigFiles: run swtpm_setup --create-config-files skip-if-exist + */ +static int +qemuTPMCreateConfigFiles(void) +{ + g_autofree char *swtpm_setup = virTPMGetSwtpmSetup(); + g_autoptr(virCommand) cmd = NULL; + g_autofree char *errbuf = NULL; + int exitstatus; + + if (!swtpm_setup) + return -1; + + if (!virTPMSwtpmSetupCapsGet( + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES)) + return 0; + + cmd = virCommandNew(swtpm_setup); + if (!cmd) + return -1; + + virCommandAddArgList(cmd, "--create-config-files", "skip-if-exist", NULL); + virCommandClearCaps(cmd); + virCommandSetErrorBuffer(cmd, &errbuf); + + if (virCommandRun(cmd, &exitstatus) < 0 || exitstatus != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not run '%s' to create config files. " + "exitstatus: %d;\nError: %s"), + swtpm_setup, exitstatus, errbuf); + return -1; + } + + return 0; +} + + /* * qemuTPMEmulatorRunSetup * @@ -432,6 +471,9 @@ qemuTPMEmulatorRunSetup(const char *storagepath, "this requires privileged mode for a " "TPM 1.2\n"), 0600); + if (!privileged && qemuTPMCreateConfigFiles()) + return -1; + cmd = virCommandNew(swtpm_setup); if (!cmd) return -1; diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 1a567139b4..0f50de866c 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -45,6 +45,7 @@ VIR_ENUM_IMPL(virTPMSwtpmFeature, VIR_ENUM_IMPL(virTPMSwtpmSetupFeature, VIR_TPM_SWTPM_SETUP_FEATURE_LAST, "cmdarg-pwdfile-fd", + "cmdarg-create-config-files", ); /** diff --git a/src/util/virtpm.h b/src/util/virtpm.h index d021a083b4..3bb03b3b33 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -38,6 +38,7 @@ typedef enum { typedef enum { VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD, + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES, VIR_TPM_SWTPM_SETUP_FEATURE_LAST } virTPMSwtpmSetupFeature; -- 2.31.1

3 2

[PATCH v2 00/15] qdev: Add JSON -device
by Kevin Wolf 19 Oct '21

19 Oct '21

It's still a long way until we'll have QAPIfied devices, but there are some improvements that we can already make now to make the future switch easier. One important part of this is having code paths without QemuOpts, which we want to get rid of and replace with the keyval parser in the long run. This series adds support for JSON syntax to -device, which bypasses QemuOpts. While we're not using QAPI yet, devices are based on QOM, so we already do have type checks and an implied schema. JSON syntax supported now can be supported by QAPI later and regarding command line compatibility, actually switching to it becomes an implementation detail this way (of course, it will still add valuable user-visible features like introspection and documentation). Apart from making things more future proof, this also immediately adds a way to do non-scalar properties on the command line. nvme could have used list support recently, and the lack of it in -device led to some rather unnatural solution in the first version (doing the relationship between a device and objects backwards) and loss of features in the following. With this series, using a list as a device property should be possible without any weird tricks. Unfortunately, even QMP device_add goes through QemuOpts before this series, which destroys any type safety QOM provides and also can't support non-scalar properties. This is a bug, but it turns out that libvirt actually relies on it and passes only strings for everything. So this series still leaves device_add alone until libvirt is fixed. v2: - Drop type safe QMP device_add because libvirt gets it wrong, too - More network patches to eliminate dependencies on the legacy QemuOpts data structures which would not contain all devices any more after this series. Fix some bugs there as a side effect. - Remove an unnecessary use of ERRP_GUARD() - Replaced error handling patch for qdev_set_id() with Damien's - Drop the deprecation patch until libvirt uses the new JSON syntax Damien Hedde (1): softmmu/qdev-monitor: add error handling in qdev_set_id Kevin Wolf (14): net: Introduce NetClientInfo.check_peer_type() net/vhost-user: Fix device compatibility check net/vhost-vdpa: Fix device compatibility check qom: Reduce use of error_propagate() iotests/245: Fix type for iothread property iotests/051: Fix typo qdev: Avoid using string visitor for properties qdev: Make DeviceState.id independent of QemuOpts qemu-option: Allow deleting opts during qemu_opts_foreach() qdev: Add Error parameter to hide_device() callbacks virtio-net: Store failover primary opts pointer locally virtio-net: Avoid QemuOpts in failover_find_primary_device() qdev: Base object creation on QDict rather than QemuOpts vl: Enable JSON syntax for -device qapi/qdev.json | 15 +++-- include/hw/qdev-core.h | 15 +++-- include/hw/virtio/virtio-net.h | 2 + include/monitor/qdev.h | 27 +++++++- include/net/net.h | 2 + hw/arm/virt.c | 2 +- hw/core/qdev-properties-system.c | 6 ++ hw/core/qdev.c | 11 +++- hw/net/virtio-net.c | 85 ++++++++++++------------- hw/pci-bridge/pci_expander_bridge.c | 2 +- hw/ppc/e500.c | 2 +- hw/vfio/pci.c | 4 +- hw/xen/xen-legacy-backend.c | 3 +- net/vhost-user.c | 41 ++++-------- net/vhost-vdpa.c | 37 ++++------- qom/object.c | 7 +- qom/object_interfaces.c | 19 ++---- softmmu/qdev-monitor.c | 99 +++++++++++++++++++---------- softmmu/vl.c | 63 ++++++++++++++++-- util/qemu-option.c | 4 +- tests/qemu-iotests/051 | 2 +- tests/qemu-iotests/051.pc.out | 4 +- tests/qemu-iotests/245 | 4 +- 23 files changed, 278 insertions(+), 178 deletions(-) -- 2.31.1

8 34

[PATCH v2 0/2] qemu: Move 2 pid files to stateDir
by Peng Liang 19 Oct '21

19 Oct '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-October/msg00535.html v1 -> v2: - Fix compatibility with old version libvirt [Michal] Peng Liang (2): qemu: Move pid file of pr-helper to stateDir qemu: Move pid file of virtiofsd to stateDir src/qemu/qemu_process.c | 22 +++++++++++++++++++++- src/qemu/qemu_virtiofs.c | 25 ++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 4 deletions(-) -- 2.31.1

2 3

[PATCH v2] virNodeDeviceDefParse: Don't call post-parse callbacks with NULL def
by Peter Krempa 18 Oct '21

18 Oct '21

When parsing of the node device XML fails we'd still call the post-parse and validation callbacks which makes no sense. Additionally the callbacks were expecting a non-NULL pointer which leads to a crash. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2014139 Fixes: d5ae634ba28 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- v2: - Also handle failure of virXMLParse - add 'fails' into first sentence of commit message src/conf/node_device_conf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 9bbff97ffd..1f39e2cbfd 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2177,10 +2177,10 @@ virNodeDeviceDefParse(const char *str, g_autoptr(xmlDoc) xml = NULL; g_autoptr(virNodeDeviceDef) def = NULL; - if ((xml = virXMLParse(filename, str, _("(node_device_definition)"), NULL, false))) { - def = virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml), - create, virt_type); - } + if (!(xml = virXMLParse(filename, str, _("(node_device_definition)"), NULL, false)) || + !(def = virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml), + create, virt_type))) + return NULL; if (parserCallbacks) { int ret = 0; -- 2.31.1

2 1

[PATCH v2] virsh: Add QMP command wrapping for 'qemu-monitor-command'
by Peter Krempa 18 Oct '21

18 Oct '21

Issuing simple QMP commands is pain as they need to be wrapped by the JSON wrapper: { "execute": "COMMAND" } and optionally also: { "execute": "COMMAND", "arguments":...} For simple commands without arguments we can add syntax sugar to virsh which allows simple usage of QMP and additionally prepares also for passing through of the 'arguments' section: virsh qemu-monitor-command $VM query-status is equivalent to virsh qemu-monitor-command $VM '{"execute":"query-status"}' and virsh qemu-monitor-command $VM query-named-block-nodes '{"flat":true}' or virsh qemu-monitor-command $VM query-named-block-nodes '"flat":true' is equivalent to virsh qemu-monitor-command $VM '{"execute":"query-named-block-nodes", "arguments":{"flat":true}}' Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- v2: - dropped the '--qmpwrap' option and do wrapping if we don't get a JSON object instead. Similarly for arguments. docs/manpages/virsh.rst | 16 ++++++- tools/virsh-domain.c | 98 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 103 insertions(+), 11 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 350ded2026..b4d31bf884 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -7772,7 +7772,21 @@ If more than one argument is provided for *command*, they are concatenated with a space in between before passing the single command to the monitor. Note that libvirt uses the QMP to talk to qemu so *command* must be valid JSON -in QMP format to work properly. +in QMP format to work properly. If *command* is not a JSON object libvirt tries +to wrap it as a JSON object to provide convenient interface such as the groups +of commands with identical handling: + +:: + + # simple command + $ virsh qemu-monitor-command VM commandname + $ virsh qemu-monitor-command VM '{"execute":"commandname"}' + + # with arguments + $ virsh qemu-monitor-command VM commandname '"arg1":123' '"arg2":"test"' + $ virsh qemu-monitor-command VM commandname '{"arg1":123,"arg2":"test"}' + $ virsh qemu-monitor-command VM '{"execute":"commandname", "arguments":{"arg1":123,"arg2":"test"}}' + If *--pretty* is given the QMP reply is pretty-printed. diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 70aa4167c2..659aa1a242 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9445,6 +9445,84 @@ static const vshCmdOptDef opts_qemu_monitor_command[] = { {.name = NULL} }; + +static char * +cmdQemuMonitorCommandConcatCmd(vshControl *ctl, + const vshCmd *cmd, + const vshCmdOpt *opt) +{ + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + + while ((opt = vshCommandOptArgv(ctl, cmd, opt))) + virBufferAsprintf(&buf, "%s ", opt->data); + + virBufferTrim(&buf, " "); + + return virBufferContentAndReset(&buf); +} + + +static char * +cmdQemuMonitorCommandQMPWrap(vshControl *ctl, + const vshCmd *cmd) +{ + g_autofree char *fullcmd = cmdQemuMonitorCommandConcatCmd(ctl, cmd, NULL); + g_autoptr(virJSONValue) fullcmdjson = virJSONValueFromString(fullcmd); + g_autofree char *fullargs = NULL; + g_autoptr(virJSONValue) fullargsjson = NULL; + const vshCmdOpt *opt = NULL; + const char *commandname = NULL; + g_autoptr(virJSONValue) command = NULL; + g_autoptr(virJSONValue) arguments = NULL; + + /* if we've got a JSON object, pass it through */ + if (virJSONValueIsObject(fullcmdjson)) + return g_steal_pointer(&fullcmd); + + /* we try to wrap the command and possible arguments into a JSON object, if + * we as fall back we pass through what we've got from the user */ + + if ((opt = vshCommandOptArgv(ctl, cmd, opt))) + commandname = opt->data; + + /* now we process arguments similarly to how we've dealt with the full command */ + if ((fullargs = cmdQemuMonitorCommandConcatCmd(ctl, cmd, opt))) + fullargsjson = virJSONValueFromString(fullargs); + + /* for empty args or a valid JSON object we just use that */ + if (!fullargs || virJSONValueIsObject(fullargsjson)) { + arguments = g_steal_pointer(&fullargsjson); + } else { + /* for a non-object we try to concatenate individual _ARGV bits into a + * JSON object wrapper and try using that */ + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + + virBufferAddLit(&buf, "{"); + /* opt points to the _ARGV option bit containing the command so we'll + * iterate through the arguments now */ + while ((opt = vshCommandOptArgv(ctl, cmd, opt))) + virBufferAsprintf(&buf, "%s,", opt->data); + + virBufferTrim(&buf, ","); + virBufferAddLit(&buf, "}"); + + if (!(arguments = virJSONValueFromString(virBufferCurrentContent(&buf)))) { + vshError(ctl, _("failed to wrap arguments '%s' into a QMP command wrapper"), + fullargs); + return NULL; + } + } + + if (virJSONValueObjectCreate(&command, + "s:execute", commandname, + "A:arguments", &arguments, + NULL) < 0) + return NULL; + + return virJSONValueToString(command, false); +} + + static bool cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) { @@ -9453,8 +9531,6 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) g_autofree char *result = NULL; g_autoptr(virJSONValue) resultjson = NULL; unsigned int flags = 0; - const vshCmdOpt *opt = NULL; - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; bool pretty = vshCommandOptBool(cmd, "pretty"); bool returnval = vshCommandOptBool(cmd, "return-value"); virJSONValue *formatjson; @@ -9466,15 +9542,17 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - while ((opt = vshCommandOptArgv(ctl, cmd, opt))) - virBufferAsprintf(&buf, "%s ", opt->data); - - virBufferTrim(&buf, " "); - - monitor_cmd = virBufferContentAndReset(&buf); - - if (vshCommandOptBool(cmd, "hmp")) + if (vshCommandOptBool(cmd, "hmp")) { flags |= VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP; + monitor_cmd = cmdQemuMonitorCommandConcatCmd(ctl, cmd, NULL); + } else { + monitor_cmd = cmdQemuMonitorCommandQMPWrap(ctl, cmd); + } + + if (!monitor_cmd) { + vshSaveLibvirtError(); + return NULL; + } if (virDomainQemuMonitorCommand(dom, monitor_cmd, &result, flags) < 0) return false; -- 2.31.1

3 3

[PATCH v2 0/2] selinux: Don't ignore ENOENT in Permissive mode
by Michal Privoznik 18 Oct '21

18 Oct '21

v2 of: https://listman.redhat.com/archives/libvir-list/2021-September/msg00553.html diff to v1: - Reworded commit message in 2/2. Michal Prívozník (2): selinux: Swap two blocks handling setfilecon_raw() failure selinux: Don't ignore ENOENT in Permissive mode src/security/security_selinux.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) -- 2.32.0

1 2

[PATCH 0/6] qemu: Type-aware generation of properties for -device (part 3)
by Peter Krempa 18 Oct '21

18 Oct '21

Kevin's patches were committed upstream, so libvirt can start using the JSON syntax now. This patch adds also validation of the parameters against the QMP schema, but the schema is incomplete for now. Peter Krempa (6): qemucapabilitiestest: Update qemu-6.2 cycle capability test data testQEMUSchemaValidateCommand: Add possibility for partial QMP validation qemuMonitorTestProcessCommandDefaultValidate: Partially validate 'device_add' qemu: Use JSON directly for '-device' testCompareXMLToArgvValidateSchemaCommand: Add validation for '-device' NEWS: Mention conversion of '-device' to JSON starting with QEMU-6.2 NEWS.rst | 7 ++ src/qemu/qemu_capabilities.c | 1 + .../caps_6.2.0.x86_64.replies | 99 ++++++++++--------- .../caps_6.2.0.x86_64.xml | 3 +- tests/qemumigparamstest.c | 1 + tests/qemumigrationcookiexmltest.c | 1 + tests/qemumonitortestutils.c | 6 +- .../audio-alsa-best.x86_64-latest.args | 4 +- .../audio-alsa-full.x86_64-latest.args | 4 +- .../audio-alsa-minimal.x86_64-latest.args | 4 +- .../audio-coreaudio-best.x86_64-latest.args | 4 +- .../audio-coreaudio-full.x86_64-latest.args | 4 +- ...audio-coreaudio-minimal.x86_64-latest.args | 4 +- ...udio-default-nographics.x86_64-latest.args | 4 +- .../audio-default-sdl.x86_64-latest.args | 6 +- .../audio-default-spice.x86_64-latest.args | 6 +- .../audio-default-vnc.x86_64-latest.args | 6 +- .../audio-file-best.x86_64-latest.args | 4 +- .../audio-file-full.x86_64-latest.args | 4 +- .../audio-file-minimal.x86_64-latest.args | 4 +- .../audio-jack-full.x86_64-latest.args | 4 +- .../audio-jack-minimal.x86_64-latest.args | 4 +- .../audio-many-backends.x86_64-latest.args | 14 +-- .../audio-none-best.x86_64-latest.args | 4 +- .../audio-none-full.x86_64-latest.args | 4 +- .../audio-none-minimal.x86_64-latest.args | 4 +- .../audio-oss-best.x86_64-latest.args | 4 +- .../audio-oss-full.x86_64-latest.args | 4 +- .../audio-oss-minimal.x86_64-latest.args | 4 +- .../audio-pulseaudio-best.x86_64-latest.args | 4 +- .../audio-pulseaudio-full.x86_64-latest.args | 4 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 4 +- .../audio-sdl-best.x86_64-latest.args | 4 +- .../audio-sdl-full.x86_64-latest.args | 4 +- .../audio-sdl-minimal.x86_64-latest.args | 4 +- .../audio-spice-best.x86_64-latest.args | 4 +- .../audio-spice-full.x86_64-latest.args | 4 +- .../audio-spice-minimal.x86_64-latest.args | 4 +- .../blkdeviotune-group-num.x86_64-latest.args | 8 +- ...blkdeviotune-max-length.x86_64-latest.args | 8 +- .../blkdeviotune-max.x86_64-latest.args | 8 +- .../channel-unix-guestfwd.x86_64-latest.args | 4 +- .../console-virtio-unix.x86_64-latest.args | 10 +- .../controller-virtio-scsi.x86_64-latest.args | 24 ++--- ...-Icelake-Server-pconfig.x86_64-latest.args | 4 +- .../cpu-host-model.x86_64-latest.args | 10 +- .../cpu-translation.x86_64-latest.args | 4 +- .../cputune-cpuset-big-id.x86_64-latest.args | 6 +- .../devices-acpi-index.x86_64-latest.args | 16 +-- .../disk-aio-io_uring.x86_64-latest.args | 6 +- .../disk-aio.x86_64-latest.args | 8 +- ...-backing-chains-noindex.x86_64-latest.args | 16 +-- .../disk-blockio.x86_64-latest.args | 8 +- .../disk-boot-cdrom.x86_64-latest.args | 6 +- .../disk-boot-disk.x86_64-latest.args | 6 +- .../disk-cache.x86_64-latest.args | 14 +-- .../disk-cdrom-bus-other.x86_64-latest.args | 6 +- ...m-empty-network-invalid.x86_64-latest.args | 4 +- .../disk-cdrom-network.x86_64-latest.args | 10 +- .../disk-cdrom-tray.x86_64-latest.args | 10 +- .../disk-cdrom.x86_64-latest.args | 10 +- .../disk-copy_on_read.x86_64-latest.args | 12 +-- .../disk-detect-zeroes.x86_64-latest.args | 8 +- .../disk-discard.x86_64-latest.args | 8 +- .../disk-error-policy.x86_64-latest.args | 8 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 12 +-- .../disk-floppy-q35-2_9.x86_64-latest.args | 12 +-- .../disk-floppy-tray.x86_64-latest.args | 10 +- .../disk-floppy.x86_64-latest.args | 8 +- .../disk-fmt-qcow.x86_64-latest.args | 6 +- .../disk-geometry.x86_64-latest.args | 6 +- .../disk-ide-split.x86_64-latest.args | 8 +- .../disk-ide-wwn.x86_64-latest.args | 6 +- .../disk-ioeventfd.x86_64-latest.args | 12 +-- .../disk-metadata-cache.x86_64-latest.args | 8 +- .../disk-network-gluster.x86_64-latest.args | 8 +- .../disk-network-http.x86_64-latest.args | 10 +- .../disk-network-iscsi.x86_64-latest.args | 18 ++-- .../disk-network-nbd.x86_64-latest.args | 12 +-- .../disk-network-nfs.x86_64-latest.args | 6 +- ...sk-network-rbd-no-colon.x86_64-latest.args | 8 +- .../disk-network-rbd.x86_64-latest.args | 14 +-- ...isk-network-source-auth.x86_64-latest.args | 8 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 4 +- .../disk-no-boot.x86_64-latest.args | 8 +- .../disk-nvme.x86_64-latest.args | 12 +-- .../disk-order.x86_64-latest.args | 12 +-- .../disk-readonly-disk.x86_64-latest.args | 8 +- .../disk-rotation.x86_64-latest.args | 12 +-- .../disk-sata-device.x86_64-latest.args | 8 +- .../disk-scsi-device-auto.x86_64-latest.args | 10 +- .../disk-scsi-disk-split.x86_64-latest.args | 20 ++-- .../disk-scsi-disk-vpd.x86_64-latest.args | 12 +-- .../disk-scsi-disk-wwn.x86_64-latest.args | 12 +-- ...sk-scsi-lun-passthrough.x86_64-latest.args | 12 +-- .../disk-scsi.x86_64-latest.args | 26 ++--- .../disk-serial.x86_64-latest.args | 8 +- .../disk-shared.x86_64-latest.args | 14 +-- .../disk-slices.x86_64-latest.args | 14 +-- .../disk-snapshot.x86_64-latest.args | 10 +- .../disk-source-pool-mode.x86_64-latest.args | 12 +-- .../disk-source-pool.x86_64-latest.args | 14 +-- .../disk-transient.x86_64-latest.args | 6 +- ...sk-usb-device-removable.x86_64-latest.args | 8 +- .../disk-usb-device.x86_64-latest.args | 8 +- .../disk-vhostuser.x86_64-latest.args | 8 +- .../disk-virtio-queues.x86_64-latest.args | 8 +- ...irtio-scsi-reservations.x86_64-latest.args | 10 +- .../disk-virtio.x86_64-latest.args | 10 +- .../encrypted-disk-usage.x86_64-latest.args | 6 +- .../encrypted-disk.x86_64-latest.args | 6 +- .../eoi-disabled.x86_64-latest.args | 4 +- .../eoi-enabled.x86_64-latest.args | 4 +- .../event_idx.x86_64-latest.args | 12 +-- .../fips-enabled.x86_64-latest.args | 6 +- .../floppy-drive-fat.x86_64-latest.args | 6 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +- .../genid-auto.x86_64-latest.args | 4 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 4 +- ...egl-headless-rendernode.x86_64-latest.args | 6 +- .../graphics-egl-headless.x86_64-latest.args | 6 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 6 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 6 +- ...raphics-vnc-auto-socket.x86_64-latest.args | 4 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 6 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 6 +- .../graphics-vnc-none.x86_64-latest.args | 4 +- .../graphics-vnc-policy.x86_64-latest.args | 6 +- .../graphics-vnc-power.x86_64-latest.args | 6 +- ...remove-generated-socket.x86_64-latest.args | 6 +- .../graphics-vnc-sasl.x86_64-latest.args | 6 +- ...-vnc-socket-new-cmdline.x86_64-latest.args | 4 +- .../graphics-vnc-socket.x86_64-latest.args | 4 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 4 +- .../graphics-vnc-tls.x86_64-latest.args | 4 +- .../graphics-vnc-websocket.x86_64-latest.args | 4 +- .../graphics-vnc.x86_64-latest.args | 6 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 6 +- ...play-spice-egl-headless.x86_64-latest.args | 6 +- ...ev-display-spice-opengl.x86_64-latest.args | 6 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 6 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +- .../hostdev-scsi-lsi.x86_64-latest.args | 20 ++-- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 22 ++--- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 4 +- .../hyperv-off.x86_64-latest.args | 4 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../input-linux.x86_64-latest.args | 4 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 2 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +- .../intel-iommu-eim.x86_64-latest.args | 2 +- .../intel-iommu.x86_64-latest.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 10 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 4 +- ...luks-disks-source-qcow2.x86_64-latest.args | 16 +-- .../luks-disks-source.x86_64-latest.args | 14 +-- .../luks-disks.x86_64-latest.args | 8 +- ...memory-default-hugepage.x86_64-latest.args | 4 +- .../memfd-memory-numa.x86_64-latest.args | 6 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 8 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 8 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 8 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 8 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 8 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 8 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 10 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 8 +- .../misc-no-reboot.x86_64-latest.args | 4 +- .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- .../net-vdpa.x86_64-latest.args | 4 +- .../net-vhostuser.x86_64-latest.args | 8 +- .../numatune-hmat.x86_64-latest.args | 4 +- ...emnode-restrictive-mode.x86_64-latest.args | 4 +- .../numatune-memnode.x86_64-latest.args | 4 +- .../os-firmware-bios.x86_64-latest.args | 16 +-- ...re-efi-no-enrolled-keys.x86_64-latest.args | 6 +- ...os-firmware-efi-secboot.x86_64-latest.args | 16 +-- .../os-firmware-efi.x86_64-latest.args | 16 +-- .../panic-double.x86_64-latest.args | 4 +- .../panic-no-address.x86_64-latest.args | 8 +- .../qemuxml2argvdata/panic.x86_64-latest.args | 8 +- .../parallel-unix-chardev.x86_64-latest.args | 8 +- ...-hotplug-bridge-disable.x86_64-latest.args | 4 +- ...i-hotplug-bridge-enable.x86_64-latest.args | 4 +- ...pi-root-hotplug-disable.x86_64-latest.args | 4 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 4 +- ...cie-root-port-nohotplug.x86_64-latest.args | 18 ++-- .../pv-spinlock-disabled.x86_64-latest.args | 4 +- .../pv-spinlock-enabled.x86_64-latest.args | 4 +- ...-hotplug-bridge-disable.x86_64-latest.args | 10 +- ...i-hotplug-bridge-enable.x86_64-latest.args | 10 +- .../qemu-ns.x86_64-latest.args | 6 +- .../serial-unix-chardev.x86_64-latest.args | 8 +- ...rtcard-passthrough-unix.x86_64-latest.args | 8 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +- .../tpm-emulator-tpm2.x86_64-latest.args | 6 +- .../tpm-emulator.x86_64-latest.args | 6 +- .../tpm-passthrough-crb.x86_64-latest.args | 6 +- .../tpm-passthrough.x86_64-latest.args | 6 +- .../tseg-explicit-size.x86_64-latest.args | 10 +- .../usb-redir-unix.x86_64-latest.args | 14 +-- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 12 +-- ...host-user-gpu-secondary.x86_64-latest.args | 10 +- .../vhost-user-vga.x86_64-latest.args | 8 +- .../vhost-vsock-auto.x86_64-latest.args | 6 +- .../vhost-vsock.x86_64-latest.args | 6 +- ...eo-bochs-display-device.x86_64-latest.args | 8 +- ...video-qxl-device-vram64.x86_64-latest.args | 6 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 8 +- ...eo-ramfb-display-device.x86_64-latest.args | 8 +- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 8 +- .../virtio-9p-createmode.x86_64-latest.args | 14 +-- .../virtio-9p-multidevs.x86_64-latest.args | 12 +-- .../virtio-lun.x86_64-latest.args | 12 +-- ...virtio-non-transitional.x86_64-latest.args | 42 ++++---- ...-options-controller-ats.x86_64-latest.args | 12 +-- ...ptions-controller-iommu.x86_64-latest.args | 12 +-- ...tions-controller-packed.x86_64-latest.args | 12 +-- ...virtio-options-disk-ats.x86_64-latest.args | 8 +- ...rtio-options-disk-iommu.x86_64-latest.args | 8 +- ...tio-options-disk-packed.x86_64-latest.args | 8 +- .../virtio-options-fs-ats.x86_64-latest.args | 8 +- ...virtio-options-fs-iommu.x86_64-latest.args | 8 +- ...irtio-options-fs-packed.x86_64-latest.args | 8 +- ...irtio-options-input-ats.x86_64-latest.args | 8 +- ...tio-options-input-iommu.x86_64-latest.args | 8 +- ...io-options-input-packed.x86_64-latest.args | 8 +- ...-options-memballoon-ats.x86_64-latest.args | 4 +- ...loon-freepage-reporting.x86_64-latest.args | 4 +- ...ptions-memballoon-iommu.x86_64-latest.args | 4 +- ...tions-memballoon-packed.x86_64-latest.args | 4 +- .../virtio-options-net-ats.x86_64-latest.args | 8 +- ...irtio-options-net-iommu.x86_64-latest.args | 8 +- ...rtio-options-net-packed.x86_64-latest.args | 8 +- .../virtio-options-rng-ats.x86_64-latest.args | 8 +- ...irtio-options-rng-iommu.x86_64-latest.args | 8 +- ...rtio-options-rng-packed.x86_64-latest.args | 8 +- ...irtio-options-video-ats.x86_64-latest.args | 8 +- ...tio-options-video-iommu.x86_64-latest.args | 8 +- ...io-options-video-packed.x86_64-latest.args | 8 +- .../virtio-options.x86_64-latest.args | 28 +++--- .../virtio-rng-builtin.x86_64-latest.args | 6 +- .../virtio-rng-egd-unix.x86_64-latest.args | 6 +- .../virtio-transitional.x86_64-latest.args | 26 ++--- .../watchdog-device.x86_64-latest.args | 8 +- .../watchdog-dump.x86_64-latest.args | 8 +- .../watchdog-injectnmi.x86_64-latest.args | 8 +- .../watchdog.x86_64-latest.args | 6 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 14 +-- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 14 +-- .../x86_64-pc-graphics.x86_64-latest.args | 20 ++-- .../x86_64-pc-headless.x86_64-latest.args | 16 +-- .../x86_64-q35-graphics.x86_64-latest.args | 34 +++---- .../x86_64-q35-headless.x86_64-latest.args | 30 +++--- tests/qemuxml2argvtest.c | 12 ++- tests/testutilsqemuschema.c | 11 ++- tests/testutilsqemuschema.h | 1 + 266 files changed, 1123 insertions(+), 1093 deletions(-) -- 2.31.1

2 7

[PATCH] qemu: Decrease scope of variables in qemuConnectGetAllDomainStats()
by Michal Privoznik 18 Oct '21

18 Oct '21

There are two variables (@vm and @domflags) in qemuConnectGetAllDomainStats() that are used only within the for() loop but declared for entire function. Bring them into the loop to make it obvious they are not used outside of it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9bcba4b9a4..b9cc8f8379 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18811,14 +18811,12 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, virQEMUDriver *driver = conn->privateData; virErrorPtr orig_err = NULL; virDomainObj **vms = NULL; - virDomainObj *vm; size_t nvms; virDomainStatsRecordPtr *tmpstats = NULL; bool enforce = !!(flags & VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS); int nstats = 0; size_t i; int ret = -1; - unsigned int domflags = 0; unsigned int lflags = flags & (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE); @@ -18848,12 +18846,11 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, tmpstats = g_new0(virDomainStatsRecordPtr, nvms + 1); for (i = 0; i < nvms; i++) { + virDomainObj *vm = vms[i]; virDomainStatsRecordPtr tmp = NULL; unsigned int privflags = 0; unsigned int requestedStats = stats; - - domflags = 0; - vm = vms[i]; + unsigned int domflags = 0; virObjectLock(vm); -- 2.32.0

2 1

[PATCH 0/2] objecteventtest: Two simple improvements
by Michal Privoznik 18 Oct '21

18 Oct '21

*** BLURB HERE *** Michal Prívozník (2): objecteventtest: Drop lifecycleEventCounter_reset() objecteventtest: Don't overwrite @ret on failure tests/objecteventtest.c | 129 +++++++++++----------------------------- 1 file changed, 36 insertions(+), 93 deletions(-) -- 2.32.0

2 3

[PATCH] virNodeDeviceDefParse: Don't call post-parse callbacks with NULL def
by Peter Krempa 18 Oct '21

18 Oct '21

When parsing of the node device XML we'd still call the post-parse and validation callbacks which makes no sense. Additionally the callbacks were expecting a non-NULL pointer which leads to a crash. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2014139 Fixes: d5ae634ba28 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/conf/node_device_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 9bbff97ffd..d5e02f623d 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2178,8 +2178,9 @@ virNodeDeviceDefParse(const char *str, g_autoptr(virNodeDeviceDef) def = NULL; if ((xml = virXMLParse(filename, str, _("(node_device_definition)"), NULL, false))) { - def = virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml), - create, virt_type); + if (!(def = virNodeDeviceDefParseNode(xml, xmlDocGetRootElement(xml), + create, virt_type))) + return NULL; } if (parserCallbacks) { -- 2.31.1

2 1

[PATCH 0/4] Fix the bug about virsh domstats on qemu <5.2.0
by Hiroki Narukawa 18 Oct '21

18 Oct '21

query-dirty-rate command is used for virsh domstats regardless of qemu version, but this is available only on qemu >=5.2.0. So virsh domstats fails if qemu is older. This patchset fixes the bug. I added it to NEWS because I thought it is a bug that users want to find, but if it is not so please simply ignore the last commit. Hiroki Narukawa (4): qemu_capabilities: Add QEMU_CAPS_QUERY_DIRTY_RATE capability qemu_driver: add required capabilities to qemuDomainGetStatsWorkers qemu_driver: add check for qemu capabilities requirements NEWS: document bug fix about virsh domstats on qemu < 5.2.0 NEWS.rst | 5 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 72 +++++++++++++------ .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + 14 files changed, 68 insertions(+), 22 deletions(-) -- 2.17.1

2 10

Add a couple of negative unit tests
by Ani Sinha 18 Oct '21

18 Oct '21

This patch series adds a couple of negative unit tests in order to make sure we fail in case of invalid conf options. * [PATCH 1/2] conf/test: add a negative unit test for invalid pci Above patch makes sure we fail if invalid pci specific global feature is specified. * [PATCH 2/2] conf/test: add a negative test for invalid Above patch makes sure we fail if invalid config arrtinute for acpi-bridge-hotplug is specified.

1 2

[PATCH 0/2] qemu: Move 2 pid files to stateDir
by Peng Liang 17 Oct '21

17 Oct '21

Please see the commit messages for detail. Peng Liang (2): qemu: Move pid file of pr-helper to stateDir qemu: Move pid file of virtiofsd to stateDir src/qemu/qemu_process.c | 6 ++++-- src/qemu/qemu_virtiofs.c | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) -- 2.31.1

2 5

[PATCH] qemu: Do not report eof when processing monitor IO
by Jim Fehlig 15 Oct '21

15 Oct '21

There have been countless reports from users concerned about the following error reported by libvirtd when qemu domains are shutdown internal error: End of file from qemu monitor While the error is harmless, users often mistaken it for real problem with their deployments. EOF from the monitor can't be entirely ignored since other threads may be using the monitor and must be able to detect the EOF condition. One potential fix is to delay reporting EOF until the monitor is used after EOF is detected. This patch adds a 'goteof' member to the qemuMonitor structure, which is set when EOF is detected on the monitor socket. If another thread later tries to send data on the monitor, the EOF error is reported. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- First non-RFC version of the patch. RFC version can be found here https://listman.redhat.com/archives/libvir-list/2021-October/msg00484.html Tests mentioned in the below post are running on this version of the patch and have completed 12 iterations thus far https://listman.redhat.com/archives/libvir-list/2021-October/msg00351.html src/qemu/qemu_monitor.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7ff6a1161f..434cc26c10 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -113,6 +113,7 @@ struct _qemuMonitor { /* true if qemu no longer wants 'props' sub-object of object-add */ bool objectAddNoWrap; + bool goteof; }; /** @@ -526,7 +527,6 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, { qemuMonitor *mon = opaque; bool error = false; - bool eof = false; bool hangup = false; virObjectRef(mon); @@ -544,7 +544,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (mon->lastError.code != VIR_ERR_OK) { if (cond & (G_IO_HUP | G_IO_ERR)) - eof = true; + mon->goteof = true; error = true; } else { if (cond & G_IO_OUT) { @@ -562,7 +562,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (errno == ECONNRESET) hangup = true; } else if (got == 0) { - eof = true; + mon->goteof = true; } else { /* Ignore hangup/error cond if we read some data, to * give time for that data to be consumed */ @@ -575,22 +575,19 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (cond & G_IO_HUP) { hangup = true; - if (!error) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("End of file from qemu monitor")); - eof = true; - } + if (!error) + mon->goteof = true; } - if (!error && !eof && + if (!error && !mon->goteof && cond & G_IO_ERR) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid file descriptor while waiting for monitor")); - eof = true; + mon->goteof = true; } } - if (error || eof) { + if (error || mon->goteof) { if (hangup && mon->logFunc != NULL) { /* Check if an error message from qemu is available and if so, use * it to overwrite the actual message. It's done only in early @@ -609,7 +606,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, /* Already have an error, so clear any new error */ virResetLastError(); } else { - if (virGetLastErrorCode() == VIR_ERR_OK) + if (virGetLastErrorCode() == VIR_ERR_OK && !mon->goteof) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error while processing monitor IO")); virCopyLastError(&mon->lastError); @@ -630,7 +627,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, /* We have to unlock to avoid deadlock against command thread, * but is this safe ? I think it is, because the callback * will try to acquire the virDomainObj *mutex next */ - if (eof) { + if (mon->goteof) { qemuMonitorEofNotifyCallback eofNotify = mon->cb->eofNotify; virDomainObj *vm = mon->vm; @@ -949,6 +946,11 @@ qemuMonitorSend(qemuMonitor *mon, virSetError(&mon->lastError); return -1; } + if (mon->goteof) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("End of file from qemu monitor")); + return -1; + } mon->msg = msg; qemuMonitorUpdateWatch(mon); -- 2.33.0

2 2

[PATCH 0/2] virnetsocket: Use g_auto* more
by Michal Privoznik 15 Oct '21

15 Oct '21

*** BLURB HERE *** Michal Prívozník (2): virnetsocket: Don't free virCommand in virNetSocketNewConnectCommand() virnetsocket: Use g_auto* more src/rpc/virnetsocket.c | 64 +++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 42 deletions(-) -- 2.32.0

2 4

[PATCH 0/1] Fix the bug on disk->queue_size capability validation
by Hiroki Narukawa 15 Oct '21

15 Oct '21

Sorry, the patch I send in September 2021 had a mistake on capability check. This patch fixes that. Hiroki Narukawa (1): qemu_validate: Fix capability check for disk queue_size src/qemu/qemu_validate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1

2 2

[PATCH 0/5] qemu: Retire two virtio related capabilities
by Michal Privoznik 15 Oct '21

15 Oct '21

*** BLURB HERE *** Michal Prívozník (5): test: Drop unused .args or .xml files qemuxml2argvtest: Drop negative virtio-*-iommu tests qemu: capabilities: Retire QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM qemuxml2argvtest: Drop negative virtio-*-ats tests qemu: capabilities: Retire QEMU_CAPS_VIRTIO_PCI_ATS src/qemu/qemu_capabilities.c | 14 +----- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_validate.c | 16 ------ .../caps_2.11.0.s390x.xml | 2 - .../caps_2.11.0.x86_64.xml | 2 - .../caps_2.12.0.aarch64.xml | 2 - .../caps_2.12.0.ppc64.xml | 2 - .../caps_2.12.0.s390x.xml | 2 - .../caps_2.12.0.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 - .../caps_3.0.0.riscv32.xml | 1 - .../caps_3.0.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 - .../caps_3.0.0.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 - .../caps_3.1.0.x86_64.xml | 2 - .../caps_4.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 - .../caps_4.0.0.riscv32.xml | 2 - .../caps_4.0.0.riscv64.xml | 2 - .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 - .../caps_4.0.0.x86_64.xml | 2 - .../caps_4.1.0.x86_64.xml | 2 - .../caps_4.2.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 - .../caps_4.2.0.x86_64.xml | 2 - .../caps_5.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 - .../caps_5.0.0.riscv64.xml | 2 - .../caps_5.0.0.x86_64.xml | 2 - .../caps_5.1.0.x86_64.xml | 2 - .../caps_5.2.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 - .../caps_5.2.0.riscv64.xml | 2 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 - .../caps_5.2.0.x86_64.xml | 2 - .../caps_6.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 - .../caps_6.0.0.x86_64.xml | 2 - .../caps_6.1.0.x86_64.xml | 2 - .../caps_6.2.0.x86_64.xml | 2 - .../luks-disks-source-qcow2.args | 49 ------------------- .../virtio-options-controller-ats.err | 1 - .../virtio-options-controller-iommu.err | 1 - .../virtio-options-disk-ats.err | 1 - .../virtio-options-disk-iommu.err | 1 - .../virtio-options-fs-ats.err | 1 - .../virtio-options-fs-iommu.err | 1 - .../virtio-options-input-ats.err | 1 - .../virtio-options-input-iommu.err | 1 - .../virtio-options-memballoon-ats.err | 1 - .../virtio-options-memballoon-iommu.err | 1 - .../virtio-options-net-ats.err | 1 - .../virtio-options-net-iommu.err | 1 - .../virtio-options-rng-ats.err | 1 - .../virtio-options-rng-iommu.err | 1 - .../virtio-options-video-ats.err | 1 - .../virtio-options-video-iommu.err | 1 - tests/qemuxml2argvtest.c | 26 ---------- .../qemuxml2xmloutdata/disk-virtio-queues.xml | 1 - tests/qemuxml2xmloutdata/panic-isa.xml | 41 ---------------- 62 files changed, 4 insertions(+), 239 deletions(-) delete mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.args delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-iommu.err delete mode 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.xml delete mode 100644 tests/qemuxml2xmloutdata/panic-isa.xml -- 2.32.0

2 10

[PATCH v3 0/2] Implement paeg-per-vq to virtio devices
by Han Han 15 Oct '21

15 Oct '21

Diff from v2: - Remove the code of qemu capabilities since the least supported QEMU version is over the version introducing paeg-per-vq. - Rebase to latest upstream v2: https://listman.redhat.com/archives/libvir-list/2021-October/msg00489.html Han Han (2): conf: Add page_per_vq for driver element qemu: Add support for virtio device option page-per-vq docs/formatdomain.rst | 9 +++++++ docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 16 ++++++++++++ src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 6 +++++ src/qemu/qemu_command.c | 1 + src/qemu/qemu_hotplug.c | 3 ++- src/qemu/qemu_validate.c | 1 + .../virtio-options.x86_64-latest.args | 24 ++++++++--------- tests/qemuxml2argvdata/virtio-options.xml | 26 +++++++++---------- 10 files changed, 66 insertions(+), 26 deletions(-) -- 2.31.1

2 3

[PATCH v2 0/3] Implement paeg-per-vq to virtio devices
by Han Han 15 Oct '21

15 Oct '21

Diff from v1: - Remove some duplicated test cases - Merge some err msgs of 2 lines into one line - Rebase to latest upstream v1: https://listman.redhat.com/archives/libvir-list/2021-September/msg00087.html Han Han (3): qemu_capabilities: Add flag QEMU_CAPS_VIRTIO_PAGE_PER_VQ conf: Add page_per_vq for driver element qemu: Add support for virtio device option page-per-vq docs/formatdomain.rst | 9 +++++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 16 ++++++++ src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 6 +++ src/qemu/qemu_capabilities.c | 6 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 ++ src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_validate.c | 7 ++++ .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../virtio-options-controller-page_per_vq.err | 1 + .../virtio-options-controller-page_per_vq.xml | 38 +++++++++++++++++++ .../virtio-options-disk-page_per_vq.err | 1 + .../virtio-options-disk-page_per_vq.xml | 34 +++++++++++++++++ .../virtio-options-fs-page_per_vq.err | 1 + .../virtio-options-fs-page_per_vq.xml | 34 +++++++++++++++++ .../virtio-options-input-page_per_vq.err | 1 + .../virtio-options-input-page_per_vq.xml | 30 +++++++++++++++ .../virtio-options-memballoon-page_per_vq.err | 1 + .../virtio-options-memballoon-page_per_vq.xml | 23 +++++++++++ .../virtio-options-net-page_per_vq.err | 1 + .../virtio-options-net-page_per_vq.xml | 34 +++++++++++++++++ .../virtio-options-rng-page_per_vq.err | 1 + .../virtio-options-rng-page_per_vq.xml | 32 ++++++++++++++++ .../virtio-options-video-page_per_vq.err | 1 + .../virtio-options-video-page_per_vq.xml | 36 ++++++++++++++++++ .../virtio-options.x86_64-latest.args | 26 ++++++------- tests/qemuxml2argvdata/virtio-options.xml | 26 ++++++------- tests/qemuxml2argvtest.c | 14 +++++++ 65 files changed, 402 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-input-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-input-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-net-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-net-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-video-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-video-page_per_vq.xml -- 2.31.1

3 8

[RFC PATCH] qemu: Do not report eof when processing monitor IO
by Jim Fehlig 15 Oct '21

15 Oct '21

There have been countless reports from users concerned about the following error reported by libvirtd when qemu domains are shutdown internal error: End of file from qemu monitor While the error is harmless, users often mistaken it for real problem with their deployments. EOF from the monitor can't be entirely ignored since other threads may be using the monitor and must be able to detect the EOF condition. One potential fix is to delay reporting EOF until the monitor is used after EOF is detected. This patch adds a 'goteof' member to the qemuMonitor structure, which is set when EOF is detected on the monitor socket. If another thread later tries to send data on the monitor, the EOF error is reported. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- An RFC patch to squelch qemu monitor EOF error messages on VM shutdown. Previous discussions and information on testing of the patch can be found in this thread https://listman.redhat.com/archives/libvir-list/2021-September/msg00949.html src/qemu/qemu_monitor.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5fc23f13d3..751ec8ba6c 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -113,6 +113,7 @@ struct _qemuMonitor { /* true if qemu no longer wants 'props' sub-object of object-add */ bool objectAddNoWrap; + bool goteof; }; /** @@ -526,10 +527,10 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, { qemuMonitor *mon = opaque; bool error = false; - bool eof = false; bool hangup = false; virObjectRef(mon); + mon->goteof = false; /* lock access to the monitor and protect fd */ virObjectLock(mon); @@ -544,7 +545,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (mon->lastError.code != VIR_ERR_OK) { if (cond & (G_IO_HUP | G_IO_ERR)) - eof = true; + mon->goteof = true; error = true; } else { if (cond & G_IO_OUT) { @@ -562,7 +563,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (errno == ECONNRESET) hangup = true; } else if (got == 0) { - eof = true; + mon->goteof = true; } else { /* Ignore hangup/error cond if we read some data, to * give time for that data to be consumed */ @@ -575,22 +576,19 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (cond & G_IO_HUP) { hangup = true; - if (!error) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("End of file from qemu monitor")); - eof = true; - } + if (!error) + mon->goteof = true; } - if (!error && !eof && + if (!error && !mon->goteof && cond & G_IO_ERR) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid file descriptor while waiting for monitor")); - eof = true; + mon->goteof = true; } } - if (error || eof) { + if (error || mon->goteof) { if (hangup && mon->logFunc != NULL) { /* Check if an error message from qemu is available and if so, use * it to overwrite the actual message. It's done only in early @@ -609,7 +607,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, /* Already have an error, so clear any new error */ virResetLastError(); } else { - if (virGetLastErrorCode() == VIR_ERR_OK) + if (virGetLastErrorCode() == VIR_ERR_OK && !mon->goteof) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error while processing monitor IO")); virCopyLastError(&mon->lastError); @@ -630,7 +628,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, /* We have to unlock to avoid deadlock against command thread, * but is this safe ? I think it is, because the callback * will try to acquire the virDomainObj *mutex next */ - if (eof) { + if (mon->goteof) { qemuMonitorEofNotifyCallback eofNotify = mon->cb->eofNotify; virDomainObj *vm = mon->vm; @@ -949,6 +947,11 @@ qemuMonitorSend(qemuMonitor *mon, virSetError(&mon->lastError); return -1; } + if (mon->goteof) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("End of file from qemu monitor")); + return -1; + } mon->msg = msg; qemuMonitorUpdateWatch(mon); -- 2.33.0

2 3

Please explain to me this commit
by Ani Sinha 14 Oct '21

14 Oct '21

https://gitlab.com/libvirt/libvirt/-/commit/bdc3e8f47be108fa552b72a6d913528… I think you completely missed the logic here and you are rewriting a patch without cc'ing the original author. I'm sorry but this is rude. Ani

3 3

VM paused during multipath iSCSI reservation
by Vojtech Juranek 13 Oct '21

13 Oct '21

Hi, I'm trying to find the root cause for BZ #1898049 [1]. When setting up Windows HA cluster on Windows Server VMs run on top of oVirt, Windows cluster validator runs couple of tests and fails during test "Validate SCSI-3 Persistent Reservation" and one of the VMs of the cluster is paused with IO error. Disk definition is as follows: <disk type='block' device='lun' sgio='unfiltered' snapshot='no'> <driver name='qemu' type='raw' cache='none' error_policy='stop' io='native'/> <source dev='/dev/mapper/3600a09803830447a4f244c4657616f6f' index='1'> <seclabel model='dac' relabel='no'/> <reservations managed='yes'> <source type='unix' path='/var/lib/libvirt/qemu/domain-1-Windows-2016-2/pr-helper0.sock' mode='client'/> </reservations> </source> <backingStore/> <target dev='sdb' bus='scsi'/> <shareable/> <alias name='ua-26b4975e-e1d4-4e27-b2c6-2ea0894a571b'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> and libvirt error I get is bellow [2]. When I try to create reservation from Windows VM manually, I get following error (but not sure I do it whole process correctly): .\sg_persist --out --register --param-sark=123abc e: QEMU QEMU HARDDISK 2.5+ Peripheral device type: disk PR out (Register): command not supported sg_persist failed: Illegal request, Invalid opcode Do you have any ideas what could be wrong or how to determine the root cause of this this issue? Thanks in advance. Vojta [1] https://bugzilla.redhat.com/1898049 [2] libvirt debug log: 2021-10-12 11:43:25.148+0000: 2006427: debug : qemuMonitorEmitIOError:1243 : mon=0x7fb02006a020 2021-10-12 11:43:25.148+0000: 2006427: info : virObjectRef:402 : OBJECT_REF: obj=0x7fb02006a020 2021-10-12 11:43:25.148+0000: 2006427: info : virObjectRef:402 : OBJECT_REF: obj=0x7fafd0130020 2021-10-12 11:43:25.148+0000: 2000208: info : virObjectRef:402 : OBJECT_REF: obj=0x7fafd010d340 2021-10-12 11:43:25.148+0000: 2006427: info : virObjectNew:258 : OBJECT_NEW: obj=0x7fb020082590 classname=virDomainEventIOError 2021-10-12 11:43:25.148+0000: 2000208: info : vir_object_finalize:321 : OBJECT_DISPOSE: obj=0x7fb020082500 2021-10-12 11:43:25.148+0000: 2006427: info : virObjectNew:258 : OBJECT_NEW: obj=0x7fb020082620 classname=virDomainEventIOError 2021-10-12 11:43:25.148+0000: 2000208: info : virObjectUnref:380 : OBJECT_UNREF: obj=0x7fb020082500 2021-10-12 11:43:25.148+0000: 2006427: debug : qemuProcessHandleIOError:907 : Transitioned guest Windows-2016-2 to paused state due to IO error 2021-10-12 11:43:25.148+0000: 2000208: info : virObjectUnref:380 : OBJECT_UNREF: obj=0x7fafd010d340 2021-10-12 11:43:25.148+0000: 2006427: info : virObjectNew:258 : OBJECT_NEW: obj=0x7fafbc1fb8c0 classname=virDomainEventLifecycle 2021-10-12 11:43:25.148+0000: 2006427: debug : virDomainLockProcessPause:204 : plugin=0x7fafd01272a0 dom=0x7fb01400f5e0 state=0x7fb02401d768 2021-10-12 11:43:25.148+0000: 2006427: debug : virDomainLockManagerNew:134 : plugin=0x7fafd01272a0 dom=0x7fb01400f5e0 withResources=1 2021-10-12 11:43:25.148+0000: 2006427: debug : virLockManagerPluginGetDriver:276 : plugin=0x7fafd01272a0 2021-10-12 11:43:25.148+0000: 2006427: debug : virLockManagerNew:300 : driver=0x7fafd444a000 type=0 nparams=5 params=0x7fafd77de640 flags=0x0 2021-10-12 11:43:25.148+0000: 2006427: debug : virLockManagerLogParams:97 : key=uuid type=uuid value=70eee88c-ba2c-4c6c-bd51-c2b663db27f8 2021-10-12 11:43:25.148+0000: 2006427: debug : virLockManagerLogParams:90 : key=name type=string value=Windows-2016-2 2021-10-12 11:43:25.148+0000: 2006427: debug : virLockManagerLogParams:78 : key=id type=uint value=1 2021-10-12 11:43:25.148+0000: 2006427: debug : virLockManagerLogParams:78 : key=pid type=uint value=2006418 2021-10-12 11:43:25.148+0000: 2006427: debug : virLockManagerLogParams:93 : key=uri type=cstring value=(null) 2021-10-12 11:43:25.148+0000: 2006427: debug : virDomainLockManagerNew:146 : Adding leases 2021-10-12 11:43:25.148+0000: 2006427: debug : virDomainLockManagerNew:151 : Adding disks 2021-10-12 11:43:25.149+0000: 2006427: debug : virDomainLockManagerAddImage:90 : Add disk /rhev/data-center/mnt/blockSD/7c4f09b6-9e87-436f-bda9-22d1f0b50955/images/f5d6e074-dfe9-462d-8cfd-3e14b0eb5aea/766e36b2-84a6-43e7-a48b-a5f47e669860 2021-10-12 11:43:25.149+0000: 2006427: debug : virLockManagerAddResource:326 : lock=0x7fafbc19e250 type=0 name=/rhev/data-center/mnt/blockSD/7c4f09b6-9e87-436f-bda9-22d1f0b50955/images/f5d6e074-dfe9-462d-8cfd-3e14b0eb5aea/766e36b2-84a6-43e7-a48b-a5f47e669860 nparams=0 params=(nil) flags=0x0 2021-10-12 11:43:25.149+0000: 2006427: debug : virDomainLockManagerAddImage:90 : Add disk /dev/mapper/3600a09803830447a4f244c4657616f6f 2021-10-12 11:43:25.149+0000: 2006427: debug : virLockManagerAddResource:326 : lock=0x7fafbc19e250 type=0 name=/dev/mapper/3600a09803830447a4f244c4657616f6f nparams=0 params=(nil) flags=0x2 2021-10-12 11:43:25.149+0000: 2006427: debug : virLockManagerRelease:359 : lock=0x7fafbc19e250 state=0x7fb02401d768 flags=0x0 2021-10-12 11:43:25.149+0000: 2006427: debug : virLockManagerFree:381 : lock=0x7fafbc19e250 2021-10-12 11:43:25.149+0000: 2006427: debug : qemuProcessHandleIOError:920 : Preserving lock state '<null>' 2021-10-12 11:43:25.150+0000: 2006427: info : virObjectUnref:380 : OBJECT_UNREF: obj=0x7fafd0130020 2021-10-12 11:43:25.150+0000: 2006427: info : virObjectUnref:380 : OBJECT_UNREF: obj=0x7fb02006a020 2021-10-12 11:43:25.150+0000: 2000208: info : virObjectRef:402 : OBJECT_REF: obj=0x7fafd010d340 2021-10-12 11:43:25.150+0000: 2000208: info : vir_object_finalize:321 : OBJECT_DISPOSE: obj=0x7fb020082590 2021-10-12 11:43:25.150+0000: 2006427: info : virObjectRef:402 : OBJECT_REF: obj=0x7fb02006a020 2021-10-12 11:43:25.150+0000: 2000208: info : virObjectUnref:380 : OBJECT_UNREF: obj=0x7fb020082590 2021-10-12 11:43:25.150+0000: 2006427: info : virObjectUnref:380 : OBJECT_UNREF: obj=0x7fb02006a020 2021-10-12 11:43:25.150+0000: 2000208: info : virObjectNew:258 : OBJECT_NEW: obj=0x564a89a4cc60 classname=virDomain 2021-10-12 11:43:25.150+0000: 2006427: info : virObjectUnref:380 : OBJECT_UNREF: obj=0x7fb02006a020 2021-10-12 11:43:25.150+0000: 2000208: info : virObjectRef:402 : OBJECT_REF: obj=0x7fafd0018ca0 2021-10-12 11:43:25.150+0000: 2000208: info : virObjectRef:402 : OBJECT_REF: obj=0x564a89978df0 2021-10-12 11:43:25.150+0000: 2000208: debug : virAccessManagerCheckDomain:238 : manager=0x564a89978df0(name=stack) driver=QEMU domain=0x7ffd2c677010 perm=0 2021-10-12 11:43:25.150+0000: 2000208: debug : virAccessManagerCheckDomain:238 : manager=0x564a89978e50(name=none) driver=QEMU domain=0x7ffd2c677010 perm=0 2021-10-12 11:43:25.150+0000: 2000208: info : virObjectUnref:380 : OBJECT_UNREF: obj=0x564a89978df0 2021-10-12 11:43:25.150+0000: 2000208: debug : remoteRelayDomainEventIOErrorReason:529 : Relaying domain io error Windows-2016-2 1 /dev/mapper/3600a09803830447a4f244c4657616f6f ua-26b4975e-e1d4-4e27-b2c6-2ea0894a571b 1 , callback 3

1 1

[libvirt PATCH 0/7] Accumulated mdev fixes
by Jonathon Jongsma 13 Oct '21

13 Oct '21

These patches fix a couple of outstanding issues with mdev support. These include: 1. output proper xml for the mdev parent device when run under the test suite 2. mdevctl allows multiple devices with the same UUID (but different parents), so we have to be prepared to handle this. This also requires a change in nodedev name for mdev devices. From 'mdev_$UUID' to 'mdev_$UUID_$PARENTADDR' 3. validate input xml when defining or creating mdevs (e.g. ensure we have a proper parent device) This patch obsoletes the previous patch titled "nodedev: Handle inactive mdevs with the same UUID" Jonathon Jongsma (7): nodedev: add internal virNodeDeviceObjListFind() nodedev: fix xml output for mdev parents in test suite nodedev: cache parent address in mdev caps nodedev: Add parser validation for node devices nodedev: add PostParse callback for nodedev parsing nodedev: Handle inactive mdevs with the same UUID nodedev: look up mdevs by UUID and parent src/conf/node_device_conf.c | 37 +++- src/conf/node_device_conf.h | 21 +- src/conf/virnodedeviceobj.c | 71 +++++-- src/conf/virnodedeviceobj.h | 15 +- src/hypervisor/domain_driver.c | 7 +- src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 182 ++++++++++++++---- src/node_device/node_device_driver.h | 6 + src/node_device/node_device_udev.c | 21 +- src/test/test_driver.c | 6 +- .../mdevctl-list-multiple.out.xml | 16 +- tests/nodedevmdevctltest.c | 36 +++- tests/nodedevxml2xmltest.c | 3 +- 13 files changed, 338 insertions(+), 84 deletions(-) -- 2.31.1

4 26

[PATCH 0/2] qemu_migration: set priv->migMaxBandwidth during migration
by Kristina Hanicova 13 Oct '21

13 Oct '21

Kristina Hanicova (2): qemu_migration: set bandwidth in priv during migration qemu_migration: drop unnecessary 'migrate_speed' variable src/qemu/qemu_migration.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.31.1

3 7

[PATCH v1] tools: add virt-host-validate-ch for ch driver
by Praveen K Paladugu 12 Oct '21

12 Oct '21

Signed-off-by: Wei-Chen Chen <weicche(a)microsoft.com> Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> --- po/POTFILES.in | 1 + tools/meson.build | 5 +++ tools/virt-host-validate-ch.c | 85 +++++++++++++++++++++++++++++++++++ tools/virt-host-validate-ch.h | 24 ++++++++++ tools/virt-host-validate.c | 12 +++++ 5 files changed, 127 insertions(+) create mode 100644 tools/virt-host-validate-ch.c create mode 100644 tools/virt-host-validate-ch.h diff --git a/po/POTFILES.in b/po/POTFILES.in index c200d7452a..b554cf08ca 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -369,6 +369,7 @@ @SRCDIR@tools/virsh.h @SRCDIR@tools/virt-admin.c @SRCDIR@tools/virt-host-validate-bhyve.c +@SRCDIR@tools/virt-host-validate-ch.c @SRCDIR@tools/virt-host-validate-common.c @SRCDIR@tools/virt-host-validate-lxc.c @SRCDIR@tools/virt-host-validate-qemu.c diff --git a/tools/meson.build b/tools/meson.build index 2acf7b0aaf..bf0eab8b6b 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -58,6 +58,11 @@ if conf.has('WITH_HOST_VALIDATE') 'virt-host-validate-bhyve.c', ] endif + if conf.has('WITH_CH') + virt_host_validate_sources += [ + 'virt-host-validate-ch.c', + ] + endif executable( 'virt-host-validate', diff --git a/tools/virt-host-validate-ch.c b/tools/virt-host-validate-ch.c new file mode 100644 index 0000000000..a6d8a01d1b --- /dev/null +++ b/tools/virt-host-validate-ch.c @@ -0,0 +1,85 @@ +/* + * Copyright Microsoft Corp. 2020-2021 + * + * virt-host-validate-ch.c: Sanity check a CH hypervisor host + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <config.h> + +#include "virarch.h" +#include "virbitmap.h" +#include "virt-host-validate-ch.h" +#include "virt-host-validate-common.h" + +int virHostValidateCh(void) +{ + int ret = 0; + virBitmap *flags; + bool hasHwVirt = false; + bool hasVirtFlag = false; + virArch arch = virArchFromHost(); + const char *kvmhint = + _("Check that CPU and firmware supports virtualization " + "and kvm module is loaded"); + + if (!(flags = virHostValidateGetCPUFlags())) + return -1; + + // Cloud-Hypervisor only supports x86_64 and aarch64 + switch ((int)arch) { + case VIR_ARCH_X86_64: + hasVirtFlag = true; + kvmhint = _("Check that the 'kvm-intel' or 'kvm-amd' modules are " + "loaded & the BIOS has enabled virtualization"); + if (virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SVM) || + virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_VMX)) + hasHwVirt = true; + break; + case VIR_ARCH_AARCH64: + hasVirtFlag = true; + hasHwVirt = true; + break; + default: + hasHwVirt = false; + break; + } + + if (hasVirtFlag) { + virHostMsgCheck("CH", "%s", _("for hardware virtualization")); + if (hasHwVirt) { + virHostMsgPass(); + } else { + virHostMsgFail(VIR_HOST_VALIDATE_FAIL, + _("Only emulated CPUs are available, performance will be " + "significantly limited")); + ret = -1; + } + } + + if (hasHwVirt || !hasVirtFlag) { + if (virHostValidateDeviceExists("CH", "/dev/kvm", VIR_HOST_VALIDATE_FAIL, + kvmhint) < 0) + ret = -1; + else if (virHostValidateDeviceAccessible( + "CH", "/dev/kvm", VIR_HOST_VALIDATE_FAIL, + _("Check /dev/kvm is world writable or you are in " + "a group that is allowed to access it")) < 0) + ret = -1; + } + + return ret; +} diff --git a/tools/virt-host-validate-ch.h b/tools/virt-host-validate-ch.h new file mode 100644 index 0000000000..b16e7d36ab --- /dev/null +++ b/tools/virt-host-validate-ch.h @@ -0,0 +1,24 @@ +/* + * virt-host-validate-ch.h: Sanity check a CH hypervisor host + * + * Copyright Microsoft Corp. 2020-2021 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +int virHostValidateCh(void); diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c index 806d61bc8e..4dae97910a 100644 --- a/tools/virt-host-validate.c +++ b/tools/virt-host-validate.c @@ -40,6 +40,9 @@ #if WITH_BHYVE # include "virt-host-validate-bhyve.h" #endif +#if WITH_CH +# include "virt-host-validate-ch.h" +#endif static void show_help(FILE *out, const char *argv0) @@ -53,6 +56,7 @@ show_help(FILE *out, const char *argv0) " - qemu\n" " - lxc\n" " - bhyve\n" + " - ch\n" "\n" " Options:\n" " -h, --help Display command line help\n" @@ -146,6 +150,14 @@ main(int argc, char **argv) } #endif +#if WITH_CH + if (!hvname || STREQ(hvname, "ch")) { + usedHvname = true; + if (virHostValidateCh() < 0) + ret = EXIT_FAILURE; + } +#endif + if (hvname && !usedHvname) { fprintf(stderr, _("%s: unsupported hypervisor name %s\n"), argv[0], hvname); -- 2.27.0

2 2

[PATCH] spec: change the ownership of cache directory
by Peng Liang 12 Oct '21

12 Oct '21

In a50c473ad6c9 ("qemu: move temp file of screenshot and memorypeek to per-domain dir") and c4f3c955d578 ("qemu: don't change ownership of cache directory"), I move the temporary files of screenshot and memorypeek from the cache directory to per-domain directory, and the only user of the cache directory is the domain capabilities currently. Since the domain capabilities are used by libvirtd, no need to set the ownership of the cache directory to qemu_user and qemu_group. Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1725e5eb14a2..4ecb28114ce8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1868,7 +1868,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %ghost %dir %{_rundir}/libvirt/qemu/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ +%dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so -- 2.31.1

2 1

[PATCH] gitdm: Add other email into Red Hat company list
by Julio Faracco 12 Oct '21

12 Oct '21

Some people from Red Hat does not use 'redhat.com' domain emails. They use personal or other domains. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- docs/gitdm/companies/ibm | 1 - docs/gitdm/companies/redhat | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/gitdm/companies/ibm b/docs/gitdm/companies/ibm index de05e1be29..ce0315df66 100644 --- a/docs/gitdm/companies/ibm +++ b/docs/gitdm/companies/ibm @@ -4,4 +4,3 @@ ibm.com # to libvirt and we don't have the corresponding @ibm.com address on file. danielhb413(a)gmail.com -jcfaracco(a)gmail.com diff --git a/docs/gitdm/companies/redhat b/docs/gitdm/companies/redhat index 88037003b2..9cdb2c5bc1 100644 --- a/docs/gitdm/companies/redhat +++ b/docs/gitdm/companies/redhat @@ -4,3 +4,4 @@ redhat.com # to libvirt and we don't have the corresponding @redhat.com address on file. lkundrak(a)v3.sk +jcfaracco(a)gmail.com -- 2.30.2

2 1

[libvirt PATCH] NEWS: document virtiofs hotplug
by Ján Tomko 12 Oct '21

12 Oct '21

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- NEWS.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index ae678bffc4..61edc53439 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -40,6 +40,10 @@ v7.9.0 (unreleased) domain definition when the guest was first started).This setting is only applicable for x86 guests using qemu driver. + * Support hotplug and hotunplug for virtiofs + + Filesystems backed by virtiofsd can now be hotplugged and hotunplugged. + * **Improvements** * **Bug fixes** -- 2.31.1

2 1

[PATCH 00/14] qemu: Type-aware generation of properties for -device (part 2)
by Peter Krempa 12 Oct '21

12 Oct '21

This series finishes the refactor to generate '-device' via JSON. This will be needed later on when qemu will consider only the JSON format to be long term stable. Next part will deal with the testing and finishing touches. Peter Krempa (14): qemuBuildStorageSourceAttachPrepareDrive: Fix function comment qemuBuildDeviceCommandlineFromJSON: Remove unused keyword qemuValidateDomainSmartcardDef: Unbreak error messages qemuValidateDomainSmartcardDef: Move chardev validation under VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH virDomainSmartcardDef: Declare 'type' as virDomainSmartcardType qemuBuildSmartcardCommandLine: Replace qemuBuildSmartcardFindCCIDController qemuValidateDomainSmartcardDef: Move validation of smartcard count qemuBuildVMGenIDCommandLine: Generate via JSON qemuBuildTPMProxyCommandLine: Generate via JSON qemuBuildVMCoreInfoCommandLine: Generate via JSON qemuBuildIOMMUCommandLine: Generate via JSON qemuBuildSmartcardCommandLine: Generate via JSON qemuBuildFloppyCommandLineControllerOptions: Extract formatting of implicit/explicit fdc qemuBuildFloppyCommandLineControllerOptionsExplicit: Generate via JSON src/conf/domain_conf.c | 23 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 366 +++++++++++++++++--------------- src/qemu/qemu_validate.c | 35 +-- src/security/security_selinux.c | 10 +- 5 files changed, 232 insertions(+), 204 deletions(-) -- 2.31.1

2 16

[libvirt PATCH] qemu: correctly pass qemuBuildVHostUserFsDevProps
by Ján Tomko 12 Oct '21

12 Oct '21

../../work/libvirt/src/qemu/qemu_hotplug.c: In function ‘qemuDomainAttachFSDevice’: ../../work/libvirt/src/qemu/qemu_hotplug.c:3458:68: error: ordered comparison of pointer with integer zero [-Werror=extra] 3458 | if (qemuBuildVHostUserFsDevProps(fs, vm->def, charAlias, priv) < 0) | ^ cc1: all warnings being treated as errors Fixes: b98787303498cfb8426ab27ee62247b164101242 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a build-breaker fix. Surprisingly, clang does not seem to mind the comparison. src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b113a5bc1e..af49e58f8e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3455,7 +3455,7 @@ qemuDomainAttachFSDevice(virQEMUDriver *driver, charAlias = qemuDomainGetVhostUserChrAlias(fs->info.alias); - if (qemuBuildVHostUserFsDevProps(fs, vm->def, charAlias, priv) < 0) + if (!(devprops = qemuBuildVHostUserFsDevProps(fs, vm->def, charAlias, priv))) goto cleanup; if (!fs->sock) { -- 2.31.1

1 0

[libvirt PATCHv3 0/2] qemu: virtiofs hot(un)plug (virtiofs epopee)
by Ján Tomko 12 Oct '21

12 Oct '21

Now with more JSON. Ján Tomko (2): qemu: implement virtiofs hotplug qemu: implement virtiofs hotunplug src/conf/domain_conf.c | 24 ++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_hotplug.c | 182 ++++++++++++++++++++++++++++++++++++++- 5 files changed, 215 insertions(+), 3 deletions(-) -- 2.31.1

2 3

[PATCH 0/3] Implement paeg-per-vq to virtio devices
by Han Han 12 Oct '21

12 Oct '21

The the paeg-per-vq option controlles the VQ Notification Virtio Capability, added since QEMU 2.8(commit d9997d89a4). It could bring some flexibility[1][2] to vhost_vdpa. Gavi, I am not very clear about how it can help with vhost_vdpa. So I paste some description from the doc of your previous patch[3]. And feel free to rely with your "Signed-off-by: " :) Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1925363 Reference: [1]: https://doc.dpdk.org/guides/sample_app_ug/vdpa.html [2]: https://lkml.org/lkml/2020/6/1/1688 [3]: https://listman.redhat.com/archives/libvir-list/2021-May/msg00143.html Han Han (3): qemu_capabilities: Add flag QEMU_CAPS_VIRTIO_PAGE_PER_VQ conf: Add page_per_vq for driver element qemu: Add support for virtio device option paeg-per-vq docs/formatdomain.rst | 9 +++++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 16 ++++++++ src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 7 ++++ src/qemu/qemu_capabilities.c | 6 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 ++ src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_validate.c | 8 ++++ .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../virtio-options-controller-page_per_vq.err | 1 + ...-controller-page_per_vq.x86_64-latest.args | 37 ++++++++++++++++++ .../virtio-options-controller-page_per_vq.xml | 38 ++++++++++++++++++ .../virtio-options-disk-page_per_vq.err | 1 + ...ptions-disk-page_per_vq.x86_64-latest.args | 39 +++++++++++++++++++ .../virtio-options-disk-page_per_vq.xml | 34 ++++++++++++++++ .../virtio-options-fs-page_per_vq.err | 1 + ...-options-fs-page_per_vq.x86_64-latest.args | 37 ++++++++++++++++++ .../virtio-options-fs-page_per_vq.xml | 34 ++++++++++++++++ .../virtio-options-input-page_per_vq.err | 1 + ...tions-input-page_per_vq.x86_64-latest.args | 35 +++++++++++++++++ .../virtio-options-input-page_per_vq.xml | 30 ++++++++++++++ .../virtio-options-memballoon-page_per_vq.err | 1 + ...-memballoon-page_per_vq.x86_64-latest.args | 33 ++++++++++++++++ .../virtio-options-memballoon-page_per_vq.xml | 23 +++++++++++ .../virtio-options-net-page_per_vq.err | 1 + ...options-net-page_per_vq.x86_64-latest.args | 37 ++++++++++++++++++ .../virtio-options-net-page_per_vq.xml | 34 ++++++++++++++++ .../virtio-options-rng-page_per_vq.err | 1 + ...options-rng-page_per_vq.x86_64-latest.args | 37 ++++++++++++++++++ .../virtio-options-rng-page_per_vq.xml | 32 +++++++++++++++ .../virtio-options-video-page_per_vq.err | 1 + ...tions-video-page_per_vq.x86_64-latest.args | 37 ++++++++++++++++++ .../virtio-options-video-page_per_vq.xml | 36 +++++++++++++++++ .../virtio-options.x86_64-latest.args | 26 ++++++------- tests/qemuxml2argvdata/virtio-options.xml | 26 ++++++------- tests/qemuxml2argvtest.c | 22 +++++++++++ 73 files changed, 704 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-options-controller-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-options-disk-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-options-fs-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-input-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-input-page_per_vq.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-options-input-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-net-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-net-page_per_vq.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-options-net-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-options-rng-page_per_vq.xml create mode 100644 tests/qemuxml2argvdata/virtio-options-video-page_per_vq.err create mode 100644 tests/qemuxml2argvdata/virtio-options-video-page_per_vq.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-options-video-page_per_vq.xml -- 2.31.1

3 10

[PATCH v2 0/7] qemu: capabilities: Remove QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE
by Peter Krempa 12 Oct '21

12 Oct '21

After a review from Jano I set out to fix also the test invocations to use real capabilities. This has shown that there was a bug in the validation logic which was pointed out by Jano in the output error file change. This version fixes the bug, improves testing and then removes the useless capability. Peter Krempa (7): qemuValidateDomainDefPCIFeature: un-break error messages qemuValidateDomainDefPCIFeature: Fix validation logic qemuxml2argvtest: Use real-caps testing for 'pc-i440fx-acpi-root-hotplug-disable' qemuxml2argvtest: Use real-caps testing for 'acpi-hotplug-bridge-disable' qemuxml2argvtest: Add '-enable' variants for ACPI-hotplug related cases qemuxml2xmltest: Convert all acpi-hotplug control related tests to DO_TEST_CAPS_LATEST qemu: capabilities: Remove QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE src/qemu/qemu_capabilities.c | 2 - src/qemu/qemu_capabilities.h | 1 - src/qemu/qemu_command.c | 3 +- src/qemu/qemu_validate.c | 15 ++---- .../caps_2.11.0.x86_64.xml | 1 - .../caps_2.12.0.x86_64.xml | 1 - .../caps_3.0.0.x86_64.xml | 1 - .../caps_3.1.0.x86_64.xml | 1 - .../caps_4.0.0.x86_64.xml | 1 - .../caps_4.1.0.x86_64.xml | 1 - .../caps_4.2.0.x86_64.xml | 1 - .../caps_5.0.0.x86_64.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.x86_64.xml | 1 - .../caps_6.0.0.x86_64.xml | 1 - .../caps_6.1.0.x86_64.xml | 1 - ...-hotplug-bridge-disable.aarch64-latest.err | 1 + .../aarch64-acpi-hotplug-bridge-disable.err | 1 - ...hotplug-bridge-disable.x86_64-latest.args} | 15 +++--- ...i-hotplug-bridge-enable.x86_64-latest.args | 34 ++++++++++++ ...cpi-root-hotplug-disable.x86_64-5.1.0.err} | 0 ...i-root-hotplug-disable.x86_64-latest.args} | 15 +++--- ...-acpi-root-hotplug-enable.x86_64-5.1.0.err | 1 + ...cpi-root-hotplug-enable.x86_64-latest.args | 34 ++++++++++++ ...i-hotplug-bridge-disable.x86_64-6.0.0.err} | 0 ...hotplug-bridge-disable.x86_64-latest.args} | 14 +++-- ...pi-hotplug-bridge-enable.x86_64-6.0.0.err} | 0 ...i-hotplug-bridge-enable.x86_64-latest.args | 37 +++++++++++++ tests/qemuxml2argvtest.c | 27 ++++------ ...i-hotplug-bridge-disable.x86_64-latest.xml | 36 +++++++++++++ .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 1 - ...pi-hotplug-bridge-enable.x86_64-latest.xml | 36 +++++++++++++ .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 1 - ...cpi-root-hotplug-disable.x86_64-latest.xml | 33 ++++++++++++ .../pc-i440fx-acpi-root-hotplug-disable.xml | 1 - ...acpi-root-hotplug-enable.x86_64-latest.xml | 33 ++++++++++++ .../pc-i440fx-acpi-root-hotplug-enable.xml | 1 - ...i-hotplug-bridge-disable.x86_64-latest.xml | 53 +++++++++++++++++++ .../q35-acpi-hotplug-bridge-disable.xml | 1 - ...pi-hotplug-bridge-enable.x86_64-latest.xml | 53 +++++++++++++++++++ .../q35-acpi-hotplug-bridge-enable.xml | 1 - tests/qemuxml2xmltest.c | 24 +++------ 42 files changed, 401 insertions(+), 85 deletions(-) create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err delete mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err rename tests/qemuxml2argvdata/{pc-i440fx-acpi-hotplug-bridge-disable.args => pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.args} (55%) create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.args rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.err => pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err} (100%) rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.args => pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args} (55%) create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args rename tests/qemuxml2argvdata/{pc-i440fx-acpi-hotplug-bridge-disable.err => q35-acpi-hotplug-bridge-disable.x86_64-6.0.0.err} (100%) rename tests/qemuxml2argvdata/{q35-acpi-hotplug-bridge-disable.args => q35-acpi-hotplug-bridge-disable.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{q35-acpi-hotplug-bridge-disable.err => q35-acpi-hotplug-bridge-enable.x86_64-6.0.0.err} (100%) create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.args create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml create mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml -- 2.31.1

3 11

set custom loglevel for external libraries
by Olaf Hering 11 Oct '21

11 Oct '21

In src/libxl/libxl_conf.c:libxlDriverConfigInit, virLogGetDefaultPriority is used to specify the (private) loglevel of an external library. This value could be controlled via "log_level=N" in libvirtd.conf. But doing it that way will affect libvirtd itself, instead of libxenlight.so as intended. There might be ways to suppress everything but libxl output via "log_filters=", but it is not clear what the syntax would be. I wonder what the preferred way is to specify the desired loglevel for the external library. It seems a separate configuration setting is required so that each value of XTL_* from xentoollog.h can be specified. Olaf

3 11

[PATCH 000/103] qemu: Type-aware generation of properties for -device (part 1)
by Peter Krempa 11 Oct '21

11 Oct '21

This series converts our generation of -device to JSON. This allows to use proper types when talking on QMP which will become mandatory in qemu soon (for now we coverted _everything_ to strings) and also use JSON on the commandline which will be the only "stable" interface. Part 1 consists of cleanups and conversion of all devices which can be hotplugged and most others. There are few other missing along with preparation for schema validation which will come in part 2. The patches can be fetched at: git fetch https://gitlab.com/pipo.sk/libvirt.git jsonify-refactors-2 Peter Krempa (103): virJSONValueObjectAddVArgs: Add 'k' convertor for formatting non-negative integers virJSONValueObjectAddVArgs: Add check for presence of the ':' separator virJSONValueObjectAddVArgs: Add new convertors for allocated strings qemuBuildMemoryCellBackendStr: Return JSON props instead of a buffer qemuBuildInputDevStr: Don't mix generators for -object and -device qemuBuildObjectCommandlineFromJSON: Format directly into the virCommand qemu: capabilities: Rename QEMU_CAPS_OBJECT_QAPIFIED to QEMU_CAPS_OBJECT_JSON qemu: capabilities: Introduce QEMU_CAPS_NETDEV_JSON qemuBuildObjectCommandlineFromJSON: Remove checks for 'type' and 'alias' testCompareXMLToArgvValidateSchema: Base -netdev validation on JSON qemu: command: Format netdev as JSON when QEMU_CAPS_NETDEV_JSON is present virQEMUBuildNetdevCommandlineFromJSON: Remove unused formatter qemu: Remove 'qemuBuildCommandLineFlags' and associated code virQEMUBuildDriveCommandlineFromJSON: Open-code in callers qemuxml2argvtest: Refactor QAPI schema validation code virCommandGetArgList: Remove 'nargs' argument qemu: capabilities: Introduce QEMU_CAPS_CHARDEV_JSON qemu: capabilities: Introduce QEMU_CAPS_DEVICE_JSON tests: qemuxml2argv: Convert watchdog tests on x86_64 to DO_TEST_CAPS_LATEST tests: qemuxml2argv: Test also the i6300esb watchdog qemuxml2argvtest: Convert 'panic' test cases to DO_TEST_CAPS_LATEST qemuxml2xmltest: Remove 'panic-isa' case qemu: Move watchdog model validation into the validation code qemuDomainHotplugAddVcpu: Refactor cleanup qemu: Rename 'qemuMonitorAddDeviceArgs' to 'qemuMonitorAddDeviceProps' qemuMonitorJSONAddDeviceProps: Refactor cleanup virQEMUBuildCommandLineJSONIterate: Simplify logic virQEMUBuildCommandLineJSONRecurse: Error out when array conversion function is not provided qemuBlockStorageSourceAttachRollback: Sanitize warning messages qemuBuildDeviceAddressSt: Split out formatting of PCI address qemuBuildDeviceAddressPCIStr: Make error messages easier to find qemuBuildDeviceAddressPCIStr: Extract PCI bus name lookup qemu: command: Introduce JSON equivalent of qemuBuildDeviceAddressStr qemuBuildVirtioDevStr: Don't return early qemuBuildVirtioDevStr: Extract code for determining device model qemuBuildVirtioDevGetConfig: Split out per device type code qemuDeviceVideoGetModel: Clarify 'virtio' argument qemuDeviceVideoGetModel: Move to the beginning qemuBuildVirtioDevGetConfig: Split up formatting of bus suffix qemuBuildVirtioDevGetConfigDev: Provide more information qemuBuildVirtioDevStr: Remove 'baseName' argument qemuBuildVirtioDevStr: Format also virtioOptions qemuBuildVirtioOptionsStr: Remove empty function qemuBuildDeviceVideoStr: Properly format virtio options for 'virtio-vga' conf: Introduce 'effectiveBootIndex' into 'virDomainDeviceInfo' qemu: process: Make qemuProcessPrepareDomainDiskBootorder more universal qemu: Use 'effectiveBootIndex' to handle <os><boot dev='network'> qemu: Clean up after old-style passing of 'bootIndex' to network devices virDomainDeviceGetInfo: Make argument const qemuValidateDomainDeviceDef: Optimize virDomainDeviceInfo validation qemuValidateDomainDeviceDef: Avoid unneded variable and 'break' statements qemu: validate: Move validation of device rom qemu: command: Introduce JSON variant of qemuBuildVirtioDevStr qemu: command: Introduce helper for building JSON props of -device into commandline qemu: command: Introduce JSON variant of qemuBuildRomProps qemuBuildPanicCommandLine: Generate via JSON qemuBuildWatchdogCommandLine: Generate via JSON qemuBuildMemoryDeviceCommandLine: Generate via JSON qemuBuildShmemCommandLine: Generate via JSON qemuBuildMemballoonCommandLine: Generate via JSON qemuBuildMemballoonCommandLine: Reorder properties qemuBuildRNGCommandLine: Generate via JSON qemuBuildHostdevCommandLine: Build mediated device commandline via JSON qemuBuildHostdevMediatedDevProps: Move 'ramfb' and 'bootindex' before the address qemuBuildHostdevMediatedDevProps: Format USB host devices via JSON qemuBuildRedirdevCommandLine: Generate via JSON qemuBuildInputCommandLine: Generate via JSON qemuCommandAddExtDevice: Generate via JSON qemuBuildHostdevCommandLine: Format PCI host devices via JSON qemuBuildPCIHostdevDevProps: Move 'failover_pair_id' property before address qemuBuildDeviceAddressProps: Format also 'drive' addresses qemu: validate: Move disk address validation code qemuBuildHostdevSCSICommandLine: Generate via JSON qemuBuildSCSIHostdevDevProps: Reorder 'drive','id' and 'bootindex' after address qemuBuildIoEventFdStr: Always assume support for QEMU_CAPS_VIRTIO_IOEVENTFD qemu: capabilities: Retire QEMU_CAPS_VIRTIO_IOEVENTFD qemu: Always assume presence of QEMU_CAPS_VIRTIO_(BLK|NET)_EVENT_IDX qemu: capabilities: Retire QEMU_CAPS_VIRTIO_(BLK|NET)_EVENT_IDX qemuBuildDiskFrontendAttributeErrorPolicy: Extract logic qemuBuildDiskCommandLine: Generate via JSON qemuBuildInterfaceCommandLine: Generate via JSON qemuBuildNicDevProps: Move formatting of bootindex qemu: command: Remove unused qemuBuildRomStr qemuBuildControllerDevStr: Split out formatting of SCSI controller qemuBuildControllerDevStr: Split out formatting of PCI controller qemuBuildControllerSCSIDevStr: Format via JSON properties qemuBuildControllerPCIDevStr: Format via JSON properties qemuBuildUSBControllerDevStr: Split out validation of USB controller qemuBuildUSBControllerDevStr: Format via JSON properties. qemuBuildControllersByTypeCommandLine: Generate via JSON qemuBuildChrDeviceCommandLine: Generate via JSON qemuBuildHostdevCommandLine: Generate via JSON qemuBuildVsockCommandLine: Generate via JSON qemu: monitor: Remove legacy 'device_add' infrastrcture qemuBuildVHostUserFsCommandLine: Generate via JSON qemuBuildFSDevCommandLine: Generate via JSON qemuBuildVideoCommandLine: Generate via JSON qemu: Command remove unused 'qemuBuildVirtioDevStr' qemuBuildSoundCommandLine: Generate via JSON qemuBuildSoundCommandLine: Generate codecs via JSON qemuBuildHubCommandLine: Generate via JSON qemuBuildTPMCommandLine: Generate via JSON qemu: command: Remove unused 'qemuBuildDeviceAddressStr' src/conf/device_conf.h | 7 + src/conf/domain_conf.c | 8 +- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 3 +- src/qemu/qemu_block.c | 6 +- src/qemu/qemu_capabilities.c | 20 +- src/qemu/qemu_capabilities.h | 13 +- src/qemu/qemu_command.c | 3981 +++++++++-------- src/qemu/qemu_command.h | 151 +- src/qemu/qemu_domain.h | 4 - src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 235 +- src/qemu/qemu_monitor.c | 49 +- src/qemu/qemu_monitor.h | 11 +- src/qemu/qemu_monitor_json.c | 175 +- src/qemu/qemu_monitor_json.h | 6 +- src/qemu/qemu_process.c | 61 +- src/qemu/qemu_process.h | 3 +- src/qemu/qemu_validate.c | 367 +- src/util/vircommand.c | 4 +- src/util/vircommand.h | 2 +- src/util/virjson.c | 93 +- src/util/virqemu.c | 71 +- src/util/virqemu.h | 10 +- .../caps_2.11.0.s390x.xml | 3 - .../caps_2.11.0.x86_64.xml | 3 - .../caps_2.12.0.aarch64.xml | 3 - .../caps_2.12.0.ppc64.xml | 3 - .../caps_2.12.0.s390x.xml | 3 - .../caps_2.12.0.x86_64.xml | 3 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 - .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 3 - .../caps_3.0.0.x86_64.xml | 3 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 3 - .../caps_3.1.0.x86_64.xml | 3 - .../caps_4.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 3 - .../caps_4.0.0.riscv32.xml | 3 - .../caps_4.0.0.riscv64.xml | 3 - .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 3 - .../caps_4.0.0.x86_64.xml | 3 - .../caps_4.1.0.x86_64.xml | 3 - .../caps_4.2.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 3 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 3 - .../caps_4.2.0.x86_64.xml | 3 - .../caps_5.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 3 - .../caps_5.0.0.riscv64.xml | 3 - .../caps_5.0.0.x86_64.xml | 3 - .../caps_5.1.0.x86_64.xml | 3 - .../caps_5.2.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 3 - .../caps_5.2.0.riscv64.xml | 3 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 3 - .../caps_5.2.0.x86_64.xml | 3 - .../caps_6.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 3 - .../caps_6.0.0.x86_64.xml | 3 - .../caps_6.1.0.x86_64.xml | 3 - tests/qemumonitorjsontest.c | 2 - ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 4 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 4 +- .../qemuxml2argvdata/aarch64-pci-serial.args | 2 +- .../aarch64-traditional-pci.args | 4 +- .../aarch64-video-default.args | 2 +- .../aarch64-video-virtio-gpu-pci.args | 6 +- .../aarch64-virt-2.6-virtio-pci-default.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 16 +- .../aarch64-virt-headless.aarch64-latest.args | 14 +- .../aarch64-virtio-pci-default.args | 12 +- tests/qemuxml2argvdata/autoindex.args | 22 +- .../qemuxml2argvdata/balloon-ccw-deflate.args | 2 +- .../balloon-device-deflate-off.args | 2 +- .../balloon-device-deflate.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/boot-complex.args | 2 +- tests/qemuxml2argvdata/boot-order.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-model.x86_64-2.11.0.args | 6 +- .../cpu-host-model.x86_64-2.12.0.args | 6 +- .../cpu-host-model.x86_64-3.0.0.args | 6 +- .../cpu-host-model.x86_64-3.1.0.args | 6 +- .../cpu-host-model.x86_64-4.0.0.args | 6 +- .../cpu-host-model.x86_64-4.1.0.args | 6 +- .../cpu-host-model.x86_64-4.2.0.args | 6 +- .../cpu-host-model.x86_64-5.0.0.args | 6 +- .../cpu-host-model.x86_64-5.1.0.args | 6 +- .../cpu-host-model.x86_64-5.2.0.args | 6 +- .../cpu-host-model.x86_64-6.0.0.args | 6 +- .../cpu-host-model.x86_64-6.1.0.args | 6 +- .../cpu-host-model.x86_64-latest.args | 6 +- ...ult-video-type-aarch64.aarch64-latest.args | 4 +- ...ult-video-type-riscv64.riscv64-latest.args | 4 +- .../disk-floppy-q35-2_11.x86_64-2.12.0.args | 4 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 4 +- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 4 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 4 +- .../disk-ide-wwn.x86_64-latest.args | 2 +- .../disk-scsi-disk-wwn.x86_64-latest.args | 4 +- .../disk-scsi.x86_64-latest.args | 4 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 2 +- .../hostdev-scsi-lsi.x86_64-4.1.0.args | 12 +- .../hostdev-scsi-lsi.x86_64-latest.args | 12 +- .../hostdev-scsi-vhost-scsi-pcie.args | 4 +- ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 14 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 14 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 2 +- .../mach-virt-serial-pci.args | 2 +- .../mach-virt-serial-usb.args | 4 +- ...ine-loadparm-multiple-disks-nets-s390.args | 2 +- .../machine-loadparm-net-s390.args | 2 +- tests/qemuxml2argvdata/machine-smm-opt.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- .../net-virtio-teaming-hostdev.args | 4 +- .../qemuxml2argvdata/net-virtio-teaming.args | 4 +- .../os-firmware-bios.x86_64-latest.args | 2 +- ...re-efi-no-enrolled-keys.x86_64-latest.args | 4 +- ...os-firmware-efi-secboot.x86_64-latest.args | 2 +- .../os-firmware-efi.x86_64-latest.args | 2 +- ...e.args => panic-double.x86_64-latest.args} | 16 +- tests/qemuxml2argvdata/panic-isa.xml | 33 - tests/qemuxml2argvdata/panic-no-address.args | 33 - .../panic-no-address.x86_64-latest.args | 37 + tests/qemuxml2argvdata/panic.args | 33 - .../qemuxml2argvdata/panic.x86_64-latest.args | 37 + tests/qemuxml2argvdata/pcie-expander-bus.args | 66 +- .../pcie-root-port-model-generic.args | 6 +- .../pcie-root-port-model-ioh3420.args | 4 +- ...cie-root-port-nohotplug.x86_64-latest.args | 14 +- tests/qemuxml2argvdata/pcie-root-port.args | 4 +- .../pcie-switch-downstream-port.args | 16 +- .../pcie-switch-upstream-port.args | 4 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 2 +- tests/qemuxml2argvdata/pseries-basic.args | 2 +- .../pseries-cpu-compat-power9.args | 2 +- .../qemuxml2argvdata/pseries-cpu-compat.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +- .../pseries-panic-missing.args | 2 +- .../pseries-panic-no-address.args | 2 +- .../pseries-serial-native.args | 2 +- .../qemuxml2argvdata/pseries-usb-default.args | 2 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +- .../pseries-vio-user-assigned.args | 8 +- tests/qemuxml2argvdata/pseries-vio.args | 8 +- .../q35-default-devices-only.args | 6 +- tests/qemuxml2argvdata/q35-multifunction.args | 36 +- .../q35-pci-force-address.args | 2 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 28 +- tests/qemuxml2argvdata/q35-pcie.args | 26 +- .../q35-pm-disable-fallback.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable.args | 2 +- .../q35-virt-manager-basic.args | 12 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 26 +- .../riscv64-virt-graphics.riscv64-latest.args | 16 +- .../riscv64-virt-headless.riscv64-latest.args | 14 +- .../qemuxml2argvdata/s390-panic-missing.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- .../tpm-emulator-spapr.ppc64-latest.args | 10 +- .../tseg-explicit-size.x86_64-latest.args | 6 +- ...sb-controller-explicit-unavailable-q35.err | 2 +- .../usb-controller-qemu-xhci-unavailable.err | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 8 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 2 +- ...eo-bochs-display-device.x86_64-latest.args | 2 +- .../virtio-non-transitional.x86_64-3.1.0.args | 22 +- ...virtio-non-transitional.x86_64-latest.args | 22 +- ...-options-controller-ats.x86_64-latest.args | 4 +- ...ptions-controller-iommu.x86_64-latest.args | 4 +- ...tions-controller-packed.x86_64-latest.args | 4 +- .../virtio-options-fs-ats.x86_64-latest.args | 4 +- ...virtio-options-fs-iommu.x86_64-latest.args | 4 +- ...irtio-options-fs-packed.x86_64-latest.args | 4 +- ...irtio-options-input-ats.x86_64-latest.args | 4 +- ...tio-options-input-iommu.x86_64-latest.args | 4 +- ...io-options-input-packed.x86_64-latest.args | 4 +- ...-options-memballoon-ats.x86_64-latest.args | 2 +- ...loon-freepage-reporting.x86_64-latest.args | 2 +- ...ptions-memballoon-iommu.x86_64-latest.args | 2 +- ...tions-memballoon-packed.x86_64-latest.args | 2 +- .../virtio-options-net-ats.x86_64-latest.args | 4 +- ...irtio-options-net-iommu.x86_64-latest.args | 4 +- ...rtio-options-net-packed.x86_64-latest.args | 4 +- .../virtio-options-rng-ats.x86_64-latest.args | 4 +- ...irtio-options-rng-iommu.x86_64-latest.args | 4 +- ...rtio-options-rng-packed.x86_64-latest.args | 4 +- ...irtio-options-video-ats.x86_64-latest.args | 4 +- ...tio-options-video-iommu.x86_64-latest.args | 4 +- ...io-options-video-packed.x86_64-latest.args | 4 +- .../virtio-options.x86_64-latest.args | 22 +- .../virtio-transitional.x86_64-3.1.0.args | 4 +- .../virtio-transitional.x86_64-latest.args | 4 +- tests/qemuxml2argvdata/watchdog-device.args | 34 - .../watchdog-device.x86_64-latest.args | 38 + tests/qemuxml2argvdata/watchdog-device.xml | 2 +- tests/qemuxml2argvdata/watchdog-dump.args | 34 - .../watchdog-dump.x86_64-latest.args | 38 + .../qemuxml2argvdata/watchdog-injectnmi.args | 34 - .../watchdog-injectnmi.x86_64-latest.args | 38 + tests/qemuxml2argvdata/watchdog.args | 33 - .../watchdog.x86_64-latest.args | 37 + ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 8 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 8 +- .../x86_64-q35-graphics.x86_64-latest.args | 14 +- .../x86_64-q35-headless.x86_64-latest.args | 14 +- tests/qemuxml2argvtest.c | 155 +- tests/qemuxml2xmltest.c | 1 - 218 files changed, 3425 insertions(+), 3484 deletions(-) rename tests/qemuxml2argvdata/{panic-double.args => panic-double.x86_64-latest.args} (52%) delete mode 100644 tests/qemuxml2argvdata/panic-isa.xml delete mode 100644 tests/qemuxml2argvdata/panic-no-address.args create mode 100644 tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/panic.args create mode 100644 tests/qemuxml2argvdata/panic.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/watchdog-device.args create mode 100644 tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/watchdog-dump.args create mode 100644 tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/watchdog-injectnmi.args create mode 100644 tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/watchdog.args create mode 100644 tests/qemuxml2argvdata/watchdog.x86_64-latest.args -- 2.31.1

3 211

[PATCH v2 00/10] qemu: Fix image labels lost after migration with shared fs
by Peng Liang 11 Oct '21

11 Oct '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-August/msg00698.html When migrating using shared fs, the dst host will remember the image labels again before launching the VM and the src host will remove the image labels after migration. It leads to that the image labels lost after migration. Patch 8-10 are the real fix patches. v1 -> v2: 1. fix check of virFileIsSharedFS in patch10 (patch9 in v1) [Michal] 2. add implementation of SELinux (patch5, 7, 8) [Michal] Peng Liang (10): security: add virSecurityUpdateTimestampIfexists security: add virSecurityManagerUpdateImageLabel security: implement domainUpdateSecurityImageLabel for stack security: implement domainUpdateSecurityImageLabel for DAC security: implement domainUpdateSecurityImageLabel for SELinux qemu: add qemuSecurityUpdateImageLabel security: rename 2 functions in DAC and SELinux security: don't remember image labels when migrating with shared fs migration: don't remove image labels after migration migration: update image labels in dst after migration src/libvirt_private.syms | 1 + src/qemu/qemu_migration.c | 12 +++++++ src/qemu/qemu_process.c | 5 ++- src/qemu/qemu_security.c | 10 ++++++ src/qemu/qemu_security.h | 5 +++ src/security/security_dac.c | 58 ++++++++++++++++++++++++-------- src/security/security_driver.h | 5 +++ src/security/security_manager.c | 29 ++++++++++++++++ src/security/security_manager.h | 5 +++ src/security/security_selinux.c | 59 +++++++++++++++++++++++++-------- src/security/security_stack.c | 20 +++++++++++ src/security/security_util.c | 32 ++++++++++++++++++ src/security/security_util.h | 4 +++ 13 files changed, 218 insertions(+), 27 deletions(-) -- 2.31.1

1 10

[PATCH] qemu: capabilities: Remove QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE
by Peter Krempa 11 Oct '21

11 Oct '21

Commit 58ba0f6a3d7342fba29edbbf2bb9cb5497c870e5 added a capability which is supported by all qemu versions we support. Remove it and the associated dead code. Since the capability isn't present in any upstream release we can delete it completely. Specifically the commit itself states that it was introduced "around (qemu) 2.1". The rest of the code handles properly that the feature is used only on x86 with the i440fx machine so the capability is pointless. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 -- src/qemu/qemu_capabilities.h | 1 - src/qemu/qemu_command.c | 3 +-- src/qemu/qemu_validate.c | 14 +------------- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - .../pc-i440fx-acpi-hotplug-bridge-disable.err | 1 - .../q35-acpi-hotplug-bridge-disable.err | 2 +- tests/qemuxml2argvtest.c | 4 +--- tests/qemuxml2xmltest.c | 6 ++---- 20 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c4d0e1858c..e95a44517e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -644,7 +644,6 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio-mem-pci", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI */ "memory-backend-file.reserve", /* QEMU_CAPS_MEMORY_BACKEND_RESERVE */ "piix4.acpi-root-pci-hotplug", /* QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG */ - "piix4.acpi-hotplug-bridge", /* QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE */ "ich9.acpi-hotplug-bridge", /* QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE */ ); @@ -1474,7 +1473,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = { { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3, NULL }, { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4, NULL }, { "acpi-root-pci-hotplug", QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG, NULL }, - { "acpi-pci-hotplug-with-bridge-support", QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e9bd6c8885..92337d2503 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -624,7 +624,6 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI, /* -device virtio-mem-pci */ QEMU_CAPS_MEMORY_BACKEND_RESERVE, /* -object memory-backend-*.reserve= */ QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG, /* -M pc PIIX4_PM.acpi-root-pci-hotplug */ - QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE, /* -M pc PIIX4_PM.acpi-pci-hotplug-with-bridge-support */ QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE, /* -M q35 ICH9-LPC.acpi-pci-hotplug-with-bridge-support */ QEMU_CAPS_LAST /* this must always be the last item */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 995b294736..5b7a3e5bc3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6151,8 +6151,7 @@ qemuBuildPMCommandLine(virCommand *cmd, if (acpihp_br != VIR_TRISTATE_SWITCH_ABSENT) { const char *pm_object = NULL; - if (!qemuDomainIsQ35(def) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE)) + if (!qemuDomainIsQ35(def)) pm_object = "PIIX4_PM"; if (qemuDomainIsQ35(def) && diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index be609c9d39..3e573faa4d 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -175,13 +175,9 @@ qemuValidateDomainDefPSeriesFeature(const virDomainDef *def, static int qemuValidateDomainDefPCIFeature(const virDomainDef *def, - virQEMUCaps *qemuCaps, int feature) { size_t i; - bool q35Dom = qemuDomainIsQ35(def); - bool q35cap = q35Dom && virQEMUCapsGet(qemuCaps, - QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE); if (def->features[feature] == VIR_TRISTATE_SWITCH_ABSENT) return 0; @@ -199,14 +195,6 @@ qemuValidateDomainDefPCIFeature(const virDomainDef *def, virArchToString(def->os.arch)); return -1; } - if (!q35cap && - !virQEMUCapsGet(qemuCaps, - QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("acpi-bridge-hotplug is not available " - "with this QEMU binary")); - return -1; - } break; case VIR_DOMAIN_PCI_LAST: @@ -337,7 +325,7 @@ qemuValidateDomainDefFeatures(const virDomainDef *def, break; case VIR_DOMAIN_FEATURE_PCI: - if (qemuValidateDomainDefPCIFeature(def, qemuCaps, i) < 0) + if (qemuValidateDomainDefPCIFeature(def, i) < 0) return -1; break; case VIR_DOMAIN_FEATURE_SMM: diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 65bfe911dd..d6549d6440 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -172,7 +172,6 @@ <flag name='am53c974'/> <flag name='cpu-max'/> <flag name='input-linux'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>2011000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100288</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index e4d936886b..354a95cebc 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -184,7 +184,6 @@ <flag name='cpu-max'/> <flag name='input-linux'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index b903fbe403..cffe482bf6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -190,7 +190,6 @@ <flag name='cpu-max'/> <flag name='input-linux'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 143edb4e52..514e5985ac 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -194,7 +194,6 @@ <flag name='input-linux'/> <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>3000092</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 936726939d..5e733fec13 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -202,7 +202,6 @@ <flag name='input-linux'/> <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 742e71e4ae..ba9ee0dd96 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -209,7 +209,6 @@ <flag name='input-linux'/> <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>4001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 52d0acef3d..034a770b08 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -220,7 +220,6 @@ <flag name='input-linux'/> <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>4002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index ccd7e53ea8..aae5fe018f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -227,7 +227,6 @@ <flag name='input-linux'/> <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>5000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 267a3acd9d..e9ae3c5abb 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -230,7 +230,6 @@ <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>5001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 2be17f0e45..98b5f34f2b 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -232,7 +232,6 @@ <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> <flag name='piix4.acpi-root-pci-hotplug'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>5002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 9070eb85aa..f13a909314 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -240,7 +240,6 @@ <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> <flag name='piix4.acpi-root-pci-hotplug'/> - <flag name='piix4.acpi-hotplug-bridge'/> <version>6000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 01833aff4b..9c9f17a83d 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -243,7 +243,6 @@ <flag name='virtio-mem-pci'/> <flag name='memory-backend-file.reserve'/> <flag name='piix4.acpi-root-pci-hotplug'/> - <flag name='piix4.acpi-hotplug-bridge'/> <flag name='ich9.acpi-hotplug-bridge'/> <version>6001000</version> <kvmVersion>0</kvmVersion> diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err deleted file mode 100644 index 8c09a3cd76..0000000000 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: acpi-bridge-hotplug is not available with this QEMU binary diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err index 8c09a3cd76..03c57b805d 100644 --- a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err +++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err @@ -1 +1 @@ -unsupported configuration: acpi-bridge-hotplug is not available with this QEMU binary +unsupported configuration: The 'i82801b11-bridge' device is not supported by this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 116ba714eb..b2a5c58bae 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2570,10 +2570,8 @@ mymain(void) DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE); + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE); DO_TEST_PARSE_ERROR_NOCAPS("q35-acpi-hotplug-bridge-disable"); - DO_TEST_PARSE_ERROR_NOCAPS("pc-i440fx-acpi-hotplug-bridge-disable"); /* verify that we fail when acpi-bridge-hotplug option is specified for * archs other than x86 */ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2e622c002f..ba2d9652cd 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -428,10 +428,8 @@ mymain(void) QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG); DO_TEST("pc-i440fx-acpi-root-hotplug-enable", QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG); - DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable", - QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE); - DO_TEST("pc-i440fx-acpi-hotplug-bridge-enable", - QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE); + DO_TEST_NOCAPS("pc-i440fx-acpi-hotplug-bridge-disable"); + DO_TEST_NOCAPS("pc-i440fx-acpi-hotplug-bridge-enable"); DO_TEST("q35-acpi-hotplug-bridge-disable", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, -- 2.31.1

2 2

[libvirt PATCH 0/5] Add virCPUDataIsIdentical
by Tim Wiederhake 11 Oct '21

11 Oct '21

A function to compare two `virCPUData` objects. This is a prerequisite for a later series, that will add the host's cpuid information to the cpu flag cache as per [1], to solve BZ 1953389 [2]. [1] https://listman.redhat.com/archives/libvir-list/2021-August/msg00293.html [2] https://bugzilla.redhat.com/show_bug.cgi?id=1953389 Tim Wiederhake (5): cpu_arm: No need to protect macro definitions cpu: Add virCPUDataIsIdentical cpu_x86: Implement virCPUDataIsIdentical for x86 cpu_arm: Implement virCPUDataIsIdentical for arm cpu_ppc64: Implement virCPUDataIsIdentical for ppc64 src/cpu/cpu.c | 29 +++++++++++++++++ src/cpu/cpu.h | 9 ++++++ src/cpu/cpu_arm.c | 34 +++++++++++++++++--- src/cpu/cpu_ppc64.c | 26 +++++++++++++++ src/cpu/cpu_x86.c | 69 ++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + 6 files changed, 164 insertions(+), 4 deletions(-) -- 2.31.1

1 5

[libvirt PATCH 00/21] qemu: Implement virtio-iommu support
by Andrea Bolognani 11 Oct '21

11 Oct '21

The first couple of patches add replies files and as such have been aggressively snipped to deal with mailing list message size limits. Grab the unabriged version with $ git fetch https://gitlab.com/abologna/libvirt.git virtio-iommu As noted in those patches, some of the QEMU changes this series depends on have not yet been accepted upstream: the relevant patches are https://lists.gnu.org/archive/html/qemu-devel/2021-10/msg00161.html https://lists.gnu.org/archive/html/qemu-devel/2021-09/msg07819.html and of course this series should only be merged once those have gone in. Andrea Bolognani (21): DONOTMERGEYET: Add replies for QEMU 6.2.0 on x86_64 DONOTMERGEYET: Add replies for QEMU 6.2.0 on aarch64 conf: Make virDomainDeviceInfoFormat() const correct conf: Introduce VIR_PCI_CONNECT_INTEGRATED conf: Add IOMMU support to virDomainDeviceDefCopy() conf: Add new/free functions for virDomainIOMMUDef qemu: Tweak some code qemu: Introduce QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI qemu: Introduce QEMU_CAPS_VIRTIO_IOMMU_BOOT_BYPASS conf: Introduce virtio model for <iommu> tests: Add test cases for virtio-iommu qemu: Validate machine type used with virtio-iommu qemu: Validate capabilities for virtio-iommu qemu: Validate use of ACPI with virtio-iommu conf: Add virDomainDeviceInfo to virDomainIOMMUDef qemu: Assign PCI address to virtio-iommu qemu: Validate address type for virtio-iommu tests: Add test for virtio-iommu address qemu: Generate command line for virtio-iommu docs: Document virtio-iommu news: Document virtio-iommu NEWS.rst | 4 + docs/formatdomain.rst | 5 +- docs/schemas/domaincommon.rng | 64 +- src/conf/domain_addr.c | 21 +- src/conf/domain_addr.h | 30 +- src/conf/domain_conf.c | 74 +- src/conf/domain_conf.h | 5 + src/qemu/qemu_capabilities.c | 10 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 35 +- src/qemu/qemu_domain_address.c | 33 +- src/qemu/qemu_validate.c | 32 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 220 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 226 + .../qemu_6.2.0-virt.aarch64.xml | 184 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 178 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 220 + .../caps_5.0.0.aarch64.replies | 71 +- .../caps_5.0.0.aarch64.xml | 1 + .../caps_5.0.0.ppc64.replies | 59 +- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.replies | 55 +- .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.replies | 71 +- .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.replies | 71 +- .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.replies | 71 +- .../caps_5.2.0.aarch64.xml | 1 + .../caps_5.2.0.ppc64.replies | 59 +- .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.replies | 55 +- .../caps_5.2.0.riscv64.xml | 1 + .../caps_5.2.0.s390x.replies | 59 +- .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.replies | 71 +- .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.replies | 71 +- .../caps_6.0.0.aarch64.xml | 1 + .../caps_6.0.0.s390x.replies | 59 +- .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.replies | 71 +- .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.replies | 71 +- .../caps_6.1.0.x86_64.xml | 1 + ...h64.replies => caps_6.2.0.aarch64.replies} | 5621 ++++++++++------- ...0.0.aarch64.xml => caps_6.2.0.aarch64.xml} | 57 +- ...6_64.replies => caps_6.2.0.x86_64.replies} | 4154 +++++++----- ...6.1.0.x86_64.xml => caps_6.2.0.x86_64.xml} | 85 +- .../virtio-iommu-aarch64.aarch64-latest.args | 35 + .../qemuxml2argvdata/virtio-iommu-aarch64.xml | 20 + ...mmu-invalid-address-type.x86_64-latest.err | 1 + .../virtio-iommu-invalid-address-type.xml | 20 + ...io-iommu-invalid-address.x86_64-latest.err | 1 + .../virtio-iommu-invalid-address.xml | 20 + .../virtio-iommu-no-acpi.x86_64-latest.err | 1 + .../qemuxml2argvdata/virtio-iommu-no-acpi.xml | 15 + ...rtio-iommu-wrong-machine.x86_64-latest.err | 1 + .../virtio-iommu-wrong-machine.xml | 18 + .../virtio-iommu-x86_64.x86_64-6.1.0.err | 1 + .../virtio-iommu-x86_64.x86_64-latest.args | 31 + .../qemuxml2argvdata/virtio-iommu-x86_64.xml | 18 + tests/qemuxml2argvtest.c | 7 + .../virtio-iommu-aarch64.aarch64-latest.xml | 34 + .../virtio-iommu-x86_64.x86_64-latest.xml | 36 + tests/qemuxml2xmltest.c | 2 + 66 files changed, 8192 insertions(+), 4257 deletions(-) create mode 100644 tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_6.2.0.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_6.2.0.x86_64.xml copy tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.replies => caps_6.2.0.aarch64.replies} (92%) copy tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.xml => caps_6.2.0.aarch64.xml} (92%) copy tests/qemucapabilitiesdata/{caps_6.1.0.x86_64.replies => caps_6.2.0.x86_64.replies} (96%) copy tests/qemucapabilitiesdata/{caps_6.1.0.x86_64.xml => caps_6.2.0.x86_64.xml} (97%) create mode 100644 tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-iommu-aarch64.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-no-acpi.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-no-acpi.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-wrong-machine.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-wrong-machine.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-6.1.0.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml -- 2.31.1

2 23

[PATCH] apparmor: ceph config file names
by christian.ehrhardt＠canonical.com 11 Oct '21

11 Oct '21

From: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> If running multiple [1] clusters (uncommon) the ceph config file will be derived from the cluster name. Therefore the rule to allow to read ceph config files need to be opened up slightly to allow for that condition. [1]: https://docs.ceph.com/en/mimic/rados/configuration/common/#running-multiple… Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1588576 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/apparmor/libvirt-qemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu index 4156428163..8cd76d48ec 100644 --- a/src/security/apparmor/libvirt-qemu +++ b/src/security/apparmor/libvirt-qemu @@ -199,7 +199,7 @@ /sys/class/ r, # for rbd - /etc/ceph/ceph.conf r, + /etc/ceph/*.conf r, # Various functions will need to enumerate /tmp (e.g. ceph), allow the base # dir and a few known functions like samba support. -- 2.33.0

4 3

[PATCH] libvirt qemu add rbd mirror dest in qemuDomainBlockCopyCommon
by dinglimin＠cmss.chinamobile.com 10 Oct '21

10 Oct '21

From: dinglimin <dinglimin(a)cmss.chinamobile.com> The BlockCopy command is designed to copy a chain of disk backup images to dest. For RBD external destination, before the modification, only the '--XML' parameter is supported by 'blockdev-mirror'. After the modification, the '--dest' parameter(--dest 'rbd:xxx/xxx:auth_supported=none:mon_host=xxx.xxx.xxx.xxx')can be used. Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- src/qemu/qemu_driver.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 760d30a..db15898 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14963,12 +14963,27 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, virStorageSource *mirrorBacking = NULL; g_autoptr(GHashTable) blockNamedNodeData = NULL; int rc = 0; + const char *p = NULL; /* Preliminaries: find the disk we are editing, sanity checks */ virCheckFlags(VIR_DOMAIN_BLOCK_COPY_SHALLOW | VIR_DOMAIN_BLOCK_COPY_REUSE_EXT | VIR_DOMAIN_BLOCK_COPY_TRANSIENT_JOB, -1); + /* if mirror->path contains 'rbd:' prefix, set rbd attributes */ + if (STRPREFIX(mirror->path, "rbd:")) { + mirror->format = VIR_STORAGE_FILE_RAW; + mirror->protocol = VIR_STORAGE_NET_PROTOCOL_RBD; + mirror->type = VIR_STORAGE_TYPE_NETWORK; + + p = g_strdup(mirror->path); + if (virStorageSourceParseRBDColonString(p, mirror) < 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("RBD path conversion failed")); + return -1; + } + } + if (virStorageSourceIsRelative(mirror)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("absolute path must be used as block copy target")); -- 1.8.3.1

2 2

Module/Tool/SO to convert from KVM-xml => QEMU-native?
by Ajay Garg 10 Oct '21

10 Oct '21

Hi All. Following has been done : 1. "sudo apt-get install virt-manager" Above installed all packages required for libvirt/kvm/qemu via apt, and a vm was setup successfully. Also, the vm booting works fine, when the green start-button of virt-manager is clicked. 2. Next, qemu was compiled from sources, and only and only the following was replaced, as : "sudo cp build/qemu-system-x86_64 /usr/bin/qemu-system-x86_64" 3. Now, if the green-button on the virt-manager is clicked, following error is seen : ########################################################## Please use server=on instead qemu-system-x86_64: -chardev socket,id=charmonitor,fd=31,server,nowait: warning: short-form boolean option 'nowait' deprecated Please use wait=off instead qemu-system-x86_64: -spice port=5900,addr=127.0.0.1,disable-ticketing,image-compression=off,seamless-migration=on: warning: short-form boolean option 'disable-ticketing' deprecated Please use disable-ticketing=on instead ########################################################## So, what are the minimum libvirt modules that need to be replaced, so that upon booting up, the kvm-xml is converted to qemu-native in the latest qemu-compatible format? Thanks and Regards, Ajay

1 2

[PATCH RFC 0/5] Subject: [PATCH RFC 0/5] qapi: Add feature flags to enum members
by Markus Armbruster 09 Oct '21

09 Oct '21

PATCH 1+2 add feature flags to enum members. Awkward due to an introspection design mistake; see PATCH 1 for details. Feedback welcome, in particular from management application guys. PATCH 3+4 implement policy deprecated-input={reject,crash} for enum values. Policy deprecated-output=hide is not implemented, because we can't hide a value without hiding the entire member, which is almost certainly more than the requester of this policy bargained for. Perhaps we want a new policy deprecated-output=crash to help us catch unwanted use of deprecated enum values. Thoughts? PATCH 5 puts the new feature flags to use. It makes sense only on top of Vladimir's deprecation of drive-backup. See its commit message for a reference. Based on my "[PATCH 00/22] qapi: Remove simple unions from the schema language". Based-on: Message-Id: <20210913123932.3306639-1-armbru(a)redhat.com> Markus Armbruster (5): qapi: Enable enum member introspection to show more than name qapi: Add feature flags to enum members qapi: Move compat policy from QObject to generic visitor qapi: Implement deprecated-input={reject,crash} for enum values block: Deprecate transaction type drive-backup docs/devel/qapi-code-gen.rst | 4 ++- qapi/compat.json | 3 +++ qapi/introspect.json | 23 ++++++++++++++-- qapi/transaction.json | 5 +++- include/qapi/qobject-input-visitor.h | 4 --- include/qapi/qobject-output-visitor.h | 4 --- include/qapi/util.h | 6 ++++- include/qapi/visitor-impl.h | 3 +++ include/qapi/visitor.h | 9 +++++++ qapi/qapi-visit-core.c | 27 ++++++++++++++++--- qapi/qmp-dispatch.c | 4 +-- qapi/qobject-input-visitor.c | 14 +--------- qapi/qobject-output-visitor.c | 14 +--------- scripts/qapi/expr.py | 3 ++- scripts/qapi/introspect.py | 19 ++++++++++--- scripts/qapi/schema.py | 22 +++++++++++++-- scripts/qapi/types.py | 17 +++++++++++- tests/qapi-schema/doc-good.json | 5 +++- tests/qapi-schema/doc-good.out | 3 +++ tests/qapi-schema/doc-good.txt | 3 +++ .../qapi-schema/enum-dict-member-unknown.err | 2 +- tests/qapi-schema/qapi-schema-test.json | 3 ++- tests/qapi-schema/qapi-schema-test.out | 1 + tests/qapi-schema/test-qapi.py | 1 + 24 files changed, 144 insertions(+), 55 deletions(-) -- 2.31.1

4 18

Squelch 'eof from qemu monitor' error on normal VM shutdown
by Jim Fehlig 08 Oct '21

08 Oct '21

Hi All, Likely Christian received a bug report that motivated commit aeda1b8c56, which was later reverted by Michal with commit 72adaf2f10. In the past, I recall being asked about "internal error: End of file from qemu monitor" on normal VM shutdown and gave a hand wavy response using some of Michal's words from the revert commit message. I recently received a bug report (sorry, but no public link) from a concerned user about this error and wondered if there is some way to improve it? I went down some dead ends before circling back to Christian's patch. When rebased to latest master, I cannot reproduce the hangs reported by Michal [1]. Perhaps Nikolay's series to resolve hangs/crashes of libvirtd [2] has now made Christian's patch viable? Regards Jim [1] https://bugzilla.redhat.com/show_bug.cgi?id=1536461 [2] https://listman.redhat.com/archives/libvir-list/2020-July/msg01606.html

3 6

[PATCH v3] qemu: tpm: Run swtpm_setup --create-config-files in session mode
by Stefan Berger 08 Oct '21

08 Oct '21

Using swtpm v0.7.0 we can run swtpm_setup to create default config files for swtpm_setup and swtpm-localca in session mode. Now a user can start a VM with an attached TPM without having to run this program on the command line before. This program needs to run once. This patch addresses the issue raised in https://bugzilla.redhat.com/show_bug.cgi?id=2010649 Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- v3: - Removed logfile parameter v2: - fixed return code if swtpm_setup doesn't support the option --- src/qemu/qemu_tpm.c | 39 +++++++++++++++++++++++++++++++++++++++ src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + 3 files changed, 41 insertions(+) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 100481503c..434c357c24 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -385,6 +385,42 @@ qemuTPMSetupEncryption(const unsigned char *secretuuid, return virCommandSetSendBuffer(cmd, g_steal_pointer(&secret), secret_len); } + +/* + * qemuTPMCreateConfigFiles: run swtpm_setup --create-config-files skip-if-exist + */ +static int +qemuTPMCreateConfigFiles(void) +{ + g_autofree char *swtpm_setup = virTPMGetSwtpmSetup(); + g_autoptr(virCommand) cmd = NULL; + int exitstatus; + + if (!swtpm_setup) + return -1; + + if (!virTPMSwtpmSetupCapsGet( + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES)) + return 0; + + cmd = virCommandNew(swtpm_setup); + if (!cmd) + return -1; + + virCommandAddArgList(cmd, "--create-config-files", "skip-if-exist", NULL); + virCommandClearCaps(cmd); + + if (virCommandRun(cmd, &exitstatus) < 0 || exitstatus != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not run '%s' to create config files. exitstatus: %d", + swtpm_setup, exitstatus); + return -1; + } + + return 0; +} + + /* * qemuTPMEmulatorRunSetup * @@ -432,6 +468,9 @@ qemuTPMEmulatorRunSetup(const char *storagepath, "this requires privileged mode for a " "TPM 1.2\n"), 0600); + if (!privileged && qemuTPMCreateConfigFiles()) + return -1; + cmd = virCommandNew(swtpm_setup); if (!cmd) return -1; diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 1a567139b4..0f50de866c 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -45,6 +45,7 @@ VIR_ENUM_IMPL(virTPMSwtpmFeature, VIR_ENUM_IMPL(virTPMSwtpmSetupFeature, VIR_TPM_SWTPM_SETUP_FEATURE_LAST, "cmdarg-pwdfile-fd", + "cmdarg-create-config-files", ); /** diff --git a/src/util/virtpm.h b/src/util/virtpm.h index d021a083b4..3bb03b3b33 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -38,6 +38,7 @@ typedef enum { typedef enum { VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD, + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES, VIR_TPM_SWTPM_SETUP_FEATURE_LAST } virTPMSwtpmSetupFeature; -- 2.31.1

2 3

[PATCH v2] qemu: tpm: Run swtpm_setup --create-config-files in session mode
by Stefan Berger 08 Oct '21

08 Oct '21

Using swtpm v0.7.0 we can run swtpm_setup to create default config files for swtpm_setup and swtpm-localca in session mode. Now a user can start a VM with an attached TPM without having to run this program on the command line before. This program needs to run once. This patch addresses the issue raised in https://bugzilla.redhat.com/show_bug.cgi?id=2010649 Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> v2: - fixed return code if swtpm_setup doesn't support the option --- src/qemu/qemu_tpm.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + 3 files changed, 45 insertions(+) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 100481503c..bf6c8e5ad5 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -385,6 +385,46 @@ qemuTPMSetupEncryption(const unsigned char *secretuuid, return virCommandSetSendBuffer(cmd, g_steal_pointer(&secret), secret_len); } + +/* + * qemuTPMCreateConfigFiles: run swtpm_setup --create-config-files skip-if-exist + * + * @logfile: The file to write the log into; it must be writable + * for the user given by userid or 'tss' + */ +static int +qemuTPMCreateConfigFiles(const char *logfile) +{ + g_autofree char *swtpm_setup = virTPMGetSwtpmSetup(); + g_autoptr(virCommand) cmd = NULL; + int exitstatus; + + if (!swtpm_setup) + return -1; + + if (!virTPMSwtpmSetupCapsGet( + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES)) + return 0; + + cmd = virCommandNew(swtpm_setup); + if (!cmd) + return -1; + + virCommandAddArgList(cmd, "--create-config-files", "skip-if-exist", NULL); + virCommandClearCaps(cmd); + + if (virCommandRun(cmd, &exitstatus) < 0 || exitstatus != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not run '%s' to create config files. exitstatus: %d; " + "Check error log '%s' for details."), + swtpm_setup, exitstatus, logfile); + return -1; + } + + return 0; +} + + /* * qemuTPMEmulatorRunSetup * @@ -432,6 +472,9 @@ qemuTPMEmulatorRunSetup(const char *storagepath, "this requires privileged mode for a " "TPM 1.2\n"), 0600); + if (!privileged && qemuTPMCreateConfigFiles(logfile)) + return -1; + cmd = virCommandNew(swtpm_setup); if (!cmd) return -1; diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 1a567139b4..0f50de866c 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -45,6 +45,7 @@ VIR_ENUM_IMPL(virTPMSwtpmFeature, VIR_ENUM_IMPL(virTPMSwtpmSetupFeature, VIR_TPM_SWTPM_SETUP_FEATURE_LAST, "cmdarg-pwdfile-fd", + "cmdarg-create-config-files", ); /** diff --git a/src/util/virtpm.h b/src/util/virtpm.h index d021a083b4..3bb03b3b33 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -38,6 +38,7 @@ typedef enum { typedef enum { VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD, + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES, VIR_TPM_SWTPM_SETUP_FEATURE_LAST } virTPMSwtpmSetupFeature; -- 2.31.1

3 8

[PATCH v7 0/4] introduce support for acpi-bridge-hotplug feature
by Ani Sinha 08 Oct '21

08 Oct '21

changelog: v7: Laine's suggestions from v6 incorporated. rebased the patchset to latest master. v6: rebased to latest. capabilities have been renamed as per suggestions that were made here: https://listman.redhat.com/archives/libvir-list/2021-October/msg00061.html v5: rebased the patchset with the latest master. v4: split the original series into two - pci-root controller specific one (https://www.mail-archive.com/libvir-list@redhat.com/msg221645.html) and this one specific to pci bridges. The conf xml has been introduced as per suggestion by Berrange here: https://patchew.org/Libvirt/20210912032631.2853520-1-ani@anisinha.ca Changes has been introduced to parse and validate the xml accordingly as well as to add backend qemu commandline option. v3: reorganized the patches as per Laine's suggestion. Added more details in commit messages. Added conf description in formatdomain.rst. Added changelog for next release. v2: fixed bugs and added additional missing unit tests. v1: initial implementation. Had some bugs and missed some unit tests This change introduces a new libvirt sub-element <pci> under <features> that can be used to configure all pci related features. Currently the only sub-sub element supported by this sub-element is 'acpi-bridge-hotplug' as shown below: <features> <pci> <acpi-bridge-hotplug state='on|off'/> </pci> </features> The above option is only available for qemu driver and that too for x86 guests only. It is a global option. 'acpi-bridge-hotplug' option enables or disables ACPI hotplug support for cold-plugged pci bridges. Examples of bridges include PCI-PCI bridge (pci-bridge controller) or PCIe-PCI bridges for pc machines and pcie-root-port controller for q35 machines. Being global option, no other bridge specific option are required. For pc machine type in x86, this option is available in qemu for a long time, from version 2.1. Please see the following changes in qemu repo: 9e047b982452c6 ("piix4: add acpi pci hotplug support") 133a2da488062e ("pc: acpi: generate AML only for PCI0 devices if PCI bridge hotplug is disabled") For q35 machine type, this was introduced in qemu 6.1 with the following changes in qemu repo: (a) c0e427d6eb5fef ("hw/acpi/ich9: Enable ACPI PCI hot-plug") (b) 17858a16950860 ("hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35") The reasons for enabling ACPI based hotplug for PCIe (q35) based machines (as opposed to native hotplug) are outlined in (b). There are use cases where users would still want to use native hotplug (see notes). Therefore, this config option enables users to choose either ACPI based hotplug or native hotplug for bridges (for example for pcie root port controller in q35 machines). Notes: One concrete example of why one might still want to use native hotplug with pcie-root-port controller is the fact that we are still discovering issues with acpi hotplug on PCIE. One such issue is: https://lists.gnu.org/archive/html/qemu-devel/2021-09/msg02146.html Another reason is that users have been using native hotplug on pcie root ports up until now. They have built and tested their systems based on native hotplug. They may not want to suddenly move to acpi based hotplug just because it is now the default in qemu. Supporting the option to chose one or the other through libvirt makes things simpler for end users. Ani Sinha (4): qemu: capablities: detect presence of acpi-pci-hotplug-with-bridge-support conf: introduce support for acpi-bridge-hotplug feature qemu: command: add support for acpi-bridge-hotplug feature NEWS: add new acpi pci hotplug config option in the release note for next release NEWS.rst | 8 ++ docs/formatdomain.rst | 16 ++++ docs/schemas/domaincommon.rng | 15 ++++ src/conf/domain_conf.c | 89 ++++++++++++++++++- src/conf/domain_conf.h | 9 ++ src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 20 +++++ src/qemu/qemu_validate.c | 46 ++++++++++ .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 2 + .../aarch64-acpi-hotplug-bridge-disable.err | 1 + .../aarch64-acpi-hotplug-bridge-disable.xml | 33 +++++++ ...pc-i440fx-acpi-hotplug-bridge-disable.args | 31 +++++++ .../pc-i440fx-acpi-hotplug-bridge-disable.err | 1 + .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 33 +++++++ .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 33 +++++++ .../q35-acpi-hotplug-bridge-disable.args | 33 +++++++ .../q35-acpi-hotplug-bridge-disable.err | 1 + .../q35-acpi-hotplug-bridge-disable.xml | 47 ++++++++++ .../q35-acpi-hotplug-bridge-enable.xml | 47 ++++++++++ tests/qemuxml2argvtest.c | 16 ++++ .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 1 + .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 1 + .../q35-acpi-hotplug-bridge-disable.xml | 1 + .../q35-acpi-hotplug-bridge-enable.xml | 1 + tests/qemuxml2xmltest.c | 14 +++ 37 files changed, 515 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml -- 2.25.1

2 6

Cancellation of VM core dumps
by Simon Rowe 08 Oct '21

08 Oct '21

I see that cancellation of core dump jobs that are memory-only are explicitly rejected >>> d.abortJob() libvirt: QEMU Driver error : Requested operation is not valid: cannot abort memory-only dump Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib64/python2.7/site-packages/libvirt.py", line 544, in abortJob if ret == -1: raise libvirtError ('virDomainAbortJob() failed', dom=self) libvirt.libvirtError: Requested operation is not valid: cannot abort memory-only dump Is there a technical reason for this? Dumps of very large guests may take a long time and it would be useful to be able to abort them. Simon

2 1

[libvirt PATCH v3 0/6] qemu: changes to use feature=on|off syntax for -cpu unconditionally
by Daniel P. Berrangé 08 Oct '21

08 Oct '21

Given our min QEMU, it doesn't seem like we need to support either the old "-feature" / "+feature" syntax, nor the bare "feature" syntax. I'm pretty unsure about the last patch in this series, given the impact it had on test data files. If it is indeed ok though, we can delete two capabilities too. v3: - Now with more fine grained patches and cleanups to avoid the bugs v2: - Now with cpu name compatibility retained Daniel P. Berrangé (6): qemu: always translate underscores to hyphens in CPU features qemu: always use hyphens in hyperv feature names qemu: remove use of (+|-)name syntax for -cpu featres qemu: inline the qemuBuildCpuFeature code qemu: remove use of implicit boolean syntax for guest features qemu: drop support for full CPU model expansion src/qemu/qemu_capabilities.c | 15 +- src/qemu/qemu_command.c | 46 +- src/qemu/qemu_monitor.h | 1 - src/qemu/qemu_monitor_json.c | 15 - .../caps_2.11.0.x86_64.replies | 2564 ++---------- .../caps_2.11.0.x86_64.xml | 182 +- .../caps_2.12.0.x86_64.replies | 3036 +++------------ .../caps_2.12.0.x86_64.xml | 194 +- .../caps_3.0.0.x86_64.replies | 3130 ++++----------- .../caps_3.0.0.x86_64.xml | 204 +- .../caps_3.1.0.x86_64.replies | 3436 ++++------------ .../caps_3.1.0.x86_64.xml | 218 +- .../caps_4.0.0.x86_64.replies | 3452 ++++------------- .../caps_4.0.0.x86_64.xml | 226 +- .../clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 2 +- .../cpu-check-default-partial.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- .../cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 2 +- .../cpu-host-model-fallback.args | 2 +- .../cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-model.x86_64-2.11.0.args | 2 +- .../cpu-host-model.x86_64-2.12.0.args | 2 +- .../cpu-host-model.x86_64-3.0.0.args | 2 +- .../cpu-host-model.x86_64-3.1.0.args | 2 +- .../cpu-host-model.x86_64-4.0.0.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- .../cpu-translation.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 2 +- .../eoi-disabled.x86_64-4.0.0.args | 2 +- .../eoi-enabled.x86_64-4.0.0.args | 2 +- .../graphics-spice-timeout.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- .../pci-bridge-many-disks.args | 2 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 2 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 2 +- 55 files changed, 3438 insertions(+), 13363 deletions(-) -- 2.31.1

2 12

[PATCH] qemu: tpm: Run swtpm_setup --create-config-files in session mode
by Stefan Berger 08 Oct '21

08 Oct '21

Using swtpm v0.7.0 we can run swtpm_setup to create default config files for swtpm_setup and swtpm-localca in session mode. Now a user can start a VM with an attached TPM without having to run this program on the command line before. This program needs to run once. This patch addresses the issue raised in https://bugzilla.redhat.com/show_bug.cgi?id=2010649 Sigbed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/qemu/qemu_tpm.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + 3 files changed, 45 insertions(+) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 100481503c..1b504bce67 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -385,6 +385,46 @@ qemuTPMSetupEncryption(const unsigned char *secretuuid, return virCommandSetSendBuffer(cmd, g_steal_pointer(&secret), secret_len); } + +/* + * qemuTPMCreateConfigFiles: run swtpm_setup --create-config-files skip-if-exist + * + * @logfile: The file to write the log into; it must be writable + * for the user given by userid or 'tss' + */ +static int +qemuTPMCreateConfigFiles(const char *logfile) +{ + g_autofree char *swtpm_setup = virTPMGetSwtpmSetup(); + g_autoptr(virCommand) cmd = NULL; + int exitstatus; + + if (!swtpm_setup) + return -1; + + if (!virTPMSwtpmSetupCapsGet( + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES)) + return -1; + + cmd = virCommandNew(swtpm_setup); + if (!cmd) + return -1; + + virCommandAddArgList(cmd, "--create-config-files", "skip-if-exist", NULL); + virCommandClearCaps(cmd); + + if (virCommandRun(cmd, &exitstatus) < 0 || exitstatus != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not run '%s' to create config files. exitstatus: %d; " + "Check error log '%s' for details."), + swtpm_setup, exitstatus, logfile); + return -1; + } + + return 0; +} + + /* * qemuTPMEmulatorRunSetup * @@ -432,6 +472,9 @@ qemuTPMEmulatorRunSetup(const char *storagepath, "this requires privileged mode for a " "TPM 1.2\n"), 0600); + if (!privileged && qemuTPMCreateConfigFiles(logfile)) + return -1; + cmd = virCommandNew(swtpm_setup); if (!cmd) return -1; diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 1a567139b4..0f50de866c 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -45,6 +45,7 @@ VIR_ENUM_IMPL(virTPMSwtpmFeature, VIR_ENUM_IMPL(virTPMSwtpmSetupFeature, VIR_TPM_SWTPM_SETUP_FEATURE_LAST, "cmdarg-pwdfile-fd", + "cmdarg-create-config-files", ); /** diff --git a/src/util/virtpm.h b/src/util/virtpm.h index d021a083b4..3bb03b3b33 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -38,6 +38,7 @@ typedef enum { typedef enum { VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD, + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES, VIR_TPM_SWTPM_SETUP_FEATURE_LAST } virTPMSwtpmSetupFeature; -- 2.31.1

1 0

[PATCH] vireventglib: Remove handles with the highest priority
by Michal Privoznik 08 Oct '21

08 Oct '21

When a server decides to close a client, the virNetServerClientCloseLocked() is called. In here various cleanup steps are taken, but the most important part (from this commit's POV at least) is the way that the socket is closed. Firstly, removal of the socket associated with the client from the event loop is signalized and then the socket is unrefed. The socket is not closed just yet though, because the event loop holds a reference to it. This reference will be freed as soon as the event loop wakes up and starts issuing callbacks (in this case virNetSocketEventFree()). So far, this is how things usually work. But if the daemon reaches the number of opened files limit, things start to work differently. If the RLIMIT_NOFILE limit is reached and there's a client that wants to connect then the event loop wakes up, sees POLLIN on the socket and calls virNetServerServiceAccept() which in turn calls virNetSocketAccept(). But because of the limit, accept() fails with EMFILE leaving the POLLIN event unhandled. The dispatch then continues to next FDs with events on them. BUT, it will NOT call the socket removal callback (virNetSocketEventFree()) because it has low priority (G_PRIORITY_DEFAULT_IDLE). Per glib's documentation: * Each event source is assigned a priority. The default priority, * %G_PRIORITY_DEFAULT, is 0. Values less than 0 denote higher priorities. * Values greater than 0 denote lower priorities. Events from high priority * sources are always processed before events from lower priority sources. and per g_idle_add() documentation: * Adds a function to be called whenever there are no higher priority * events pending to the default main loop. The function is given the * default idle priority, %G_PRIORITY_DEFAULT_IDLE. Now, because we did not accept() the client we are constantly seeing POLLIN on the main socket and thus the removal of the client socket won't ever happen. The fix is to set at least the same priority as other sources, but since we want to just close an FD, let's give it the highest priority and call it before handling other events. This issue can be easily reproduced, for instance: # ulimit -S -n 40 (tweak this number if needed) # ./src/libvirtd from another terminal: # for ((i=0; i<100; i++)); do virsh list & done; virsh list The last `virsh list` must not get stuck. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2007168 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/vireventglib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c index f3e5a344b0..983787932f 100644 --- a/src/util/vireventglib.c +++ b/src/util/vireventglib.c @@ -287,7 +287,7 @@ virEventGLibHandleRemove(int watch) * 'removed' to prevent reuse */ data->removed = TRUE; - g_idle_add(virEventGLibHandleRemoveIdle, data); + g_idle_add_full(G_PRIORITY_HIGH, virEventGLibHandleRemoveIdle, data, NULL); ret = 0; -- 2.32.0

3 5

[PATCH] qemucapabilitiestest: Add test data for the qemu-6.2 development cycle
by Peter Krempa 08 Oct '21

08 Oct '21

The data is based on commit v6.1.0-1296-g14f12119aa Notable changes: - New machine types for the 6.2 cycle were added - MEM_UNPLUG_ERROR event was deprecated and replaced by DEVICE_UNPLUG_GUEST_ERROR - Intel SGX related commands and devices added - 'copy-before-write' blockdev filter was added - 'memory-backend-epc' was added - new cpu flags Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 220 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 226 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 220 + .../caps_6.2.0.x86_64.replies | 34119 ++++++++++++++++ .../caps_6.2.0.x86_64.xml | 3716 ++ 5 files changed, 38501 insertions(+) create mode 100644 tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml create mode 100644 tests/domaincapsdata/qemu_6.2.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml [...] diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies new file mode 100644 index 0000000000..4e332ba861 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies @@ -0,0 +1,34119 @@ +{ + "execute": "qmp_capabilities", + "id": "libvirt-1" +} + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "execute": "query-version", + "id": "libvirt-2" +} + +{ + "return": { + "qemu": { + "micro": 50, + "minor": 1, + "major": 6 + }, + "package": "v6.1.0-1296-g14f12119aa" + }, + "id": "libvirt-2" +} You can fetch the full patch at git fetch https://gitlab.com/pipo.sk/libvirt.git caps-6.2

2 1

[libvirt PATCH v3 0/5] add interface infomation in guestinfo command
by zhanglei 08 Oct '21

08 Oct '21

zhanglei (5): domain: add interface information to 'virDomainGetGuestInfo' virsh: add interface information to guestinfo command qemu: refactor 'qemuAgentGetInterfaces' qemu: add guest interface information in 'qemuDomainGetGuestInfo' NEWS: add guest interface information in 'virDomainGetGuestInfo' NEWS.rst | 5 ++ docs/manpages/virsh.rst | 12 ++++- include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 12 +++++ src/qemu/qemu_agent.c | 9 ++-- src/qemu/qemu_agent.h | 3 +- src/qemu/qemu_driver.c | 90 +++++++++++++++++++++++++++++++- tests/qemuagenttest.c | 2 +- tools/virsh-domain.c | 6 +++ 9 files changed, 131 insertions(+), 9 deletions(-) -- 2.31.1

2 6

[PATCH v6 0/4] introduce support for acpi-bridge-hotplug feature
by Ani Sinha 08 Oct '21

08 Oct '21

changelog: v6: rebased to latest. capabilities have been renamed as per suggestions that were made here: https://listman.redhat.com/archives/libvir-list/2021-October/msg00061.html v5: rebased the patchset with the latest master. v4: split the original series into two - pci-root controller specific one (https://www.mail-archive.com/libvir-list@redhat.com/msg221645.html) and this one specific to pci bridges. The conf xml has been introduced as per suggestion by Berrange here: https://patchew.org/Libvirt/20210912032631.2853520-1-ani@anisinha.ca Changes has been introduced to parse and validate the xml accordingly as well as to add backend qemu commandline option. v3: reorganized the patches as per Laine's suggestion. Added more details in commit messages. Added conf description in formatdomain.rst. Added changelog for next release. v2: fixed bugs and added additional missing unit tests. v1: initial implementation. Had some bugs and missed some unit tests This change introduces a new libvirt sub-element <pci> under <features> that can be used to configure all pci related features. Currently the only sub-sub element supported by this sub-element is 'acpi-bridge-hotplug' as shown below: <features> <pci> <acpi-bridge-hotplug state='on|off'/> </pci> </features> The above option is only available for qemu driver and that too for x86 guests only. It is a global option. 'acpi-bridge-hotplug' option enables or disables ACPI hotplug support for cold-plugged pci bridges. Examples of bridges include PCI-PCI bridge (pci-bridge controller) or PCIe-PCI bridges for pc machines and pcie-root-port controller for q35 machines. Being global option, no other bridge specific option are required. For pc machine type in x86, this option is available in qemu for a long time, from version 2.1. Please see the following changes in qemu repo: 9e047b982452c6 ("piix4: add acpi pci hotplug support") 133a2da488062e ("pc: acpi: generate AML only for PCI0 devices if PCI bridge hotplug is disabled") For q35 machine type, this was introduced in qemu 6.1 with the following changes in qemu repo: (a) c0e427d6eb5fef ("hw/acpi/ich9: Enable ACPI PCI hot-plug") (b) 17858a16950860 ("hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35") The reasons for enabling ACPI based hotplug for PCIe (q35) based machines (as opposed to native hotplug) are outlined in (b). There are use cases where users would still want to use native hotplug (see notes). Therefore, this config option enables users to choose either ACPI based hotplug or native hotplug for bridges (for example for pcie root port controller in q35 machines). Notes: One concrete example of why one might still want to use native hotplug with pcie-root-port controller is the fact that we are still discovering issues with acpi hotplug on PCIE. One such issue is: https://lists.gnu.org/archive/html/qemu-devel/2021-09/msg02146.html Another reason is that users have been using native hotplug on pcie root ports up until now. They have built and tested their systems based on native hotplug. They may not want to suddenly move to acpi based hotplug just because it is now the default in qemu. Supporting the option to chose one or the other through libvirt makes things simpler for end users. Ani Sinha (4): qemu: capablities: detect presence of acpi-pci-hotplug-with-bridge-support conf: introduce support for acpi-bridge-hotplug feature qemu: command: add support for acpi-bridge-hotplug feature NEWS: add new acpi pci hotplug config option in the release note for next release NEWS.rst | 7 ++ docs/formatdomain.rst | 11 +++ docs/schemas/domaincommon.rng | 15 ++++ src/conf/domain_conf.c | 89 ++++++++++++++++++- src/conf/domain_conf.h | 9 ++ src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 14 +++ src/qemu/qemu_validate.c | 46 ++++++++++ .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 2 + .../aarch64-acpi-hotplug-bridge-disable.err | 1 + .../aarch64-acpi-hotplug-bridge-disable.xml | 33 +++++++ ...pc-i440fx-acpi-hotplug-bridge-disable.args | 31 +++++++ .../pc-i440fx-acpi-hotplug-bridge-disable.err | 1 + .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 33 +++++++ .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 33 +++++++ .../q35-acpi-hotplug-bridge-disable.args | 33 +++++++ .../q35-acpi-hotplug-bridge-disable.err | 1 + .../q35-acpi-hotplug-bridge-disable.xml | 47 ++++++++++ .../q35-acpi-hotplug-bridge-enable.xml | 47 ++++++++++ tests/qemuxml2argvtest.c | 16 ++++ .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 1 + .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 1 + .../q35-acpi-hotplug-bridge-disable.xml | 1 + .../q35-acpi-hotplug-bridge-enable.xml | 1 + tests/qemuxml2xmltest.c | 14 +++ 37 files changed, 503 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml -- 2.25.1

3 14

[PATCH] lxc: controller: Fix container launch on cgroup v1
by Cole Robinson 07 Oct '21

07 Oct '21

With cgroup v1 I'm seeing LXC container startup failures: $ sudo virt-install --connect lxc:/// --name test-container --memory 128 --boot init=/bin/sh Starting install... ERROR error from service: GDBus.Error:org.freedesktop.machine1.NoMachineForPID: PID 2145047 does not belong to any known machine libvirt 7.0.0 works but 7.1.0+ does not. The root error seems to predate that, showing up in syslog, but commit 9c1693eff made it fatal: commit 9c1693eff427661616ce1bd2795688f87288a412 Author: Pavel Hrdina <phrdina(a)redhat.com> Date: Fri Feb 5 16:17:35 2021 +0100 vircgroup: use DBus call to systemd for some APIs The error comes from virSystemdGetMachineByPID. The PID that shows up in the above error message does not match the leader PID as reported by machinectl. This change fixes the error. Things seem to continue to work with cgroupsv2 after this change. https://gitlab.com/libvirt/libvirt/-/issues/182 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- This is from the thread in August, posted as non RFC now src/lxc/lxc_controller.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8953e0c904..444f728af4 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -865,12 +865,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCController *ctrl) nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1); if (!(ctrl->cgroup = virLXCCgroupCreate(ctrl->def, - ctrl->initpid, + getpid(), ctrl->nnicindexes, ctrl->nicindexes))) goto cleanup; - if (virCgroupAddMachineProcess(ctrl->cgroup, getpid()) < 0) + if (virCgroupAddMachineProcess(ctrl->cgroup, ctrl->initpid) < 0) goto cleanup; /* Add all qemu-nbd tasks to the cgroup */ -- 2.31.1

3 2

[PATCH v3 0/5] Add support for librbd encryption
by Or Ozeri 07 Oct '21

07 Oct '21

v3: rebased on master v2: addressed (hopefully) all of Peter's v1 comments (thanks Peter!) Or Ozeri (5): qemu: add disk post parse to qemublocktest qemu: add rbd encryption capability probing conf: add luks2 encryption format conf: add encryption engine property qemu: add librbd encryption engine docs/formatstorageencryption.html.in | 8 +- docs/schemas/domainbackup.rng | 7 + docs/schemas/storagecommon.rng | 9 + src/conf/storage_encryption_conf.c | 33 +++- src/conf/storage_encryption_conf.h | 11 ++ src/qemu/qemu_block.c | 33 ++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 37 +++- src/qemu/qemu_domain.h | 3 + tests/qemublocktest.c | 3 + .../caps_6.1.0.x86_64.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 6 +- ...sk-network-rbd-encryption.x86_64-6.0.0.err | 1 + ...-network-rbd-encryption.x86_64-latest.args | 49 ++++++ .../disk-network-rbd-encryption.xml | 75 +++++++++ tests/qemuxml2argvtest.c | 2 + ...k-network-rbd-encryption.x86_64-latest.xml | 83 +++++++++ tests/qemuxml2xmloutdata/disk-nvme.xml | 65 ++++++- .../disk-slices.x86_64-latest.xml | 4 +- .../encrypted-disk-usage.xml | 38 ++++- tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +- .../luks-disks-source-qcow2.x86_64-latest.xml | 14 +- .../qemuxml2xmloutdata/luks-disks-source.xml | 10 +- tests/qemuxml2xmloutdata/luks-disks.xml | 47 +++++- tests/qemuxml2xmloutdata/user-aliases.xml | 159 +++++++++++++++++- tests/qemuxml2xmltest.c | 1 + 27 files changed, 677 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-6.0.0.err create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-encryption.x86_64-latest.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/disk-nvme.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/encrypted-disk-usage.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/luks-disks.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/user-aliases.xml -- 2.25.1

3 16

[libvirt PATCH v2 0/2] qemu: changes to use feature=on|off syntax for -cpu unconditionally
by Daniel P. Berrangé 07 Oct '21

07 Oct '21

Given our min QEMU, it doesn't seem like we need to support either the old "-feature" / "+feature" syntax, nor the bare "feature" syntax. v2: - Now with cpu name compatibility retained Daniel P. Berrangé (2): qemu: remove use of (+|-)name syntax for -cpu featres qemu: remove use of implicit boolean syntax for -cpu features src/qemu/qemu_command.c | 40 +++++++------------ .../clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 2 +- .../cpu-check-default-partial.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- .../cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../cpu-host-model-fallback.args | 2 +- .../cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- .../graphics-spice-timeout.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- .../pci-bridge-many-disks.args | 2 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- 35 files changed, 48 insertions(+), 60 deletions(-) -- 2.31.1

2 6

[libvirt PATCH 0/2] qemu: changes to use feature=on|off syntax for -cpu unconditionally
by Daniel P. Berrangé 07 Oct '21

07 Oct '21

Given our min QEMU, it doesn't seem like we need to support either the old "-feature" / "+feature" syntax, nor the bare "feature" syntax. Daniel P. Berrangé (2): qemu: remove use of (+|-)name syntax for -cpu featres qemu: remove use of implicit boolean syntax for -cpu features src/qemu/qemu_command.c | 38 ++++++------------- .../clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 2 +- .../cpu-check-default-partial.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- .../cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../cpu-host-model-fallback.args | 2 +- .../cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-model.x86_64-4.1.0.args | 2 +- .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- .../cpu-host-model.x86_64-5.1.0.args | 2 +- .../cpu-host-model.x86_64-5.2.0.args | 2 +- .../cpu-host-model.x86_64-6.0.0.args | 2 +- .../cpu-host-model.x86_64-6.1.0.args | 2 +- .../cpu-host-model.x86_64-latest.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- .../graphics-spice-timeout.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- .../pci-bridge-many-disks.args | 2 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- 43 files changed, 54 insertions(+), 68 deletions(-) -- 2.31.1

2 5

[libvirt PATCHv2 0/5] qemu: implement virtiofs hot(un)plug (virtiofs epopee)
by Ján Tomko 07 Oct '21

07 Oct '21

diff to v1 * do not store logCtxt in private data * qemuDomainGetVHostUserChrSourceDef inlined in the only function that uses it * a new connection to the logManager is opened when virtiofsd is started * use VIR_APPEND_ELEMENT_COPY to reuse 'fs' on the successful audit * qemuDomainRemoveFSDevice only processes virtiofs devices now Ján Tomko (5): logging: define cleanup func for virLogManager qemu: virtiofs: open a separate connection to virtlogd qemu: Revert "qemuExtDevicesStart: pass logManager" qemu: implement virtiofs hotplug qemu: implement virtiofs hotunplug src/conf/domain_conf.c | 24 +++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/logging/log_manager.h | 2 + src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_extdevice.c | 3 +- src/qemu/qemu_extdevice.h | 1 - src/qemu/qemu_hotplug.c | 186 +++++++++++++++++++++++++++++++++++++- src/qemu/qemu_process.c | 4 +- src/qemu/qemu_virtiofs.c | 8 +- src/qemu/qemu_virtiofs.h | 3 +- 11 files changed, 230 insertions(+), 13 deletions(-) -- 2.31.1

2 10

[PATCH] tools: Fix typo firemare -> firmware
by Andrea Bolognani 06 Oct '21

06 Oct '21

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. tools/virt-host-validate-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 556223242d..7a5cda4104 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -515,7 +515,7 @@ int virHostValidateSecureGuests(const char *hvname, } else { virHostMsgFail(level, "AMD Secure Encrypted Virtualization appears to be " - "disabled in firemare."); + "disabled in firmware."); return VIR_HOST_VALIDATE_FAILURE(level); } } -- 2.31.1

2 1

[PATCH 00/11] qdev: Add JSON -device and fix QMP device_add
by Kevin Wolf 06 Oct '21

06 Oct '21

It's still a long way until we'll have QAPIfied devices, but there are some improvements that we can already make now to make the future switch easier. One important part of this is having code paths without QemuOpts, which we want to get rid of and replace with the keyval parser in the long run. This series adds support for JSON syntax to -device, which bypasses QemuOpts. While we're not using QAPI yet, devices are based on QOM, so we already do have type checks and an implied schema. JSON syntax supported now can be supported by QAPI later and regarding command line compatibility, actually switching to it becomes an implementation detail this way (of course, it will still add valuable user-visible features like introspection and documentation). Apart from making things more future proof, this also immediately adds a way to do non-scalar properties on the command line. nvme could have used list support recently, and the lack of it in -device led to some rather unnatural solution in the first version (doing the relationship between a device and objects backwards) and loss of features in the following. With this series, using a list as a device property should be possible without any weird tricks. Unfortunately, even QMP device_add goes through QemuOpts before this series, which destroys any type safety QOM provides and also can't support non-scalar properties. This is a bug that is fixed during this series, but that is technically an incompatible change. A similar change was made for netdev_add in commit db2a380c84. libvirt needs to make sure that it actually always passes the right type, because passing a wrong type will start to fail after this series. I hope that libvirt already does things correctly, so this won't cause any trouble, but if it does, there is the option of using the QemuOpts-less code path only for JSON -device and going through a deprecation period for QMP device_add. Kevin Wolf (11): qom: Reduce use of error_propagate() iotests/245: Fix type for iothread property iotests/051: Fix typo qdev: Avoid using string visitor for properties qdev: Make DeviceState.id independent of QemuOpts qdev: Add Error parameter to qdev_set_id() qemu-option: Allow deleting opts during qemu_opts_foreach() qdev: Base object creation on QDict rather than QemuOpts qdev: Avoid QemuOpts in QMP device_add vl: Enable JSON syntax for -device Deprecate stable non-JSON -device and -object qapi/qdev.json | 15 +++-- docs/about/deprecated.rst | 11 ++++ include/hw/qdev-core.h | 10 ++-- include/monitor/qdev.h | 2 +- hw/arm/virt.c | 2 +- hw/core/qdev.c | 6 +- hw/net/virtio-net.c | 4 +- hw/pci-bridge/pci_expander_bridge.c | 2 +- hw/ppc/e500.c | 2 +- hw/vfio/pci.c | 4 +- hw/xen/xen-legacy-backend.c | 3 +- qom/object.c | 7 +-- qom/object_interfaces.c | 17 ++---- softmmu/qdev-monitor.c | 90 +++++++++++++++++------------ softmmu/vl.c | 58 ++++++++++++++++--- util/qemu-option.c | 4 +- tests/qemu-iotests/051 | 2 +- tests/qemu-iotests/051.pc.out | 4 +- tests/qemu-iotests/245 | 4 +- 19 files changed, 161 insertions(+), 86 deletions(-) -- 2.31.1

11 48

[PATCH v2 0/5] Add support for librbd encryption
by Or Ozeri 06 Oct '21

06 Oct '21

Changes from v1: addressed (hopefully) all of Peter's v1 comments (thanks Peter!) Or Ozeri (5): qemu: add disk post parse to qemublocktest qemu: add rbd encryption capability probing conf: add luks2 encryption format conf: add encryption engine property qemu: add librbd encryption engine docs/formatstorageencryption.html.in | 8 +- docs/schemas/domainbackup.rng | 7 + docs/schemas/storagecommon.rng | 9 + src/conf/storage_encryption_conf.c | 33 +++- src/conf/storage_encryption_conf.h | 11 ++ src/qemu/qemu_block.c | 33 ++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 37 +++- src/qemu/qemu_domain.h | 4 + tests/qemublocktest.c | 3 + .../caps_6.1.0.x86_64.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 6 +- ...sk-network-rbd-encryption.x86_64-6.0.0.err | 1 + ...-network-rbd-encryption.x86_64-latest.args | 49 ++++++ .../disk-network-rbd-encryption.xml | 75 +++++++++ tests/qemuxml2argvtest.c | 2 + ...k-network-rbd-encryption.x86_64-latest.xml | 83 +++++++++ tests/qemuxml2xmloutdata/disk-nvme.xml | 65 ++++++- .../disk-slices.x86_64-latest.xml | 4 +- .../encrypted-disk-usage.xml | 38 ++++- tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +- .../luks-disks-source-qcow2.x86_64-latest.xml | 14 +- .../qemuxml2xmloutdata/luks-disks-source.xml | 10 +- tests/qemuxml2xmloutdata/luks-disks.xml | 47 +++++- tests/qemuxml2xmloutdata/user-aliases.xml | 159 +++++++++++++++++- tests/qemuxml2xmltest.c | 1 + 27 files changed, 678 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-6.0.0.err create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-encryption.x86_64-latest.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/disk-nvme.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/encrypted-disk-usage.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/luks-disks.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/user-aliases.xml -- 2.25.1

3 10

[PATCH] tools: Fix virt-host-validate SEV detection
by Jim Fehlig 06 Oct '21

06 Oct '21

virt-host-validate checks if AMD SEV is enabled by verifying /sys/module/kvm_amd/parameters/sev is set to '1'. On a system running kernel 5.13, the parameter is reported as 'Y'. To be extra paranoid, add a check for 'y' along with 'Y' to complement the existing check for '1'. Fixes: https://bugzilla.opensuse.org/show_bug.cgi?id=1188715 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tools/virt-host-validate-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 556223242d..ba7f54b4ce 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -501,7 +501,7 @@ int virHostValidateSecureGuests(const char *hvname, return VIR_HOST_VALIDATE_FAILURE(level); } - if (mod_value[0] != '1') { + if (mod_value[0] != '1' && mod_value[0] != 'Y' && mod_value[0] != 'y') { virHostMsgFail(level, "AMD Secure Encrypted Virtualization appears to be " "disabled in kernel. Add kvm_amd.sev=1 " -- 2.33.0

2 1

[libvirt PATCH 00/16] qemu: implement virtiofs hot(un)plug (virtiofs epopee)
by Ján Tomko 06 Oct '21

06 Oct '21

https://bugzilla.redhat.com/show_bug.cgi?id=1897708 Ján Tomko (16): qemu: vhost-user-fs: format alias on the command line conf: define cleanup func for virDomainChrSourceDef qemu: domain: introduce qemuDomainGetVHostUserFSSocketPath qemu: domain: introduce qemuDomainGetVHostUserChrSourceDef tests: qemuxml2argvtest: fix path to virtiofs socket qemu: vhost-user-fs: separate building of chardev string qemu: vhost-user-fs: separate building of device string qemu: do not put virtiofs socket in private data qemu: remove private data from virDomainFSDef qemu: alias: prepare qemuAssignDeviceFSAlias for disjunct ranges qemu: vhost-user-fs: build extdevice for zpci qemu: export vhost-user-fs-related functions qemu: store logCtxt in domain private data qemu: use priv->logCtxt in qemuProcessLaunch qemu: implement virtiofs hotplug qemu: implement virtiofs hotunplug src/conf/domain_conf.c | 24 +++ src/conf/domain_conf.h | 4 + src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 20 +- src/qemu/qemu_alias.h | 4 + src/qemu/qemu_command.c | 81 +++++--- src/qemu/qemu_command.h | 6 + src/qemu/qemu_domain.c | 64 +++---- src/qemu/qemu_domain.h | 30 +-- src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_extdevice.c | 6 +- src/qemu/qemu_hotplug.c | 177 +++++++++++++++++- src/qemu/qemu_hotplug.h | 4 + src/qemu/qemu_process.c | 21 ++- src/qemu/qemu_virtiofs.c | 14 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 4 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 4 +- tests/qemuxml2argvtest.c | 12 -- 18 files changed, 360 insertions(+), 125 deletions(-) -- 2.31.1

2 37

[PATCH 0/8] virsh: Use g_autoptr() for public types
by Michal Privoznik 05 Oct '21

05 Oct '21

In this patchset I'm switching from virXXXFree to g_autoptr(). There are still some left, but very rare occurrence: libvirt.git $ git grep -o "vir[A-Z].*Free" -- tools/ | \ cut -d':' -f 2 | sort | uniq -c | sort -n And of course, after these some functions could use subsequent cleanup, e.g. because cleanup label collapsed to just return statement. But I leave those for future work. Michal Prívozník (8): virsh-util.h: Fix ordering of virshXXXFree functions virsh: Add wrapper for virInterfaceFree virsh: Add wrapper for virStoragePoolFree virsh: Add wrapper for virStorageVolFree virsh: Add wrapper for virNetworkFree virsh: Add wrapper for virNodeDeviceFree virsh: Add wrapper for virNWFilterFree virsh: Add wrapper for virStreamFree build-aux/syntax-check.mk | 4 +- tools/virsh-completer-interface.c | 3 +- tools/virsh-completer-network.c | 8 +-- tools/virsh-completer-nodedev.c | 3 +- tools/virsh-completer-nwfilter.c | 3 +- tools/virsh-completer-pool.c | 3 +- tools/virsh-completer-volume.c | 8 +-- tools/virsh-console.c | 8 +-- tools/virsh-domain.c | 10 +-- tools/virsh-interface.c | 55 +++++---------- tools/virsh-network.c | 75 ++++++-------------- tools/virsh-nodedev.c | 49 ++++---------- tools/virsh-nwfilter.c | 22 ++---- tools/virsh-pool.c | 67 ++++++------------ tools/virsh-util.c | 78 +++++++++++++++++++++ tools/virsh-util.h | 46 +++++++++++-- tools/virsh-volume.c | 109 ++++++++---------------------- 17 files changed, 254 insertions(+), 297 deletions(-) -- 2.32.0

2 9

[libvirt PATCH v3 0/9] Automatic mutex management
by Tim Wiederhake 05 Oct '21

05 Oct '21

V1: https://listman.redhat.com/archives/libvir-list/2021-August/msg00823.html V2: https://listman.redhat.com/archives/libvir-list/2021-September/msg00249.html Changes since V2: * Dropped VIR_XPATH_NODE_AUTORESTORE simplification. Moved to a separate series. * Dropped the attempt to work around g_auto* / clang unused variable warnings (See https://bugs.llvm.org/show_bug.cgi?id=3888, https://bugs.llvm.org/show_bug.cgi?id=43482, and https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2272) Instead, introduce VIR_LOCK_GUARD macro that adds G_GNUC_UNUSED. Regards, Tim Tim Wiederhake (9): internal: Add CONCAT macro virthread: Introduce virLockGuard virthread: Introduce VIR_WITH_MUTEX_LOCK_GUARD virobject: Introduce virObjectLockGuard virobject: Introduce VIR_WITH_OBJECT_LOCK_GUARD virChrdevFDStreamCloseCb: Use virLockGuardNew virChrdevFree: Use VIR_WITH_MUTEX_LOCK bhyveAutostartDomain: Use virObjectLockGuard lxcDomainDetachDeviceHostdevUSBLive: Use VIR_WITH_OBJECT_LOCK_GUARD src/bhyve/bhyve_driver.c | 4 ++-- src/conf/virchrdev.c | 12 +++++------- src/internal.h | 3 +++ src/libvirt_private.syms | 4 ++++ src/lxc/lxc_driver.c | 6 +++--- src/util/virobject.c | 16 ++++++++++++++++ src/util/virobject.h | 24 ++++++++++++++++++++++++ src/util/virthread.c | 26 ++++++++++++++++++++++++++ src/util/virthread.h | 31 +++++++++++++++++++++++++++++++ 9 files changed, 114 insertions(+), 12 deletions(-) -- 2.31.1

2 10

[PATCH] qemu: Check if unpriv_sgio is already set before trying to set it
by Michal Privoznik 05 Oct '21

05 Oct '21

In case when libvirt runs inside a restricted container it may not have enough permissions to modify unpriv_sgio. However, it may have been set beforehand by sysadmin or an orchestration tool. Therefore, let's check whether the currently set value is the one we want and if it is refrain from writing to the file. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2010306 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_conf.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 916a3d36ee..0451bc70ac 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1878,9 +1878,17 @@ qemuSetUnprivSGIO(virDomainDeviceDef *dev) * whitelist is enabled. But if requesting unfiltered access, always call * virSetDeviceUnprivSGIO, to report an error for unsupported unpriv_sgio. */ - if ((virFileExists(sysfs_path) || val == 1) && - virSetDeviceUnprivSGIO(path, NULL, val) < 0) - return -1; + if (virFileExists(sysfs_path) || val == 1) { + int curr_val; + + if (virGetDeviceUnprivSGIO(path, NULL, &curr_val) < 0) + return -1; + + if (curr_val != val && + virSetDeviceUnprivSGIO(path, NULL, val) < 0) { + return -1; + } + } return 0; } -- 2.32.0

2 1

[PATCH] qemu: capabilities: rename piix4-acpi-root-hotplug-en to more appropriate name
by Ani Sinha 05 Oct '21

05 Oct '21

The capability name piix4-acpi-root-hotplug-en is not conventional and appreared to be confusing to some. "en" suffix is also incorrect as the capability in qemu is used to both enable and disable hotplug on the pci root bus on the i440fx. Hence, rename it to piix4.acpi-root-pci-hotplug so that it is clearer, less confusing and more accurate. Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/qemu/qemu_capabilities.c | 2 +- tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9d0c96a20c..d7b79ef7c0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -641,7 +641,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio-blk.queue-size", /* QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE */ /* 410 */ - "piix4-acpi-root-hotplug-en", /* QEMU_CAPS_PIIX_ACPI_ROOT_PCI_HOTPLUG */ + "piix4.acpi-root-pci-hotplug", /* QEMU_CAPS_PIIX_ACPI_ROOT_PCI_HOTPLUG */ ); diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 1e5833a9f0..834fb86636 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -230,7 +230,7 @@ <flag name='input-linux'/> <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4-acpi-root-hotplug-en'/> + <flag name='piix4.acpi-root-pci-hotplug'/> <version>5002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index b54dd8a22e..e9d1a26400 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -238,7 +238,7 @@ <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4-acpi-root-hotplug-en'/> + <flag name='piix4.acpi-root-pci-hotplug'/> <version>6000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 0ad493191d..971d55e0cc 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -240,7 +240,7 @@ <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> - <flag name='piix4-acpi-root-hotplug-en'/> + <flag name='piix4.acpi-root-pci-hotplug'/> <version>6001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> -- 2.25.1

2 2

[PATCH 0/5] ch: Fixup object leaks and extend g_auto usage
by William Douglas 05 Oct '21

05 Oct '21

Based off of feedback from Laine to Ján's series of patches increasing g_auto usage for the ch_driver. This fixes leaks in virCHMonitorBuildKernelRelatedJson and virCHMonitorNew while tidying up and increasing the automatic cleanup for those functions and virCHMonitorBuildMemoryJson. William Douglas (5): ch_monitor: Stop leaking json value objects ch_monitor: Correctly close and ref the virCHMonitor ch: use g_auto in virCHMonitorBuildMemoryJson ch: use g_auto in virCHMonitorBuildKernelRelatedJson ch: use g_auto in virCHMonitorNew src/ch/ch_monitor.c | 59 +++++++++++++++------------------------------ src/ch/ch_monitor.h | 1 + 2 files changed, 20 insertions(+), 40 deletions(-) -- 2.33.0

3 11

[PATCH v7 0/4] Add support to enable/disable hotplug on pci-root controller
by Ani Sinha 04 Oct '21

04 Oct '21

changelog: v7: rebased the patches post libvirt release 7.8. Adjusted NEWS.rst to reflect 7.9 (unreleased) version. Changed version info for new config option in formatdomain.rst as well. Added reviewed-by tags. Also in formatdomain.rst added information on what type of hotplug (ACPI/native etc) are affected by the setting. v6: incorporated Jan's suggestions. v5: incorporated suggestions from Laine for patches #2 and #3. The qemu command line is now added in a new function and called from qemuBuildControllersByTypeCommandLine(). Output xmls are now symlinked to input xmls for unit tests. v4: split the original patchset into a pci-root controller specific patch series. also the libvirt conf is now a sub-element of the pci-root controller as was suggested by Dan Berrange. Please see discussion here: https://listman.redhat.com/archives/libvir-list/2021-September/msg00839.html v3: reorganized the patches as per Laine's suggestion. Added more details in commit messages. Added conf description in formatdomain.rst. Added changelog for next release. v2: fixed bugs and added additional missing unit tests. v1: initial implementation. Had some bugs and missed some unit tests This patchset introduces libvirt xml support to enable/disable hotplug on the pci-root controller. It adds a 'target' subelement for the pci-root controller with a 'hotplug' property. This property can be used to enable or disable hotplug for the pci-root controller. For example, in order to disable hotplug on the pci-root controller, one has to use set '<target hotplug='off'>' as shown below: <controller type='pci' model='pci-root'> <target hotplug='off'/> </controller> '<target hotplug='on'>' option would enable hotplug for pci-root controller. This is also the default value. This option is only available for pc machine types and is applicable for qemu only/kvm accelerator onlt.This feature was introduced from qemu version 5.2 with the following change in qemu repository: 3d7e78aa7777f ("Introduce a new flag for i440fx to disable PCI hotplug on the root bus") The above qemu commit describes some reasons why users might to disable hotplug on PCI root buses [1]. The corresponding commandline option to qemu for x86 guests is: -global PIIX4_PM.acpi-root-pci-hotplug=<off/on> Notes: 1. The use case scenario described by Laine in https://listman.redhat.com/archives/libvir-list/2020-February/msg00110.html intentionally does not discuss i440fx and focusses solely on q35. I do realize that redhat has moved on from i440fx and currently efforts for new features are concentrated on q35 machines only. We have had some hard debates on this on the qemu mailing list before. The fact of the matter is that i440fx is not at 1-1 parity with q35. There are many users who are currenly using i440fx and are simply not ready to move to q35 without sacrificing some existing features they support today. For example https://wiki.qemu.org/images/4/4e/Q35.pdf lists some of q35 limitations. https://www.linux-kvm.org/images/0/06/2012-forum-Q35.pdf provides more information on the differences. Hence we need to solve the issue Laine has described in the above email for i440fx without adding additional bridges. Further, in Daniel Berrange's words from : https://lists.gnu.org/archive/html/qemu-devel/2020-04/msg03012.html "From the upstream POV, there's been no decision / agreement to phase out PIIX, this is purely a RHEL downstream decision & plan. If other distros / users have a different POV, and find the feature useful, we should accept the patch if it meets the normal QEMU patch requirements. " Also to be noted that I have already experimented this qemu commandline option using libvirt passthrough feature as has been documented in http://blog.vmsplice.net/2011/04/how-to-pass-qemu-command-line-options.html This was only meant to be a short term solution until libvirt started supporting this natively. Supporting this option through libvirt would simplify their use case as well as add capability validations and graceful failure scenarios in case qemu did not support the option. Ani Sinha (4): qemu: capablities: detect presence of acpi-root-pci-hotplug for i440fx machines conf: introduce option to enable/disable pci hotplug on pci-root controller qemu: command: add support to enable/disable hotplug on pci-root controller NEWS: release note the new hotplug enable/disable option on pci-root controller NEWS.rst | 6 ++++ docs/formatdomain.rst | 14 ++++++--- src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 17 ++++++++++ src/qemu/qemu_validate.c | 9 +++++- .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../pc-i440fx-acpi-root-hotplug-disable.args | 31 +++++++++++++++++++ .../pc-i440fx-acpi-root-hotplug-disable.err | 1 + .../pc-i440fx-acpi-root-hotplug-disable.xml | 30 ++++++++++++++++++ .../pc-i440fx-acpi-root-hotplug-enable.xml | 30 ++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../pc-i440fx-acpi-root-hotplug-disable.xml | 1 + .../pc-i440fx-acpi-root-hotplug-enable.xml | 1 + tests/qemuxml2xmltest.c | 4 +++ 17 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml -- 2.25.1

3 11

[PATCH] NEWS: cosmetic - fix indentation
by Ani Sinha 04 Oct '21

04 Oct '21

The indentation of the first item under the categoty "new features" for the future release v7.9.0 is not right. Fix it. Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index 76d2375e97..caa61f0646 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,7 +17,7 @@ v7.9.0 (unreleased) * **New features** - * Introduce virtio-mem ``<memory/>`` model + * Introduce virtio-mem ``<memory/>`` model New virtio-mem model is introduced for ``<memory/>`` device which is a paravirtualized mechanism of adding/removing memory to/from a VM. Use -- 2.25.1

2 2

[PATCH] virsh: Fix --nvram and --keep-nvram help strings
by Michal Privoznik 04 Oct '21

04 Oct '21

The --nvram and --keep-nvram options of the undefine command can be used regardless of the domain status (the only consumer so far - qemuDomainUndefineFlags() doesn't care about the domain status). Yet, their corresponding help strings say something about inactive domains while manpage says nothing. Remove the reference to domain state. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2007659 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0b78fbf728..f73d9a057e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3595,11 +3595,11 @@ static const vshCmdOptDef opts_undefine[] = { }, {.name = "nvram", .type = VSH_OT_BOOL, - .help = N_("remove nvram file, if inactive") + .help = N_("remove nvram file") }, {.name = "keep-nvram", .type = VSH_OT_BOOL, - .help = N_("keep nvram file, if inactive") + .help = N_("keep nvram file") }, {.name = NULL} }; -- 2.32.0

2 1

[PATCH 0/1] vmx: Fix <genid/> mapping
by Michal Privoznik 04 Oct '21

04 Oct '21

Apparently, parsing vmx.genid is not as easy as I thought. Anyway, it was brought up in a private thread that libvirt doesn't report correct UUIDs. For instance for the following input: vm.genid = "-8536691797830587195" vm.genidX = "-1723453263670062919" Libvirt would report: <genid>8987940a-0951-2cc5-e815-10634ff550b9</genid> while virt-v2v would report: <genid>09512cc5-940a-8987-b950-f54f631015e8</genid> Another example: vm.genid = "-6284418052148993891" vm.genidX = "-649955058627554545" Libvirt: <genid>a8c94313-ed9b-609d-f6fa-e5515a89530f</genid> virt-v2v: <genid>ed9b609d-4313-a8c9-0f53-895a51e5faf6</genid> To test my patch I modified tests/vmx2xmldata/esx-in-the-wild-10.vmx (because it already contains vmx.genid, but any file can be modified really), and then ran: libvirt.git/_build/tests $ VIR_TEST_DEBUG=1 VIR_TEST_RANGE=58 ./vmx2xmltest Mind you, the fix is almost direct rewrite of virt-v2v's algorithm, except it's optimized for C and not OCaml :-) You can find various attempts/versions of that on my gitlab: https://gitlab.com/MichalPrivoznik/libvirt/-/commits/vmx_genid/ I'm sending only the last one because that looks the best IMO. Michal Prívozník (1): vmx: Fix <genid/> mapping src/vmx/vmx.c | 16 ++++++++++++---- tests/vmx2xmldata/esx-in-the-wild-10.xml | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) -- 2.32.0

4 17

[PATCH] docs: describe flag VIR_STORAGE_POOL_CREATE_NORMAL to correct the HTML doc
by Erik Skultety 04 Oct '21

04 Oct '21

From: Robin Lee <cheeselee(a)fedoraproject.org> This patch makes the descriptions of virStoragePoolCreateFlags annotate to the correct flag in the generated HTML file. --- Resending a merged change from GitLab. include/libvirt/libvirt-storage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index b459fe3e8e..f89856b93e 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -70,6 +70,7 @@ typedef enum { } virStoragePoolDeleteFlags; typedef enum { + /* Create the pool but do not perform pool build */ VIR_STORAGE_POOL_CREATE_NORMAL = 0, /* Create the pool and perform pool build without any flags */ -- 2.31.1

1 0

[PATCH v5 0/4] introduce support for acpi-bridge-hotplug feature
by Ani Sinha 02 Oct '21

02 Oct '21

changelog: v5: rebased the patchset with the latest master. v4: split the original series into two - pci-root controller specific one (https://www.mail-archive.com/libvir-list@redhat.com/msg221645.html) and this one specific to pci bridges. The conf xml has been introduced as per suggestion by Berrange here: https://patchew.org/Libvirt/20210912032631.2853520-1-ani@anisinha.ca Changes has been introduced to parse and validate the xml accordingly as well as to add backend qemu commandline option. v3: reorganized the patches as per Laine's suggestion. Added more details in commit messages. Added conf description in formatdomain.rst. Added changelog for next release. v2: fixed bugs and added additional missing unit tests. v1: initial implementation. Had some bugs and missed some unit tests This change introduces a new libvirt sub-element <pci> under <features> that can be used to configure all pci related features. Currently the only sub-sub element supported by this sub-element is 'acpi-bridge-hotplug' as shown below: <features> <pci> <acpi-bridge-hotplug state='on|off'/> </pci> </features> The above option is only available for qemu driver and that too for x86 guests only. It is a global option. 'acpi-bridge-hotplug' option enables or disables ACPI hotplug support for cold-plugged pci bridges. Examples of bridges include PCI-PCI bridge (pci-bridge controller) or PCIe-PCI bridges for pc machines and pcie-root-port controller for q35 machines. Being global option, no other bridge specific option are required. For pc machine type in x86, this option is available in qemu for a long time, from version 2.1. Please see the following changes in qemu repo: 9e047b982452c6 ("piix4: add acpi pci hotplug support") 133a2da488062e ("pc: acpi: generate AML only for PCI0 devices if PCI bridge hotplug is disabled") For q35 machine type, this was introduced in qemu 6.1 with the following changes in qemu repo: (a) c0e427d6eb5fef ("hw/acpi/ich9: Enable ACPI PCI hot-plug") (b) 17858a16950860 ("hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35") The reasons for enabling ACPI based hotplug for PCIe (q35) based machines (as opposed to native hotplug) are outlined in (b). There are use cases where users would still want to use native hotplug (see notes). Therefore, this config option enables users to choose either ACPI based hotplug or native hotplug for bridges (for example for pcie root port controller in q35 machines). Notes: One concrete example of why one might still want to use native hotplug with pcie-root-port controller is the fact that we are still discovering issues with acpi hotplug on PCIE. One such issue is: https://lists.gnu.org/archive/html/qemu-devel/2021-09/msg02146.html Another reason is that users have been using native hotplug on pcie root ports up until now. They have built and tested their systems based on native hotplug. They may not want to suddenly move to acpi based hotplug just because it is now the default in qemu. Supporting the option to chose one or the other through libvirt makes things simpler for end users. Ani Sinha (4): qemu: capablities: detect presence of acpi-pci-hotplug-with-bridge-support conf: introduce support for acpi-bridge-hotplug feature qemu: command: add support for acpi-bridge-hotplug feature NEWS: add new acpi pci hotplug config option in the release note for next release NEWS.rst | 7 ++ docs/formatdomain.rst | 11 +++ docs/schemas/domaincommon.rng | 15 ++++ src/conf/domain_conf.c | 89 ++++++++++++++++++- src/conf/domain_conf.h | 9 ++ src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 14 +++ src/qemu/qemu_validate.c | 46 ++++++++++ .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 2 + .../aarch64-acpi-hotplug-bridge-disable.err | 1 + .../aarch64-acpi-hotplug-bridge-disable.xml | 33 +++++++ ...pc-i440fx-acpi-hotplug-bridge-disable.args | 31 +++++++ .../pc-i440fx-acpi-hotplug-bridge-disable.err | 1 + .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 33 +++++++ .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 33 +++++++ .../q35-acpi-hotplug-bridge-disable.args | 33 +++++++ .../q35-acpi-hotplug-bridge-disable.err | 1 + .../q35-acpi-hotplug-bridge-disable.xml | 47 ++++++++++ .../q35-acpi-hotplug-bridge-enable.xml | 47 ++++++++++ tests/qemuxml2argvtest.c | 16 ++++ .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 1 + .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 1 + .../q35-acpi-hotplug-bridge-disable.xml | 1 + .../q35-acpi-hotplug-bridge-enable.xml | 1 + tests/qemuxml2xmltest.c | 14 +++ 37 files changed, 503 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml -- 2.25.1

1 4

[libvirt PATCH v5 0/7] Add a PCI/PCIe device VPD Capability
by Dmitrii Shcherbakov 01 Oct '21

01 Oct '21

Add support for deserializing the binary PCI/PCIe VPD format and exposing VPD resources as XML elements in a new nested capability of PCI/PCIe devices called 'vpd'. The series contains the following incremental changes: * The PCI VPD parser module, in-memory resource representation and tests; * VPD-related helpers added to the virpci module; * VPD capability support: XML serialization/deserialization from/into VPD resource data structures; * Documentation. The VPD format is specified in "I.3. VPD Definitions" in PCI specs (2.2+) and "6.28.1 VPD Format" PCIe 4.0. As section 6.28 in PCIe 4.0 notes, the PCI Local Bus and PCIe VPD formats are binary compatible and PCIe 4.0 merely started incorporating what was already present in PCI specs. Linux kernel exposes a binary blob in the VPD format via sysfs since v2.6.26 (commit 94e6108803469a37ee1e3c92dafdd1d59298602f) which requires a parser to interpret. There are usage scenarios where information such as the board serial number needs to be retrieved from PCI(e) VPD. Projects like Nova can utilize this information for cases which involve virtual interface plugging on SmartNIC DPUs but there may be other scenarios and types of information useful to retrieve from VPD. The fact that the format is binary requires proper parsing instead of substring searching hence the full parser is proposed. Likewise, checksum validation requires proper parsing as well. A usage example is present here: https://review.opendev.org/c/openstack/nova/+/808199 The patch follows a prior discussion on the mailing list which has additional context about the use-case but a narrower proposal: https://listman.redhat.com/archives/libvir-list/2021-May/msg00873.html https://www.mail-archive.com/libvir-list@redhat.com/msg218165.html The new functionality is mostly contained in virpcivpd with a couple of new functions added to virpci. Additionally, the necessary XML serialization/deserialization and glue code is added to expose the VPD capability to external clients as XML. A new capability flag is added along with a new capability in order to allow for filtering of PCI devices with the VPD capability using virsh: virsh nodedev-list --cap vpd sudo virsh nodedev-dumpxml --device pci_dddd_bb_ss_f In this example having the root uid is required in order to access the vpd sysfs entry, therefore, the nodedev XML output will only contain the VPD capability if virsh is run as root. The capability is treated as dynamic due to the presence of read-write sections in the VPD format per PCI/PCIe specs (the idea being that read-write resource fields may potentially be altered by the DPU OS over time independently from the host OS). Unit tests cover the parser functionality (including many possible invalid cases), in-memory representation as well as XML serialization and deserialization. Manual functional testing was performed with 2 DPUs and several other NIC models which expose PCI(e) VPD. Testing have also been performed for devices that do not have VPD or those that expose a VPD capability but exhibit invalid behavior (I/O errors while reading a sysfs entry). Per the existing guidelines, the implementation relies heavily on glib for various purposes. https://libvirt.org/glib-adoption.html * v5 fixes a couple of minor typos and adds NEWS entries. * The v4 of the patch includes a number of fixes compared to v3: * Fixed the patch to correctly build against older glib (2.56.0); * Notably, glib commit 86c073dba9d82ef3f1bc3d3116b058b9b5c3b1eb (in 2.59.0) fixes g_autolist support for derivable Glib types. To make things work in 2.56.0 a workaround is conditionally applied; * virCreateAnonymousFile now uses a temporary file which is unlinked after creation instead of memfd because OpenSUSE 15.2 does not have support memfd; * Keyword resources now use GTree instead of GHashTable as the underlying data structure: * This allows for stable ordering which is important for XML2XML tests as they were failing with when GLib versions were different, resulting in a different ordering of elements; * The keyword resource iteration function was complex and got replaced by a simpler g_tree_foreach-based approach; * Added more testing: functions added to virpci are now assessed by creating a mocked vpd file under a mocked sysfs structure while the parser is still tested in virpcivpdtest file; * Refactoring: * Applied changes based on the indent tool operation with some post-processing; * Renamed functions which had the Glib naming style to use camel case where possible. Auto-generated declarations are an exception: gobject/gtype.h defines type_name##_init, type_name##_class_init, module_obj_name##_get_type functions which were left unchanged; * camelCase is now used for local variables and function parameters; * Replaced //-style comments with multi-line ones; * Split out one patch into 4 based on distinct features: * PCI VPD parser functionality and the respective in-memory types; * VPD helpers in virpci; * XML serialization/deserialization and VPD capability support; * Documentation. Build & test results for targets in ci/manifest.yaml: ci/helper test --meson-args='-Dexpensive_tests=enabled' <target> https://gist.github.com/dshcherb/225b5da9478275f08c220487814ffd1c Dmitrii Shcherbakov (7): Add a PCI/PCIe device VPD Parser News: Add a PCI VPD parser Add PCI VPD-related helper functions to virpci News: Add PCI VPD-related helper functions to virpci Add PCI VPD Capability Support News: Add PCI VPD capability support Add PCI VPD Capability Documentation NEWS.rst | 22 + build-aux/syntax-check.mk | 4 +- docs/drvnodedev.html.in | 46 ++ docs/formatnode.html.in | 24 +- docs/schemas/nodedev.rng | 40 + include/libvirt/libvirt-nodedev.h | 1 + po/POTFILES.in | 1 + src/conf/node_device_conf.c | 271 +++++++ src/conf/node_device_conf.h | 6 +- src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 17 + src/node_device/node_device_driver.c | 2 + src/node_device/node_device_udev.c | 2 + src/util/meson.build | 1 + src/util/virpci.c | 62 ++ src/util/virpci.h | 3 + src/util/virpcivpd.c | 755 ++++++++++++++++++ src/util/virpcivpd.h | 117 +++ src/util/virpcivpdpriv.h | 45 ++ tests/meson.build | 1 + .../pci_0000_42_00_0_vpd.xml | 33 + .../pci_0000_42_00_0_vpd.xml | 1 + tests/nodedevxml2xmltest.c | 1 + tests/testutils.c | 40 + tests/testutils.h | 4 + tests/virpcimock.c | 30 + tests/virpcitest.c | 64 ++ tests/virpcivpdtest.c | 705 ++++++++++++++++ tools/virsh-nodedev.c | 3 + 29 files changed, 2303 insertions(+), 5 deletions(-) create mode 100644 src/util/virpcivpd.c create mode 100644 src/util/virpcivpd.h create mode 100644 src/util/virpcivpdpriv.h create mode 100644 tests/nodedevschemadata/pci_0000_42_00_0_vpd.xml create mode 120000 tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml create mode 100644 tests/virpcivpdtest.c -- 2.30.2

3 23

Release of libvirt-7.8.0
by Jiri Denemark 01 Oct '21

01 Oct '21

The 7.8.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * New features * nodedev: Add ability to automatically start mediated devices The autostart status of a persistent mediated devices can be managed with the new APIs ``virNodeDeviceSetAutostart()`` and ``virNodeDeviceGetAutostart()``. The corresponding virsh command is ``nodedev-autostart``. In addition, two new APIs were added to get additional information about node devices: ``virNodeDeviceIsPersistent()`` checks whether the device is persistently defined, and ``virNodeDeviceIsActive()`` checks whether the node device is currently active. This information can also be retrieved with the new virsh command ``nodedev-info``. Enjoy. Jirka

1 0

[PATCH] conf: fix block type CDROM cannot support startupPolicy
by Jie Wang 01 Oct '21

01 Oct '21

block type CDROM also support startupPolicy in the past, so let us fix it. Signed-off-by: Jie Wang <wangjie88(a)huawei.com> --- src/conf/domain_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f7025bffe4..dd374e8ab3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30853,9 +30853,10 @@ virDomainDiskTranslateSourcePool(virDomainDiskDef *def) } if (def->startupPolicy != 0 && - virStorageSourceGetActualType(def->src) != VIR_STORAGE_TYPE_FILE) { + (virStorageSourceGetActualType(def->src) != VIR_STORAGE_TYPE_FILE && + virStorageSourceGetActualType(def->src) != VIR_STORAGE_TYPE_BLOCK)) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("'startupPolicy' is only valid for 'file' type volume")); + _("'startupPolicy' is only valid for 'file' or 'block' type volume")); return -1; } -- 2.24.0.windows.2

3 2

Re: [PATCH] failover: allow to pause the VM during the migration
by Laine Stump 01 Oct '21

01 Oct '21

On 9/30/21 1:09 PM, Laurent Vivier wrote: > If we want to save a snapshot of a VM to a file, we used to follow the > following steps: > > 1- stop the VM: > (qemu) stop > > 2- migrate the VM to a file: > (qemu) migrate "exec:cat > snapshot" > > 3- resume the VM: > (qemu) cont > > After that we can restore the snapshot with: > qemu-system-x86_64 ... -incoming "exec:cat snapshot" > (qemu) cont This is the basics of what libvirt does for a snapshot, and steps 1+2 are what it does for a "managedsave" (where it saves the snapshot to disk and then terminates the qemu process, for later re-animation). In those cases, it seems like this new parameter could work for us - instead of explicitly pausing the guest prior to migrating it to disk, we would set this new parameter to on, then directly migrate-to-disk (relying on qemu to do the pause). Care will need to be taken to assure that error recovery behaves the same though. There are a couple of cases when libvirt apparently *doesn't* pause the guest during the migrate-to-disk, both having to do with saving a coredump of the guest. Since I really have no idea of how common/important that is (or even if my assessment of the code is correct), I'm Cc'ing this patch to libvir-list to make sure it catches the attention of someone who knows the answers and implications. > But when failover is configured, it doesn't work anymore. > > As the failover needs to ask the guest OS to unplug the card > the machine cannot be paused. > > This patch introduces a new migration parameter, "pause-vm", that > asks the migration to pause the VM during the migration startup > phase after the the card is unplugged. > > Once the migration is done, we only need to resume the VM with > "cont" and the card is plugged back: > > 1- set the parameter: > (qemu) migrate_set_parameter pause-vm on > > 2- migrate the VM to a file: > (qemu) migrate "exec:cat > snapshot" > > The primary failover card (VFIO) is unplugged and the VM is paused. > > 3- resume the VM: > (qemu) cont > > The VM restarts and the primary failover card is plugged back > > The VM state sent in the migration stream is "paused", it means > when the snapshot is loaded or if the stream is sent to a destination > QEMU, the VM needs to be resumed manually. > > Signed-off-by: Laurent Vivier <lvivier(a)redhat.com> > --- > qapi/migration.json | 20 +++++++++++++++--- > include/hw/virtio/virtio-net.h | 1 + > hw/net/virtio-net.c | 33 ++++++++++++++++++++++++++++++ > migration/migration.c | 37 +++++++++++++++++++++++++++++++++- > monitor/hmp-cmds.c | 8 ++++++++ > 5 files changed, 95 insertions(+), 4 deletions(-) > > diff --git a/qapi/migration.json b/qapi/migration.json > index 88f07baedd06..86284d96ad2a 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -743,6 +743,10 @@ > # block device name if there is one, and to their node name > # otherwise. (Since 5.2) > # > +# @pause-vm: Pause the virtual machine before doing the migration. > +# This allows QEMU to unplug a card before doing the > +# migration as it depends on the guest kernel. (since 6.2) > +# > # Since: 2.4 > ## > { 'enum': 'MigrationParameter', > @@ -758,7 +762,7 @@ > 'xbzrle-cache-size', 'max-postcopy-bandwidth', > 'max-cpu-throttle', 'multifd-compression', > 'multifd-zlib-level' ,'multifd-zstd-level', > - 'block-bitmap-mapping' ] } > + 'block-bitmap-mapping', 'pause-vm' ] } > > ## > # @MigrateSetParameters: > @@ -903,6 +907,10 @@ > # block device name if there is one, and to their node name > # otherwise. (Since 5.2) > # > +# @pause-vm: Pause the virtual machine before doing the migration. > +# This allows QEMU to unplug a card before doing the > +# migration as it depends on the guest kernel. (since 6.2) > +# > # Since: 2.4 > ## > # TODO either fuse back into MigrationParameters, or make > @@ -934,7 +942,8 @@ > '*multifd-compression': 'MultiFDCompression', > '*multifd-zlib-level': 'uint8', > '*multifd-zstd-level': 'uint8', > - '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ] } } > + '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ], > + '*pause-vm': 'bool' } } > > ## > # @migrate-set-parameters: > @@ -1099,6 +1108,10 @@ > # block device name if there is one, and to their node name > # otherwise. (Since 5.2) > # > +# @pause-vm: Pause the virtual machine before doing the migration. > +# This allows QEMU to unplug a card before doing the > +# migration as it depends on the guest kernel. (since 6.2) > +# > # Since: 2.4 > ## > { 'struct': 'MigrationParameters', > @@ -1128,7 +1141,8 @@ > '*multifd-compression': 'MultiFDCompression', > '*multifd-zlib-level': 'uint8', > '*multifd-zstd-level': 'uint8', > - '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ] } } > + '*block-bitmap-mapping': [ 'BitmapMigrationNodeAlias' ], > + '*pause-vm': 'bool' } } > > ## > # @query-migrate-parameters: > diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h > index 824a69c23f06..a6c186e28b45 100644 > --- a/include/hw/virtio/virtio-net.h > +++ b/include/hw/virtio/virtio-net.h > @@ -210,6 +210,7 @@ struct VirtIONet { > bool failover; > DeviceListener primary_listener; > Notifier migration_state; > + VMChangeStateEntry *vm_state; > VirtioNetRssData rss_data; > struct NetRxPkt *rx_pkt; > struct EBPFRSSContext ebpf_rss; > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index f205331dcf8c..c83364eac47b 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -39,6 +39,7 @@ > #include "migration/misc.h" > #include "standard-headers/linux/ethtool.h" > #include "sysemu/sysemu.h" > +#include "sysemu/runstate.h" > #include "trace.h" > #include "monitor/qdev.h" > #include "hw/pci/pci.h" > @@ -3303,6 +3304,35 @@ static void virtio_net_migration_state_notifier(Notifier *notifier, void *data) > virtio_net_handle_migration_primary(n, s); > } > > +static void virtio_net_failover_restart_cb(void *opaque, bool running, > + RunState state) > +{ > + DeviceState *dev; > + VirtIONet *n = opaque; > + Error *err = NULL; > + PCIDevice *pdev; > + > + if (!running) { > + return; > + } > + > + dev = failover_find_primary_device(n); > + if (!dev) { > + return; > + } > + > + pdev = PCI_DEVICE(dev); > + if (!pdev->partially_hotplugged) { > + return; > + } > + > + if (!failover_replug_primary(n, dev, &err)) { > + if (err) { > + error_report_err(err); > + } > + } > +} > + > static bool failover_hide_primary_device(DeviceListener *listener, > QemuOpts *device_opts) > { > @@ -3360,6 +3390,8 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) > device_listener_register(&n->primary_listener); > n->migration_state.notify = virtio_net_migration_state_notifier; > add_migration_state_change_notifier(&n->migration_state); > + n->vm_state = qemu_add_vm_change_state_handler( > + virtio_net_failover_restart_cb, n); > n->host_features |= (1ULL << VIRTIO_NET_F_STANDBY); > } > > @@ -3508,6 +3540,7 @@ static void virtio_net_device_unrealize(DeviceState *dev) > if (n->failover) { > device_listener_unregister(&n->primary_listener); > remove_migration_state_change_notifier(&n->migration_state); > + qemu_del_vm_change_state_handler(n->vm_state); > } > > max_queues = n->multiqueue ? n->max_queues : 1; > diff --git a/migration/migration.c b/migration/migration.c > index bb909781b7f5..9c96986d4abf 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -901,6 +901,9 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) > s->parameters.block_bitmap_mapping); > } > > + params->has_pause_vm = true; > + params->pause_vm = s->parameters.pause_vm; > + > return params; > } > > @@ -1549,6 +1552,11 @@ static void migrate_params_test_apply(MigrateSetParameters *params, > dest->has_block_bitmap_mapping = true; > dest->block_bitmap_mapping = params->block_bitmap_mapping; > } > + > + if (params->has_pause_vm) { > + dest->has_pause_vm = true; > + dest->pause_vm = params->pause_vm; > + } > } > > static void migrate_params_apply(MigrateSetParameters *params, Error **errp) > @@ -1671,6 +1679,10 @@ static void migrate_params_apply(MigrateSetParameters *params, Error **errp) > QAPI_CLONE(BitmapMigrationNodeAliasList, > params->block_bitmap_mapping); > } > + > + if (params->has_pause_vm) { > + s->parameters.pause_vm = params->pause_vm; > + } > } > > void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp) > @@ -1718,6 +1730,12 @@ void qmp_migrate_start_postcopy(Error **errp) > " started"); > return; > } > + > + if (s->parameters.pause_vm) { > + error_setg(errp, "Postcopy cannot be started if pause-vm is on"); > + return; > + } > + > /* > * we don't error if migration has finished since that would be racy > * with issuing this command. > @@ -3734,13 +3752,27 @@ static void qemu_savevm_wait_unplug(MigrationState *s, int old_state, > "failure"); > } > } > - > migrate_set_state(&s->state, MIGRATION_STATUS_WAIT_UNPLUG, new_state); > } else { > migrate_set_state(&s->state, old_state, new_state); > } > } > > +/* stop the VM before starting the migration but after device unplug */ > +static void pause_vm_after_unplug(MigrationState *s) > +{ > + if (s->parameters.pause_vm) { > + qemu_mutex_lock_iothread(); > + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); > + s->vm_was_running = runstate_is_running(); > + if (vm_stop_force_state(RUN_STATE_PAUSED)) { > + migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE, > + MIGRATION_STATUS_FAILED); > + } > + qemu_mutex_unlock_iothread(); > + } > +} > + > /* > * Master migration thread on the source VM. > * It drives the migration and pumps the data down the outgoing channel. > @@ -3790,6 +3822,8 @@ static void *migration_thread(void *opaque) > qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP, > MIGRATION_STATUS_ACTIVE); > > + pause_vm_after_unplug(s); > + > s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start; > > trace_migration_thread_setup_complete(); > @@ -4265,6 +4299,7 @@ static void migration_instance_init(Object *obj) > params->has_announce_max = true; > params->has_announce_rounds = true; > params->has_announce_step = true; > + params->has_pause_vm = true; > > qemu_sem_init(&ms->postcopy_pause_sem, 0); > qemu_sem_init(&ms->postcopy_pause_rp_sem, 0); > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index b5e71d9e6f52..71bc8c15335b 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -513,6 +513,10 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) > } > } > } > + > + monitor_printf(mon, "%s: %s\n", > + MigrationParameter_str(MIGRATION_PARAMETER_PAUSE_VM), > + params->pause_vm ? "on" : "off"); > } > > qapi_free_MigrationParameters(params); > @@ -1399,6 +1403,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) > error_setg(&err, "The block-bitmap-mapping parameter can only be set " > "through QMP"); > break; > + case MIGRATION_PARAMETER_PAUSE_VM: > + p->has_pause_vm = true; > + visit_type_bool(v, param, &p->pause_vm, &err); > + break; > default: > assert(0); > } >

4 3

translating CD-ROM device paths from i440fx to Q35 in virt-v2v (was: test-v2v-cdrom: update the CD-ROM's bus to SATA in the converted domain)
by Laszlo Ersek 30 Sep '21

30 Sep '21

(+libvirt-devel) On 09/29/21 21:22, Richard W.M. Jones wrote: > We currently partially install the virtio block drivers in the Windows > guest (just enough to get the guest to boot on the target), and > Windows itself re-installs the virtio block driver and other drivers > it needs, and that's enough to get it to see C: > > As for other hard disk partitions, Windows does indeed contain a > mapping to other drives in the Registry but IIRC it's not sensitive to > the device driver (unlike Linux /dev/vdX vs /dev/sdX). If you're > interested in that, see libguestfs.git/daemon/inspect_fs_windows.ml: > get_drive_mappings. We never bothered with attempting to handle > conversion of floppy drives or CD-ROMs for Windows. OK. So AIUI, that means no work is needed here for Windows. > On Linux we do better: We iterate over all the configuration files in > /etc and change device paths. The significance of this bug is we need > to change (eg) /dev/hdc to /dev/<something>. The difficulty is > working out where the device will appear on the target and not having > it conflict with any hard disk, something we partly control (see > virt-v2v.git/convert/target_bus_assignment.ml*) AIUI the conflict avoidance logic ("no overlapping disks") is already in place. The question is how to translate device paths in /etc/fstab and similar. Please correct me if I'm wrong: at the moment, I believe virt-v2v parses and manipulates the following elements and attributes in the domain XML: <target dev='hda' bus='ide'/> <target dev='hdb' bus='ide'/> <target dev='hdc' bus='ide'/> <target dev='hdd' bus='ide'/> ^^^ ^^^ My understanding is however that the target/@dev attribute is mostly irrelevant: https://libvirt.org/formatdomain.html#hard-drives-floppy-disks-cdroms The dev attribute indicates the "logical" device name. The actual device name specified is not guaranteed to map to the device name in the guest OS. Treat it as a device ordering hint. [...] What actually matters is the target/@bus attribute, in combination with the sibling element <address>. Such as: <target dev='hda' bus='ide'/> ^^^ <address type='drive' controller='0' bus='0' target='0' unit='0'/> ^ ^ ^ <target dev='hdb' bus='ide'/> ^^^ <address type='drive' controller='0' bus='0' target='0' unit='1'/> ^ ^ ^ <target dev='hdc' bus='ide'/> ^^^ <address type='drive' controller='0' bus='1' target='0' unit='0'/> ^ ^ ^ <target dev='hdd' bus='ide'/> ^^^ <address type='drive' controller='0' bus='1' target='0' unit='1'/> ^ ^ ^ So, target/@dev should be mostly ignored; what matters is the following tuple: (target/@bus, address/@controller, address/@bus, address/@unit) Extracting just the tuples: (ide, 0, 0, 0) (ide, 0, 0, 1) (ide, 0, 1, 0) (ide, 0, 1, 1) The first two components of each tuple -- i.e., (ide, 0) -- refer to the following IDE controller: <controller type='ide' index='0'> ^^^^^^^^^^ ^^^^^^^^^ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> and then the rest of the components, such as (0, 0), (0, 1), (1, 0), (1, 1), identify the disk on that IDE controller. (Side comment: the PCI location of the (first) IDE controller is fixed in QEMU; if one tries to change it, libvirt complains: "Primary IDE controller must have PCI address 0:0:1.1".) (Side comment: on the QEMU command line, this maps to -device ide-cd,bus=ide.0,unit=0,... \ -device ide-cd,bus=ide.0,unit=1,... \ -device ide-cd,bus=ide.1,unit=0,... \ -device ide-cd,bus=ide.1,unit=1,... \ ) Inside the guest, /dev/hd* nodes don't even exist, so it's unlikely that /etc/fstab would refer to them. /etc/fstab can however refer to symlinks under "/dev/disk/by-id" (for example): lrwxrwxrwx. 1 root root 9 Sep 30 11:54 ata-QEMU_DVD-ROM_QM00001 -> ../../sr0 lrwxrwxrwx. 1 root root 9 Sep 30 11:54 ata-QEMU_DVD-ROM_QM00002 -> ../../sr1 lrwxrwxrwx. 1 root root 9 Sep 30 11:54 ata-QEMU_DVD-ROM_QM00003 -> ../../sr2 lrwxrwxrwx. 1 root root 9 Sep 30 11:54 ata-QEMU_DVD-ROM_QM00004 -> ../../sr3 Furthermore, we have pseudo-files (directories) such as: /sys/devices/pci0000:00/0000:00:01.1/ata1/host0/target0:0:0/0:0:0:0/block/sr0 /sys/devices/pci0000:00/0000:00:01.1/ata1/host0/target0:0:1/0:0:1:0/block/sr1 /sys/devices/pci0000:00/0000:00:01.1/ata2/host1/target1:0:0/1:0:0:0/block/sr2 /sys/devices/pci0000:00/0000:00:01.1/ata2/host1/target1:0:1/1:0:1:0/block/sr3 ^ ^ So in order to map a device path from the original guest's "/etc/fstab", such as "/dev/disk/by-id/ata-QEMU_DVD-ROM_QM00003", to the original domain XML's <disk> element, we have to do the following in the "source" appliance: NODE=$(realpath /dev/disk/by-id/ata-QEMU_DVD-ROM_QM00003) # -> /dev/sr2 NODE=${NODE#/dev/} # -> sr2 DEVPATH=$(ls -d /sys/devices/pci0000:00/0000:00:01.1/ata?/host?/target?:0:?/?:0:?:0/block/$NODE) # -> /sys/devices/pci0000:00/0000:00:01.1/ata2/host1/target1:0:0/1:0:0:0/block/sr2 And then map the "1:0:0:0" pathname component from $DEVPATH to: <target dev='hdc' bus='ide'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> ^^^^^^^ ^^^^^^^^ [1]:0:0:0 1:0:[0]:0 in the original domain XML. This tells us under what device node the original guest sees the host-side file (<source> element). After conversion, on the Q35 board, the inverse mapping is needed. We start from the domain XML, <target dev='sd*' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> <target dev='sd*' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> <target dev='sd*' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='2'/> <target dev='sd*' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='3'/> <target dev='sd*' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='4'/> <target dev='sd*' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='5'/> <controller type='sata' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> </controller> (Side comment: the PCI B/D/F of the SATA controller is also fixed in QEMU; otherwise libvirt complains: "Primary SATA controller must have PCI address 0:0:1f.2".) (Side comment: the QEMU command line is -device ide-cd,bus=ide.0,... \ -device ide-cd,bus=ide.1,... \ -device ide-cd,bus=ide.2,... \ -device ide-cd,bus=ide.3,... \ -device ide-cd,bus=ide.4,... \ -device ide-cd,bus=ide.5,... \ ) In the guest we have: /sys/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sr0 /sys/devices/pci0000:00/0000:00:1f.2/ata2/host1/target1:0:0/1:0:0:0/block/sr1 /sys/devices/pci0000:00/0000:00:1f.2/ata3/host2/target2:0:0/2:0:0:0/block/sr2 /sys/devices/pci0000:00/0000:00:1f.2/ata4/host3/target3:0:0/3:0:0:0/block/sr3 /sys/devices/pci0000:00/0000:00:1f.2/ata5/host4/target4:0:0/4:0:0:0/block/sr4 /sys/devices/pci0000:00/0000:00:1f.2/ata6/host5/target5:0:0/5:0:0:0/block/sr5 So, assuming we mapped the original (i440fx) "/dev/disk/by-id/ata-QEMU_DVD-ROM_QM00003" guest device path to some <source> element (= host-side file) in the original domain XML, and assuming virt-v2v assigned the same <source> element to the following element on the Q35 board: <target dev='sd*' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='4'/> ^^^^^^^^ we find the device node in the destination appliance as follows: NODE=$(basename /sys/devices/pci0000:00/0000:00:1f.2/ata?/host?/target?:0:0/4:0:0:0/block/*) ^ unit='4' # -> sr4 and then replace "/dev/disk/by-id/ata-QEMU_DVD-ROM_QM00003" with "/dev/sr4" in "/etc/fstab". All this requires virt-v2v to parse complete <address> elements from the original domain XML, and to generate complete <address> elements in the destination domain XML. Is that feasible? The @wwn and @serial attributes don't look safe to me, because the guest could refer to them even when the original domain XML does not spell them out (eg. "QM00003" is such a @serial). So neither can we trust that a @serial is present in the original XML, nor can we just go ahead and generate a @serial if it is absent. (The generation step could immediately break references such as "QM00003" in the guest.) /dev/disk/by-label and /dev/disk/by-uuid are based on media contents, and multiple CD-ROMs may (read-only) map the same host-side file, so those are not good for mapping either, I think. Also does not cover CD-ROM devices that are empty (have no medium) at the time of conversion, but "/etc/fstab" still refers to them (potentially with "noauto"). So I think the only reliable ID is the hardware device path. ... Now if *that* needs to work when the original guest comes from a different management application than libvirt, then I have no idea. The original address (PCI B/D/F of the IDE controller, and IDE bus and unit of the drive) need to be known somehow; otherwise we cannot associate the guest-side "/dev/..." reference with the host-side file underlying that CD-ROM. Thanks, Laszlo

3 3

[PATCH v3 0/5] Add support for two i386 pm options which control acpi hotplug
by Ani Sinha 30 Sep '21

30 Sep '21

Hi all: This patchset introduces libvirt xml support for the following two pm conf options: <pm> <acpi-hotplug-bridge enabled='no'/> <acpi-root-hotplug enabled='yes'/> </pm> The above two options are only available for qemu driver and that too for x86 guests only. Both of them are global options. ``acpi-hotplug-bridge`` option enables or disables ACPI hotplug support for cold plugged bridges. Examples of cold plugged bridges include PCI-PCI bridge (pci-bridge controller) for pc machines and pcie-root-port controller for q35 machines. The corresponding commandline options to qemu for x86 guests are: (pc machines): -global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=<off/on> (q35 machines): -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=<off/on> Being global options, no other bridge specific options for pci-bridge controller or pcie-root-port controllers are required. For pc machine type in x86, this option is available in qemu for a long time, from version 2.1. Please see the changes in qemu.git: 9e047b982452c6 ("piix4: add acpi pci hotplug support") 133a2da488062e ("pc: acpi: generate AML only for PCI0 devices if PCI bridge hotplug is disabled") For q35 machine type, this was introduced in qemu 6.1 with the following changes in qemu.git: (a) c0e427d6eb5fef ("hw/acpi/ich9: Enable ACPI PCI hot-plug") (b) 17858a16950860 ("hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35") The reasons for enabling ACPI based hotplug for PCIe (q35) based machines (as opposed to native hotplug) for bridges are outlined in (b). It is possible that some users might still want to use native hotplug on PCIe [1]. Therefore, this conf option enables users to choose either ACPI based hotplug or native hotplug for cold plugged bridges (for example for pcie root port controller in q35 machines). ``acpi-root-hotplug`` option enables or disables ACPI based hotplug for PCI root bus (pci-root controller). This option is only available for pc machine type. The corresponding commandline option to qemu for x86 guests is: -global PIIX4_PM.acpi-root-pci-hotplug=<off/on> This additional option enables users to disable hotplug for all devices in the system without adding an additional PCI-PCI bridge, putting the devices behind the bridge and using the existing ``acpi-hotplug-bridge`` option to disable hotplug on that bridge. This feature was introduced from qemu version 5.2 with the following change in qemu.git: 3d7e78aa7777f ("Introduce a new flag for i440fx to disable PCI hotplug on the root bus") The above qemu commit describes some compelling reasons why users might to disable hotplug on PCI root buses [2]. A brief summary of the patches: >[PATCH v3 1/5] qemu: capablities: detect presence of >[PATCH v3 2/5] qemu: capablities: detect presence of Patches 1 and 2 implement support for qemu capability checks for the above config options. >[PATCH v3 3/5] conf: introduce acpi-hotplug-bridge and Patch 3 actually adds the config option to the schema and adds related unit tests. >[PATCH v3 4/5] qemu: command: add support for qemu options that Patch 4 adds the backend qemu commandline support for the options. It also adds relevant unit tests for the same. >[PATCH v3 5/5] NEWS: add new acpi pci hotplug options in the release Patch 5 adds the release notes for the next libvirt release. Changelog: v1: initial implementation. Had some bugs and missed some unit tests. v2: fixed bugs and added additional missing unit tests. v3: reorganized the patches as per Laine's suggestion. Added more details in commit messages. Added conf description in formatdomain.rst. Added changelog for next release. Notes: [1] One concrete example of why one might still want to use native hotplug with pcie-root-port controller is the fact that we are still discovering issues with acpi hotplug on PCIE. One such issue is: https://lists.gnu.org/archive/html/qemu-devel/2021-09/msg02146.html Another reason is that users have been using native hotplug on pcie root ports up until now. They have built and tested their systems based on native hotplug. They may not want to suddenly move to acpi based hotplug just because it is now the default in qemu. Supporting the option to chose one or the other through libvirt makes things simpler for end users. [2] The use case scenario described by Laine in https://listman.redhat.com/archives/libvir-list/2020-February/msg00110.html intentionally does not discuss i440fx and focusses solely on q35. I do realize that redhat has moved on from i440fx and currently efforts for new features are concentrated on q35 machines only. We have had some hard debates on this on the qemu mailing list before. The fact of the matter is that i440fx is not at 1-1 parity with q35. There are many users who are currenly using i440fx and are simply not ready to move to q35 without sacrificing some existing features they support today. For example https://wiki.qemu.org/images/4/4e/Q35.pdf lists some of q35 limitations. https://www.linux-kvm.org/images/0/06/2012-forum-Q35.pdf provides more information on the differences. Hence we need to solve the issue Laine has described in the above email for i440fx without adding additional bridges. Further, in Daniel Berrange's words from : https://lists.gnu.org/archive/html/qemu-devel/2020-04/msg03012.html "From the upstream POV, there's been no decision / agreement to phase out PIIX, this is purely a RHEL downstream decision & plan. If other distros / users have a different POV, and find the feature useful, we should accept the patch if it meets the normal QEMU patch requirements. " Also to be noted that I have already experimented this qemu commandline option using libvirt passthrough feature as has been documented in http://blog.vmsplice.net/2011/04/how-to-pass-qemu-command-line-options.html This was only meant to be a short term solution until libvirt started supporting this natively. Supporting this option through libvirt would simplify their use case as well as add capability validations and graceful failure scenarios in case qemu did not support the option. [3] Finally, I implemented support for ``acpi-root-hotplug`` option in Qemu. Since adding the support for this option, I have not run away :-) I am still around, fixing other issues in the same subsystem in qemu and also now I have added myself as a reviewer of patches in this area. I will also be trying to support/maintain this new xml conf option in libvirt to the extent I can in future with the help of other experienced maintainers. Obviously this is all freelance work at this moment and is highly dependent on available free time.

4 42

[PATCH] qemuDomainChangeDiskLive: Modify 'startupPolicy' before changing source
by Peter Krempa 30 Sep '21

30 Sep '21

We don't support all startup policies with all source types so to correctly allow switching from a 'file' based cdrom with 'optional' startup policy to a 'block' based one which doesn't support optional we must update the startup policy field first. Obviously we need to have fallback if the update fails. Reported-by: Vojtech Juranek <vjuranek(a)redhat.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bd41ddbc3c..dfc27572c4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7038,6 +7038,7 @@ qemuDomainChangeDiskLive(virDomainObj *vm, { virDomainDiskDef *disk = dev->data.disk; virDomainDiskDef *orig_disk = NULL; + virDomainStartupPolicy origStartupPolicy; virDomainDeviceDef oldDev = { .type = dev->type }; if (!(orig_disk = virDomainDiskByTarget(vm->def, disk->dst))) { @@ -7047,6 +7048,7 @@ qemuDomainChangeDiskLive(virDomainObj *vm, } oldDev.data.disk = orig_disk; + origStartupPolicy = orig_disk->startupPolicy; if (virDomainDefCompatibleDevice(vm->def, dev, &oldDev, VIR_DOMAIN_DEVICE_ACTION_UPDATE, true) < 0) @@ -7065,13 +7067,20 @@ qemuDomainChangeDiskLive(virDomainObj *vm, return -1; } + /* update startup policy first before updating disk image */ + orig_disk->startupPolicy = dev->data.disk->startupPolicy; + if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, - dev->data.disk->src, force) < 0) + dev->data.disk->src, force) < 0) { + /* revert startup policy before failing */ + orig_disk->startupPolicy = origStartupPolicy; return -1; + } dev->data.disk->src = NULL; } + /* in case when we aren't updating disk source we update startup policy here */ orig_disk->startupPolicy = dev->data.disk->startupPolicy; orig_disk->snapshot = dev->data.disk->snapshot; -- 2.31.1

5 8

[PATCH v4 0/4] introduce support for acpi-bridge-hotplug feature
by Ani Sinha 30 Sep '21

30 Sep '21

changelog: v4: split the original series into two - pci-root controller specific one (https://www.mail-archive.com/libvir-list@redhat.com/msg221645.html) and this one specific to pci bridges. The conf xml has been introduced as per suggestion by Berrange here: https://patchew.org/Libvirt/20210912032631.2853520-1-ani@anisinha.ca Changes has been introduced to parse and validate the xml accordingly as well as to add backend qemu commandline option. v3: reorganized the patches as per Laine's suggestion. Added more details in commit messages. Added conf description in formatdomain.rst. Added changelog for next release. v2: fixed bugs and added additional missing unit tests. v1: initial implementation. Had some bugs and missed some unit tests This change introduces a new libvirt sub-element <pci> under <features> that can be used to configure all pci related features. Currently the only sub-sub element supported by this sub-element is 'acpi-bridge-hotplug' as shown below: <features> <pci> <acpi-bridge-hotplug state='on|off'/> </pci> </features> The above option is only available for qemu driver and that too for x86 guests only. It is a global option. 'acpi-bridge-hotplug' option enables or disables ACPI hotplug support for cold-plugged pci bridges. Examples of bridges include PCI-PCI bridge (pci-bridge controller) or PCIe-PCI bridges for pc machines and pcie-root-port controller for q35 machines. Being global option, no other bridge specific option are required. For pc machine type in x86, this option is available in qemu for a long time, from version 2.1. Please see the following changes in qemu repo: 9e047b982452c6 ("piix4: add acpi pci hotplug support") 133a2da488062e ("pc: acpi: generate AML only for PCI0 devices if PCI bridge hotplug is disabled") For q35 machine type, this was introduced in qemu 6.1 with the following changes in qemu repo: (a) c0e427d6eb5fef ("hw/acpi/ich9: Enable ACPI PCI hot-plug") (b) 17858a16950860 ("hw/acpi/ich9: Set ACPI PCI hot-plug as default on Q35") The reasons for enabling ACPI based hotplug for PCIe (q35) based machines (as opposed to native hotplug) are outlined in (b). There are use cases where users would still want to use native hotplug. Therefore, this config option enables users to choose either ACPI based hotplug or native hotplug for bridges (for example for pcie root port controller in q35 machines). Ani Sinha (4): qemu: capablities: detect presence of acpi-pci-hotplug-with-bridge-support conf: introduce support for acpi-bridge-hotplug feature qemu: command: add support for acpi-bridge-hotplug feature NEWS: add new acpi pci hotplug config option in the release note for next release NEWS.rst | 7 ++ docs/formatdomain.rst | 11 +++ docs/schemas/domaincommon.rng | 15 ++++ src/conf/domain_conf.c | 89 ++++++++++++++++++- src/conf/domain_conf.h | 9 ++ src/qemu/qemu_capabilities.c | 6 ++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 14 +++ src/qemu/qemu_validate.c | 46 ++++++++++ .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 2 + .../aarch64-acpi-hotplug-bridge-disable.err | 1 + .../aarch64-acpi-hotplug-bridge-disable.xml | 33 +++++++ ...pc-i440fx-acpi-hotplug-bridge-disable.args | 31 +++++++ .../pc-i440fx-acpi-hotplug-bridge-disable.err | 1 + .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 33 +++++++ .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 33 +++++++ .../q35-acpi-hotplug-bridge-disable.args | 33 +++++++ .../q35-acpi-hotplug-bridge-disable.err | 1 + .../q35-acpi-hotplug-bridge-disable.xml | 47 ++++++++++ .../q35-acpi-hotplug-bridge-enable.xml | 47 ++++++++++ tests/qemuxml2argvtest.c | 16 ++++ .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 1 + .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 1 + .../q35-acpi-hotplug-bridge-disable.xml | 1 + .../q35-acpi-hotplug-bridge-enable.xml | 1 + tests/qemuxml2xmltest.c | 14 +++ 37 files changed, 507 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.xml -- 2.25.1

1 4

Entering freeze for libvirt-7.8.0
by Jiri Denemark 29 Sep '21

29 Sep '21

I have just tagged v7.8.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[libvirt PATCH] scripts: include function versions in API definition
by Daniel P. Berrangé 28 Sep '21

28 Sep '21

In order to auto-generate more of the language binding code, it is desirable to know what libvirt version an API was introduced in. We can extract this information from the .syms files and expose it in the API description eg instead of <function name='virNodeNumOfDevices' file='libvirt-nodedev' module='libvirt-nodedev'> we now have <function name='virNodeNumOfDevices' file='libvirt-nodedev' module='libvirt-nodedev' version='0.5.0'> This will benefit this proposal: https://gitlab.com/libvirt/libvirt-go-module/-/merge_requests/7 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- scripts/apibuild.py | 68 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/scripts/apibuild.py b/scripts/apibuild.py index 9b29466e1d..bdd3077c48 100755 --- a/scripts/apibuild.py +++ b/scripts/apibuild.py @@ -2030,8 +2030,9 @@ class CParser: class docBuilder: """A documentation builder""" - def __init__(self, name, path='.', directories=['.'], includes=[]): + def __init__(self, name, syms, path='.', directories=['.'], includes=[]): self.name = name + self.syms = syms self.path = path self.directories = directories if name == "libvirt": @@ -2044,6 +2045,7 @@ class docBuilder: self.includes = includes + list(admin_included_files.keys()) self.modules = {} self.headers = {} + self.versions = {} self.idx = index() self.xref = {} self.index = {} @@ -2114,6 +2116,44 @@ class docBuilder: self.modules[module] = idx self.idx.merge_public(idx) + def scanVersions(self): + prefix = self.name.upper().replace("-", "_") + "_" + + version = None + prevversion = None + with open(self.syms, "r") as syms: + while True: + line = syms.readline() + if not line: + break + line = line.strip() + if line.startswith("#"): + continue + if line == "": + continue + + if line.startswith(prefix) and line.endswith(" {"): + version = line[len(prefix):-2] + elif line == "global:": + continue + elif line == "local:": + continue + elif line.startswith("}"): + if prevversion is None: + if line != "};": + raise Exception("Unexpected closing version") + else: + if line != ("} %s%s;" % (prefix, prevversion)): + raise Exception("Unexpected end of version '%s': %s'" % (line, "} " + prefix + version)) + + prevversion = version + version = None + elif line.endswith(";") and version is not None: + func = line[:-1] + self.versions[func] = version + else: + raise Exception("Unexpected line in syms file: %s" % line) + def scan(self): for directory in self.directories: files = glob.glob(directory + "/*.c") @@ -2136,6 +2176,7 @@ class docBuilder: self.headers[file] = None self.scanHeaders() self.scanModules() + self.scanVersions() def modulename_file(self, file): module = os.path.basename(file) @@ -2275,9 +2316,17 @@ class docBuilder: print("=>", id) # NB: this is consumed by a regex in 'getAPIFilenames' in hvsupport.pl - output.write(" <%s name='%s' file='%s' module='%s'>\n" % (id.type, - name, self.modulename_file(id.header), - self.modulename_file(id.module))) + if id.type == "function": + ver = self.versions[name] + if ver is None: + raise Exception("Missing version for '%s'" % name) + output.write(" <function name='%s' file='%s' module='%s' version='%s'>\n" % ( + name, self.modulename_file(id.header), + self.modulename_file(id.module), self.versions[name])) + else: + output.write(" <functype name='%s' file='%s' module='%s'>\n" % ( + name, self.modulename_file(id.header), + self.modulename_file(id.module))) # # Processing of conditionals modified by Bill 1/1/05 # @@ -2406,9 +2455,16 @@ class app: print(msg) def rebuild(self, name, srcdir, builddir): - if name not in ["libvirt", "libvirt-qemu", "libvirt-lxc", "libvirt-admin"]: + syms = { + "libvirt": srcdir + "/../src/libvirt_public.syms", + "libvirt-qemu": srcdir + "/../src/libvirt_qemu.syms", + "libvirt-lxc": srcdir + "/../src/libvirt_lxc.syms", + "libvirt-admin": srcdir + "/../src/admin/libvirt_admin_public.syms", + } + if name not in syms: self.warning("rebuild() failed, unknown module %s" % name) return None + builder = None if glob.glob(srcdir + "/../src/libvirt.c") != []: if not quiet: @@ -2418,7 +2474,7 @@ class app: srcdir + "/../src/util", srcdir + "/../include/libvirt", builddir + "/../include/libvirt"] - builder = docBuilder(name, builddir, dirs, []) + builder = docBuilder(name, syms[name], builddir, dirs, []) else: self.warning("rebuild() failed, unable to guess the module") return None -- 2.31.1

3 4

[PATCH v6 0/4] Add support to enable/disable hotplug on pci-root controller
by Ani Sinha 28 Sep '21

28 Sep '21

changelog: v6: incorporated Jan's suggestions. v5: incorporated suggestions from Laine for patches #2 and #3. The qemu command line is now added in a new function and called from qemuBuildControllersByTypeCommandLine(). Output xmls are now symlinked to input xmls for unit tests. v4: split the original patchset into a pci-root controller specific patch series. also the libvirt conf is now a sub-element of the pci-root controller as was suggested by Dan Berrange. Please see discussion here: https://listman.redhat.com/archives/libvir-list/2021-September/msg00839.html v3: reorganized the patches as per Laine's suggestion. Added more details in commit messages. Added conf description in formatdomain.rst. Added changelog for next release. v2: fixed bugs and added additional missing unit tests. v1: initial implementation. Had some bugs and missed some unit tests This patchset introduces libvirt xml support to enable/disable hotplug on the pci-root controller. It adds a 'target' subelement for the pci-root controller with a 'hotplug' property. This property can be used to enable or disable hotplug for the pci-root controller. For example, in order to disable hotplug on the pci-root controller, one has to use set '<target hotplug='off'>' as shown below: <controller type='pci' model='pci-root'> <target hotplug='off'/> </controller> '<target hotplug='on'>' option would enable hotplug for pci-root controller. This is also the default value. This option is only available for pc machine types and is applicable for qemu only/kvm accelerator onlt.This feature was introduced from qemu version 5.2 with the following change in qemu repository: 3d7e78aa7777f ("Introduce a new flag for i440fx to disable PCI hotplug on the root bus") The above qemu commit describes some reasons why users might to disable hotplug on PCI root buses [1]. The corresponding commandline option to qemu for x86 guests is: -global PIIX4_PM.acpi-root-pci-hotplug=<off/on> Notes: 1. The use case scenario described by Laine in https://listman.redhat.com/archives/libvir-list/2020-February/msg00110.html intentionally does not discuss i440fx and focusses solely on q35. I do realize that redhat has moved on from i440fx and currently efforts for new features are concentrated on q35 machines only. We have had some hard debates on this on the qemu mailing list before. The fact of the matter is that i440fx is not at 1-1 parity with q35. There are many users who are currenly using i440fx and are simply not ready to move to q35 without sacrificing some existing features they support today. For example https://wiki.qemu.org/images/4/4e/Q35.pdf lists some of q35 limitations. https://www.linux-kvm.org/images/0/06/2012-forum-Q35.pdf provides more information on the differences. Hence we need to solve the issue Laine has described in the above email for i440fx without adding additional bridges. Further, in Daniel Berrange's words from : https://lists.gnu.org/archive/html/qemu-devel/2020-04/msg03012.html "From the upstream POV, there's been no decision / agreement to phase out PIIX, this is purely a RHEL downstream decision & plan. If other distros / users have a different POV, and find the feature useful, we should accept the patch if it meets the normal QEMU patch requirements. " Also to be noted that I have already experimented this qemu commandline option using libvirt passthrough feature as has been documented in http://blog.vmsplice.net/2011/04/how-to-pass-qemu-command-line-options.html This was only meant to be a short term solution until libvirt started supporting this natively. Supporting this option through libvirt would simplify their use case as well as add capability validations and graceful failure scenarios in case qemu did not support the option. Ani Sinha (4): qemu: capablities: detect presence of acpi-root-pci-hotplug for i440fx machines conf: introduce option to enable/disable pci hotplug on pci-root controller qemu: command: add support to enable/disable hotplug on pci-root controller NEWS: release note the new hotplug enable/disable option on pci-root controller NEWS.rst | 6 ++++ docs/formatdomain.rst | 12 ++++--- src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 17 ++++++++++ src/qemu/qemu_validate.c | 9 +++++- .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../pc-i440fx-acpi-root-hotplug-disable.args | 31 +++++++++++++++++++ .../pc-i440fx-acpi-root-hotplug-disable.err | 1 + .../pc-i440fx-acpi-root-hotplug-disable.xml | 30 ++++++++++++++++++ .../pc-i440fx-acpi-root-hotplug-enable.xml | 30 ++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../pc-i440fx-acpi-root-hotplug-disable.xml | 1 + .../pc-i440fx-acpi-root-hotplug-enable.xml | 1 + tests/qemuxml2xmltest.c | 4 +++ 17 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml -- 2.25.1

2 5

[libvirt PATCH] vshCmddefCheckInternals: Fix typo
by Tim Wiederhake 27 Sep '21

27 Sep '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- tools/vsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 189c452f73..7b77acad34 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -279,7 +279,7 @@ vshCmddefCheckInternals(vshControl *ctl, } if (!(alias = vshCmddefSearch(cmd->alias))) { - vshError(ctl, _("command alias '%s' is pointing to a non-existant command '%s'"), + vshError(ctl, _("command alias '%s' is pointing to a non-existent command '%s'"), cmd->name, cmd->alias); return -1; } -- 2.31.1

2 1

[PATCH v5 0/4] Add support to enable/disable hotplug on pci-root controller
by Ani Sinha 27 Sep '21

27 Sep '21

changelog: v5: incorporated suggestions from Laine for patches #2 and #3. The qemu command line is now added in a new function and called from qemuBuildControllersByTypeCommandLine(). Output xmls are now symlinked to input xmls for unit tests. v4: split the original patchset into a pci-root controller specific patch series. also the libvirt conf is now a sub-element of the pci-root controller as was suggested by Dan Berrange. Please see discussion here: https://listman.redhat.com/archives/libvir-list/2021-September/msg00839.html v3: reorganized the patches as per Laine's suggestion. Added more details in commit messages. Added conf description in formatdomain.rst. Added changelog for next release. v2: fixed bugs and added additional missing unit tests. v1: initial implementation. Had some bugs and missed some unit tests This patchset introduces libvirt xml support to enable/disable hotplug on the pci-root controller. It adds a 'target' subelement for the pci-root controller with a 'hotplug' property. This property can be used to enable or disable hotplug for the pci-root controller. For example, in order to disable hotplug on the pci-root controller, one has to use set '<target hotplug='off'>' as shown below: <controller type='pci' model='pci-root'> <target hotplug='off'/> </controller> '<target hotplug='on'>' option would enable hotplug for pci-root controller. This is also the default value. This option is only available for pc machine types and is applicable for qemu only/kvm accelerator onlt.This feature was introduced from qemu version 5.2 with the following change in qemu repository: 3d7e78aa7777f ("Introduce a new flag for i440fx to disable PCI hotplug on the root bus") The above qemu commit describes some reasons why users might to disable hotplug on PCI root buses [1]. The corresponding commandline option to qemu for x86 guests is: -global PIIX4_PM.acpi-root-pci-hotplug=<off/on> Notes: 1. The use case scenario described by Laine in https://listman.redhat.com/archives/libvir-list/2020-February/msg00110.html intentionally does not discuss i440fx and focusses solely on q35. I do realize that redhat has moved on from i440fx and currently efforts for new features are concentrated on q35 machines only. We have had some hard debates on this on the qemu mailing list before. The fact of the matter is that i440fx is not at 1-1 parity with q35. There are many users who are currenly using i440fx and are simply not ready to move to q35 without sacrificing some existing features they support today. For example https://wiki.qemu.org/images/4/4e/Q35.pdf lists some of q35 limitations. https://www.linux-kvm.org/images/0/06/2012-forum-Q35.pdf provides more information on the differences. Hence we need to solve the issue Laine has described in the above email for i440fx without adding additional bridges. Further, in Daniel Berrange's words from : https://lists.gnu.org/archive/html/qemu-devel/2020-04/msg03012.html "From the upstream POV, there's been no decision / agreement to phase out PIIX, this is purely a RHEL downstream decision & plan. If other distros / users have a different POV, and find the feature useful, we should accept the patch if it meets the normal QEMU patch requirements. " Also to be noted that I have already experimented this qemu commandline option using libvirt passthrough feature as has been documented in http://blog.vmsplice.net/2011/04/how-to-pass-qemu-command-line-options.html This was only meant to be a short term solution until libvirt started supporting this natively. Supporting this option through libvirt would simplify their use case as well as add capability validations and graceful failure scenarios in case qemu did not support the option. Ani Sinha (4): qemu: capablities: detect presence of acpi-root-pci-hotplug for i440fx machines conf: introduce option to enable/disable pci hotplug on pci-root controller qemu: command: add support to enable/disable hotplug on pci-root controller NEWS: release note the new hotplug enable/disable option on pci-root controller NEWS.rst | 6 ++++ docs/formatdomain.rst | 12 ++++--- src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 17 ++++++++++ src/qemu/qemu_validate.c | 9 +++++- .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../pc-i440fx-acpi-root-hotplug-disable.args | 31 +++++++++++++++++++ .../pc-i440fx-acpi-root-hotplug-disable.err | 1 + .../pc-i440fx-acpi-root-hotplug-disable.xml | 30 ++++++++++++++++++ .../pc-i440fx-acpi-root-hotplug-enable.xml | 30 ++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../pc-i440fx-acpi-root-hotplug-disable.xml | 1 + .../pc-i440fx-acpi-root-hotplug-enable.xml | 1 + tests/qemuxml2xmltest.c | 4 +++ 17 files changed, 149 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-enable.xml -- 2.25.1

3 10

[PATCH v4 0/4] Add support to enable/disable hotplug on pci-root controller
by Ani Sinha 27 Sep '21

27 Sep '21

changelog: v4: split the original patchset into a pci-root controller specific patch series. also the libvirt conf is now a sub-element of the pci-root controller as was suggested by Dan Berrange. Please see discussion here: https://listman.redhat.com/archives/libvir-list/2021-September/msg00839.html v3: reorganized the patches as per Laine's suggestion. Added more details in commit messages. Added conf description in formatdomain.rst. Added changelog for next release. v2: fixed bugs and added additional missing unit tests. v1: initial implementation. Had some bugs and missed some unit tests This patchset introduces libvirt xml support to enable/disable hotplug on the pci-root controller. It adds a 'target' subelement for the pci-root controller with a 'hotplug' property. This property can be used to enable or disable hotplug for the pci-root controller. For example, in order to disable hotplug on the pci-root controller, one has to use set '<target hotplug='off'>' as shown below: <controller type='pci' model='pci-root'> <target hotplug='off'/> </controller> '<target hotplug='on'>' option would enable hotplug for pci-root controller. This is also the default value. This option is only available for pc machine types and is applicable for qemu only/kvm accelerator onlt.This feature was introduced from qemu version 5.2 with the following change in qemu repository: 3d7e78aa7777f ("Introduce a new flag for i440fx to disable PCI hotplug on the root bus") The above qemu commit describes some reasons why users might to disable hotplug on PCI root buses [1]. The corresponding commandline option to qemu for x86 guests is: -global PIIX4_PM.acpi-root-pci-hotplug=<off/on> Notes: 1. The use case scenario described by Laine in https://listman.redhat.com/archives/libvir-list/2020-February/msg00110.html intentionally does not discuss i440fx and focusses solely on q35. I do realize that redhat has moved on from i440fx and currently efforts for new features are concentrated on q35 machines only. We have had some hard debates on this on the qemu mailing list before. The fact of the matter is that i440fx is not at 1-1 parity with q35. There are many users who are currenly using i440fx and are simply not ready to move to q35 without sacrificing some existing features they support today. For example https://wiki.qemu.org/images/4/4e/Q35.pdf lists some of q35 limitations. https://www.linux-kvm.org/images/0/06/2012-forum-Q35.pdf provides more information on the differences. Hence we need to solve the issue Laine has described in the above email for i440fx without adding additional bridges. Further, in Daniel Berrange's words from : https://lists.gnu.org/archive/html/qemu-devel/2020-04/msg03012.html "From the upstream POV, there's been no decision / agreement to phase out PIIX, this is purely a RHEL downstream decision & plan. If other distros / users have a different POV, and find the feature useful, we should accept the patch if it meets the normal QEMU patch requirements. " Also to be noted that I have already experimented this qemu commandline option using libvirt passthrough feature as has been documented in http://blog.vmsplice.net/2011/04/how-to-pass-qemu-command-line-options.html This was only meant to be a short term solution until libvirt started supporting this natively. Supporting this option through libvirt would simplify their use case as well as add capability validations and graceful failure scenarios in case qemu did not support the option. Ani Sinha (4): qemu: capablities: detect presence of acpi-root-pci-hotplug for i440fx machines conf: introduce option to enable/disable pci hotplug on pci-root controller qemu: command: add support to enable/disable hotplug on pci-root controller NEWS: release note the new hotplug enable/disable option on pci-root controller NEWS.rst | 6 ++++ docs/formatdomain.rst | 12 ++++--- docs/schemas/domaincommon.rng | 10 ++++++ src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 12 +++++++ src/qemu/qemu_validate.c | 9 +++++- .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../pc-i440fx-acpi-root-hotplug-disable.args | 31 +++++++++++++++++++ .../pc-i440fx-acpi-root-hotplug-disable.xml | 17 ++++++++++ .../pc-i440fx-acpi-root-hotplug-enable.err | 1 + .../pc-i440fx-acpi-root-hotplug-enable.xml | 17 ++++++++++ tests/qemuxml2argvtest.c | 6 ++++ .../pc-i440fx-acpi-root-hotplug-disable.xml | 30 ++++++++++++++++++ tests/qemuxml2xmltest.c | 2 ++ 17 files changed, 157 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-disable.xml -- 2.25.1

2 9

[PATCH] qemu: ingore the transient domain state in fake reboot
by Zhenzhong Duan 27 Sep '21

27 Sep '21

When action for 'on_poweroff' is set to 'restart', 'fake reboot' is triggered and qemu shutdown state is transient. Domain state need not to be changed and events not sent in this case. Fixes:4ffc807214cb80086d57e1d3e7b60959a41d2874 Signed-off-by: Zhenzhong Duan <zhenzhong.duan(a)intel.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 632cb817b9..fcdda4ffe1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -612,7 +612,7 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED, /* In case of fake reboot qemu shutdown state is transient so don't * change domain state nor send events. */ - if (!priv->fakeReboot || + if (!priv->fakeReboot && vm->def->onPoweroff != VIR_DOMAIN_LIFECYCLE_ACTION_RESTART) { VIR_DEBUG("Transitioned guest %s to shutdown state", vm->def->name); -- 2.25.1

2 1

[libvirt PATCH 0/4] qemu: deprecate more capabilities
by Ján Tomko 25 Sep '21

25 Sep '21

Applies on top of my seccomp sandbox series. Ján Tomko (4): qemu: assume QEMU_CAPS_MACHINE_KERNEL_IRQCHIP qemu: Deprecate QEMU_CAPS_MACHINE_KERNEL_IRQCHIP qemu: assume QEMU_CAPS_FSDEV_CREATEMODE qemu: deprecate QEMU_CAPS_FSDEV_CREATEMODE src/qemu/qemu_capabilities.c | 6 ++---- src/qemu/qemu_capabilities.h | 4 ++-- src/qemu/qemu_validate.c | 12 ------------ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 2 -- tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 2 -- 42 files changed, 4 insertions(+), 96 deletions(-) -- 2.31.1

2 5

[libvirt PATCH 0/5] qemu: simplify seccomp sandbox
by Ján Tomko 25 Sep '21

25 Sep '21

Inspired by Peter's q-c-l-o cleanups. Ján Tomko (5): qemu: always assume QEMU_CAPS_SECCOMP_BLACKLIST qemu: conf: simplify seccomp_sandbox comment qemu: seccomp: remove dead code qemu: capabilities: deprecate QEMU_CAPS_SECCOMP_BLACKLIST qemu: capabilities: do not look at parameters for sandbox src/qemu/qemu.conf | 11 +++++------ src/qemu/qemu_capabilities.c | 5 ++--- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 7 +------ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - 43 files changed, 9 insertions(+), 55 deletions(-) -- 2.31.1

2 6

[PATCH v2 0/2] virsh: domain: rework cmdMigrateSetMaxDowntime()
by Kristina Hanicova 25 Sep '21

25 Sep '21

This patch is partially v2 of: https://listman.redhat.com/archives/libvir-list/2021-September/msg00728.html Diff to v1: * split from previous big patch * split the fixing part and the refactoring part of the function into different patches Kristina Hanicova (2): virsh: domain: fix mistake in cmdMigrateSetMaxDowntime() virsh: domain: remove unnecessary variable and label in cmdMigrateSetMaxDowntime() tools/virsh-domain.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) -- 2.31.1

2 6

[PATCH v2 0/7] virsh: domain: small refactoring
by Kristina Hanicova 25 Sep '21

25 Sep '21

This is partially v2 of: https://listman.redhat.com/archives/libvir-list/2021-September/msg00728.html Diff to v1: * split changes into smaller patches Kristina Hanicova (7): virsh: domain: use early return in virshDomainDefine() virsh: domain: remove nested 'if' in cmdAttachDisk() virsh: domain: remove 'ret' variable and use direct return when possible virsh: domain: remove 'ret' variable, use early return when possible virsh: domain: use early return when possible virsh: domain: remove 'ret' variable and use 'count' instead virsh: domain: remove else branch tools/virsh-domain.c | 232 +++++++++++++++++-------------------------- 1 file changed, 92 insertions(+), 140 deletions(-) -- 2.31.1

2 8