From 78dbed02e6a9c2b55573848ff3d4d1a923bda7fe Mon Sep 17 00:00:00 2001 From: Alex Lyn Date: Mon, 15 Sep 2025 16:05:53 +0800 Subject: [PATCH] version: Bump QEMU to v10.1.0 (DO-NOT-MERGE) A minor release of QEMU is out, so update to it for fixes and features. QEMU changelog: https://wiki.qemu.org/ChangeLog/10.1 Notes: * AVX support is not an option to be enabled / disabled anymore. * Passt requires Glibc 2.40.+, which means a dependency on Ubuntu 25.04 or newer, thus we're disabling it. Signed-off-by: Alex Tibbles --- .../qemu/patches/10.1.x/no_patches.txt | 0 .../tag_patches/v10.1.0/no_patches.txt | 0 .../packaging/scripts/configure-hypervisor.sh | 24 ++++++++++++++----- versions.yaml | 4 ++-- 4 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 tools/packaging/qemu/patches/10.1.x/no_patches.txt create mode 100644 tools/packaging/qemu/patches/tag_patches/v10.1.0/no_patches.txt diff --git a/tools/packaging/qemu/patches/10.1.x/no_patches.txt b/tools/packaging/qemu/patches/10.1.x/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/qemu/patches/tag_patches/v10.1.0/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/v10.1.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 c6d762906d..09e93bb940 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -389,7 +389,9 @@ generate_qemu_options() { qemu_options+=(size:--disable-relocatable) qemu_options+=(size:--disable-rutabaga-gfx) qemu_options+=(size:--disable-vmdk) - qemu_options+=(size:--disable-avx512bw) + if ! gt_eq "${qemu_version}" "10.1.0" ; then + qemu_options+=(size:--disable-avx512bw) + fi qemu_options+=(size:--disable-vpc) qemu_options+=(size:--disable-vhdx) qemu_options+=(size:--disable-hv-balloon) @@ -447,12 +449,22 @@ generate_qemu_options() { # AVX2 is enabled by default by x86_64, make sure it's enabled only # for that architecture - if [ "$arch" == x86_64 ]; then - qemu_options+=(speed:--enable-avx2) - qemu_options+=(speed:--enable-avx512bw) - else - qemu_options+=(speed:--disable-avx2) + if ! gt_eq "${qemu_version}" "10.1.0" ; then + if [ "$arch" == x86_64 ]; then + qemu_options+=(speed:--enable-avx2) + qemu_options+=(speed:--enable-avx512bw) + else + qemu_options+=(speed:--disable-avx2) + fi fi + + + # Disable passt support, as it'd bring glibc 2.40.x dependency, + # and it is only available on Ubuntu 25.04 or newer. + if gt_eq "${qemu_version}" "10.1.0" ; then + qemu_options+=(functionality:--disable-passt) + fi + # We're disabling pmem support, it is heavilly broken with # Ubuntu's static build of QEMU qemu_options+=(functionality:--disable-libpmem) diff --git a/versions.yaml b/versions.yaml index 4006d7311f..7377c91092 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: "v10.0.3" - tag: "v10.0.3" + version: "v10.1.0" + tag: "v10.1.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.