From 676d028504e14f00660bcf226e95c4459f62b86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 18 Jan 2023 09:26:13 +0100 Subject: [PATCH] versions: Bump QEMU to v7.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As QEMU released its v7.2.0 version in December last year, last do the bump on our side. A few configuration options have been removed between the v6.2.0 (the version we currently use) and v7.2.0, so those have also been dropped from our configure-hypervison.sh script (for this specific version). Also, we're explicitly setting --disable-virtiofsd for the platforms that we're testing using the rust version. See: https://github.com/qemu/qemu/blob/a8d6abe1292e1db1ad9be5b2b124b9c01bcda094/docs/about/deprecated.rst#virtiofsd Fixes: #6102 Signed-off-by: Fabiano Fidêncio --- tools/packaging/qemu/patches/7.2.x/no_patches.txt | 0 .../qemu/patches/tag_patches/v7.2.0/no_patches.txt | 0 tools/packaging/scripts/configure-hypervisor.sh | 13 ++++++++++--- versions.yaml | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 tools/packaging/qemu/patches/7.2.x/no_patches.txt create mode 100644 tools/packaging/qemu/patches/tag_patches/v7.2.0/no_patches.txt diff --git a/tools/packaging/qemu/patches/7.2.x/no_patches.txt b/tools/packaging/qemu/patches/7.2.x/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/qemu/patches/tag_patches/v7.2.0/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/v7.2.0/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh index 04a48c72d5..61e479237c 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -242,7 +242,9 @@ generate_qemu_options() { # Disable graphical network access qemu_options+=(size:--disable-vnc) qemu_options+=(size:--disable-vnc-jpeg) - qemu_options+=(size:--disable-vnc-png) + if ! gt_eq "${qemu_version}" "7.2.0" ; then + qemu_options+=(size:--disable-vnc-png) + fi qemu_options+=(size:--disable-vnc-sasl) # Disable PAM authentication: it's a feature used together with VNC access @@ -330,13 +332,16 @@ generate_qemu_options() { # building QEMU. case "$arch" in aarch64) + qemu_options+=(functionality:--disable-virtiofsd) ;; x86_64) + qemu_options+=(functionality:--disable-virtiofsd) ;; ppc64le) qemu_options+=(functionality:--enable-virtiofsd) ;; s390x) + qemu_options+=(functionality:--disable-virtiofsd) ;; esac @@ -353,8 +358,10 @@ generate_qemu_options() { qemu_options+=(size:--disable-vde) # Don't build other options which can't be depent on build server. - qemu_options+=(size:--disable-xfsctl) - qemu_options+=(size:--disable-libxml2) + if ! gt_eq "${qemu_version}" "7.2.0" ; then + qemu_options+=(size:--disable-xfsctl) + qemu_options+=(size:--disable-libxml2) + fi qemu_options+=(size:--disable-nettle) # Disable XEN driver diff --git a/versions.yaml b/versions.yaml index 900aed35dd..8b6b53c908 100644 --- a/versions.yaml +++ b/versions.yaml @@ -88,8 +88,8 @@ assets: qemu: description: "VMM that uses KVM" url: "https://github.com/qemu/qemu" - version: "v6.2.0" - tag: "v6.2.0" + version: "v7.2.0" + tag: "v7.2.0" # Do not include any non-full release versions # Break the line *without CR or space being appended*, to appease # yamllint, and note the deliberate ' ' at the end of the expression.