github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 00:37:24 +00:00
Code Issues Projects Releases Wiki Activity

versions: Bump QEMU to v7.2.0

Browse Source 
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: a8d6abe129/docs/about/deprecated.rst (virtiofsd)

Fixes: #6102

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-01-18 09:26:13 +01:00
parent 083facd5ae
commit 676d028504
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tools/packaging/qemu/patches/7.2.x/no_patches.txt Normal file
View File

0
tools/packaging/qemu/patches/tag_patches/v7.2.0/no_patches.txt Normal file
View File

13
tools/packaging/scripts/configure-hypervisor.sh
View File

@ -242,7 +242,9 @@ generate_qemu_options() {
# Disable graphical network access # Disable graphical network access
qemu_options+=(size:--disable-vnc) qemu_options+=(size:--disable-vnc)
qemu_options+=(size:--disable-vnc-jpeg) 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) qemu_options+=(size:--disable-vnc-sasl)
# Disable PAM authentication: it's a feature used together with VNC access # Disable PAM authentication: it's a feature used together with VNC access
@ -330,13 +332,16 @@ generate_qemu_options() {
# building QEMU. # building QEMU.
case "$arch" in case "$arch" in
aarch64) aarch64)
qemu_options+=(functionality:--disable-virtiofsd)
;; ;;
x86_64) x86_64)
qemu_options+=(functionality:--disable-virtiofsd)
;; ;;
ppc64le) ppc64le)
qemu_options+=(functionality:--enable-virtiofsd) qemu_options+=(functionality:--enable-virtiofsd)
;; ;;
s390x) s390x)
qemu_options+=(functionality:--disable-virtiofsd)
;; ;;
esac esac
@ -353,8 +358,10 @@ generate_qemu_options() {
qemu_options+=(size:--disable-vde) qemu_options+=(size:--disable-vde)
# Don't build other options which can't be depent on build server. # Don't build other options which can't be depent on build server.
qemu_options+=(size:--disable-xfsctl) if ! gt_eq "${qemu_version}" "7.2.0" ; then
qemu_options+=(size:--disable-libxml2) qemu_options+=(size:--disable-xfsctl)
qemu_options+=(size:--disable-libxml2)
fi
qemu_options+=(size:--disable-nettle) qemu_options+=(size:--disable-nettle)
# Disable XEN driver # Disable XEN driver

4
versions.yaml
View File

@ -88,8 +88,8 @@ assets:
qemu: qemu:
description: "VMM that uses KVM" description: "VMM that uses KVM"
url: "https://github.com/qemu/qemu" url: "https://github.com/qemu/qemu"
version: "v6.2.0" version: "v7.2.0"
tag: "v6.2.0" tag: "v7.2.0"
# Do not include any non-full release versions # Do not include any non-full release versions
# Break the line *without CR or space being appended*, to appease # Break the line *without CR or space being appended*, to appease
# yamllint, and note the deliberate ' ' at the end of the expression. # yamllint, and note the deliberate ' ' at the end of the expression.