Skip to content

Commit 676d028

Browse files
committed
versions: Bump QEMU to v7.2.0
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: kata-containers#6102 Signed-off-by: Fabiano Fidêncio <[email protected]>
1 parent 083facd commit 676d028

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

tools/packaging/qemu/patches/7.2.x/no_patches.txt

Whitespace-only changes.

tools/packaging/qemu/patches/tag_patches/v7.2.0/no_patches.txt

Whitespace-only changes.

tools/packaging/scripts/configure-hypervisor.sh

+10-3
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,9 @@ generate_qemu_options() {
242242
# Disable graphical network access
243243
qemu_options+=(size:--disable-vnc)
244244
qemu_options+=(size:--disable-vnc-jpeg)
245-
qemu_options+=(size:--disable-vnc-png)
245+
if ! gt_eq "${qemu_version}" "7.2.0" ; then
246+
qemu_options+=(size:--disable-vnc-png)
247+
fi
246248
qemu_options+=(size:--disable-vnc-sasl)
247249

248250
# Disable PAM authentication: it's a feature used together with VNC access
@@ -330,13 +332,16 @@ generate_qemu_options() {
330332
# building QEMU.
331333
case "$arch" in
332334
aarch64)
335+
qemu_options+=(functionality:--disable-virtiofsd)
333336
;;
334337
x86_64)
338+
qemu_options+=(functionality:--disable-virtiofsd)
335339
;;
336340
ppc64le)
337341
qemu_options+=(functionality:--enable-virtiofsd)
338342
;;
339343
s390x)
344+
qemu_options+=(functionality:--disable-virtiofsd)
340345
;;
341346
esac
342347

@@ -353,8 +358,10 @@ generate_qemu_options() {
353358
qemu_options+=(size:--disable-vde)
354359

355360
# Don't build other options which can't be depent on build server.
356-
qemu_options+=(size:--disable-xfsctl)
357-
qemu_options+=(size:--disable-libxml2)
361+
if ! gt_eq "${qemu_version}" "7.2.0" ; then
362+
qemu_options+=(size:--disable-xfsctl)
363+
qemu_options+=(size:--disable-libxml2)
364+
fi
358365
qemu_options+=(size:--disable-nettle)
359366

360367
# Disable XEN driver

versions.yaml

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

0 commit comments

Comments
 (0)