github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 12:14:48 +00:00
Code Issues Projects Releases Wiki Activity

versions: Update QEMU TDX version

Browse Source 
Let's update the QEMU TDX version to what's the latest tested release of
the Intel TDX tools with Kata Containers.

In order to do such update, we had to relax the checks on the QEMU
version for some of the configuration options, as those were removed
right after the window was open for the 7.1.0 development (thus the
7.0.50 check).

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-03-23 09:03:16 +01:00
parent 800ee5cd88
commit 3018c9ad51
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tools/packaging/qemu/patches/tag_patches/ad4c7f529a279685da84297773b4ec8080153c2d-plus-TDX-v1.3/no_patches.txt Normal file
View File

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

@ -242,9 +242,12 @@ 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)
if ! gt_eq "${qemu_version}" "7.2.0" ; then if ! gt_eq "${qemu_version}" "7.0.50" ; then
qemu_options+=(size:--disable-vnc-png) qemu_options+=(size:--disable-vnc-png)
else
qemu_options+=(size:--disable-png)
fi 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
@ -358,7 +361,7 @@ 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.
if ! gt_eq "${qemu_version}" "7.2.0" ; then if ! gt_eq "${qemu_version}" "7.0.50" ; then
qemu_options+=(size:--disable-xfsctl) qemu_options+=(size:--disable-xfsctl)
qemu_options+=(size:--disable-libxml2) qemu_options+=(size:--disable-libxml2)
fi fi

5
versions.yaml
View File

@ -110,9 +110,10 @@ assets:
version: "7a800cf9496fddddf71b21a00991e0ec757a170a" version: "7a800cf9496fddddf71b21a00991e0ec757a170a"
qemu-tdx-experimental: qemu-tdx-experimental:
description: "VMM that uses KVM and supports TDX" # yamllint disable-line rule:line-length
description: "QEMU with TDX support - based on https://github.com/intel/tdx-tools/releases/tag/2023ww01"
url: "https://github.com/kata-containers/qemu" url: "https://github.com/kata-containers/qemu"
tag: "TDX-v3.1" tag: "ad4c7f529a279685da84297773b4ec8080153c2d-plus-TDX-v1.3"
image: image:
description: | description: |