From cc9ecedaeaf201b37bf7f722366e0c2f21e50e0d Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Fri, 6 Dec 2024 00:43:27 +0000 Subject: [PATCH] qemu: Bump version, new options, add no_patches We want to have the latest QEMU version available which is as of this writing v9.1.2 Signed-off-by: Zvonko Kaiser qemu: Add new options for 9.1.2 We need to fence specific options depending on the version and disable ones that are not needed anymore Signed-off-by: Zvonko Kaiser qemu: Add no_patches.txt Since we do not have any patches for this version let's create the appropriate files. Signed-off-by: Zvonko Kaiser --- .../qemu/patches/9.1.x/no_patches.txt | 0 .../patches/tag_patches/v9.1.2/no_patches.txt | 0 .../packaging/scripts/configure-hypervisor.sh | 23 +++++++++++++++---- versions.yaml | 4 ++-- 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 tools/packaging/qemu/patches/9.1.x/no_patches.txt create mode 100644 tools/packaging/qemu/patches/tag_patches/v9.1.2/no_patches.txt diff --git a/tools/packaging/qemu/patches/9.1.x/no_patches.txt b/tools/packaging/qemu/patches/9.1.x/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/qemu/patches/tag_patches/v9.1.2/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/v9.1.2/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 6c6d1c1aca..6fe9aeb56a 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -222,9 +222,6 @@ generate_qemu_options() { # Disabled options - # Disable block migration in the main migration stream - qemu_options+=(size:--disable-live-block-migration) - # braille support not required qemu_options+=(size:--disable-brlapi) @@ -397,6 +394,23 @@ generate_qemu_options() { qemu_options+=(size:--disable-vhdx) qemu_options+=(size:--disable-hv-balloon) + # Disable various features based on the qemu_version + if gt_eq "${qemu_version}" "9.1.0" ; then + # Disable Query Processing Library support + qemu_options+=(size:--disable-qpl) + # Disable UADK Library support + qemu_options+=(size:--disable-uadk) + # Disable syscall buffer debugging support + qemu_options+=(size:--disable-debug-remap) + + fi + + # Disable gio support + qemu_options+=(size:--disable-gio) + # Disable libdaxctl part of ndctl support + qemu_options+=(size:--disable-libdaxctl) + qemu_options+=(size:--disable-oss) + #--------------------------------------------------------------------- # Enabled options @@ -409,6 +423,7 @@ generate_qemu_options() { # Support Linux AIO (native) qemu_options+=(size:--enable-linux-aio) + qemu_options+=(size:--enable-linux-io-uring) # Support Ceph RADOS Block Device (RBD) [ -z "${static}" ] && qemu_options+=(functionality:--enable-rbd) @@ -427,7 +442,7 @@ generate_qemu_options() { # for that architecture if [ "$arch" == x86_64 ]; then qemu_options+=(speed:--enable-avx2) - qemu_options+=(speed:--enable-avx512f) + qemu_options+=(speed:--enable-avx512bw) else qemu_options+=(speed:--disable-avx2) fi diff --git a/versions.yaml b/versions.yaml index 0691915e6a..591cff0a20 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: "v8.2.4" - tag: "v8.2.4" + version: "v9.1.2" + tag: "v9.1.2" # 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.