From d6c12476fb661197b1857d04cc0b3912a02d443c Mon Sep 17 00:00:00 2001 From: Ryan Savino Date: Wed, 1 Feb 2023 23:03:28 -0600 Subject: [PATCH] versions: downgrade qemu from 7.2.0 to 7.1.0 A known bug in qemu 7.2.0 causes a problem handling the kernel hashes argument and causes SEV container launching to fail. Fixes: #6189 Signed-Off-By: Ryan Savino --- tools/packaging/qemu/patches/7.1.x/no_patches.txt | 0 .../packaging/qemu/patches/tag_patches/v7.1.0/no_patches.txt | 0 tools/packaging/scripts/configure-hypervisor.sh | 4 ++-- versions.yaml | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 tools/packaging/qemu/patches/7.1.x/no_patches.txt create mode 100644 tools/packaging/qemu/patches/tag_patches/v7.1.0/no_patches.txt diff --git a/tools/packaging/qemu/patches/7.1.x/no_patches.txt b/tools/packaging/qemu/patches/7.1.x/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/qemu/patches/tag_patches/v7.1.0/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/v7.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 61e479237c..827d08d807 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -242,7 +242,7 @@ generate_qemu_options() { # Disable graphical network access qemu_options+=(size:--disable-vnc) qemu_options+=(size:--disable-vnc-jpeg) - if ! gt_eq "${qemu_version}" "7.2.0" ; then + if ! gt_eq "${qemu_version}" "7.1.0" ; then qemu_options+=(size:--disable-vnc-png) fi qemu_options+=(size:--disable-vnc-sasl) @@ -358,7 +358,7 @@ generate_qemu_options() { qemu_options+=(size:--disable-vde) # Don't build other options which can't be depent on build server. - if ! gt_eq "${qemu_version}" "7.2.0" ; then + if ! gt_eq "${qemu_version}" "7.1.0" ; then qemu_options+=(size:--disable-xfsctl) qemu_options+=(size:--disable-libxml2) fi diff --git a/versions.yaml b/versions.yaml index a4f6aa838d..cad5eaf228 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: "v7.2.0" - tag: "v7.2.0" + version: "v7.1.0" + tag: "v7.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.