diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 45597488c2..d6aa51bd07 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -29,6 +29,7 @@ BASE_TARBALLS = serial-targets \ ovmf-sev-tarball \ ovmf-tarball \ qemu-snp-experimental-tarball \ + qemu-tdx-experimental-tarball \ qemu-tarball \ stratovirt-tarball \ shim-v2-tarball \ @@ -146,6 +147,9 @@ ovmf-tarball: qemu-snp-experimental-tarball: ${MAKE} $@-build +qemu-tdx-experimental-tarball: + ${MAKE} $@-build + qemu-tarball: ${MAKE} $@-build diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 822776610a..049de9e9cc 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -116,6 +116,7 @@ options: ovmf-sev qemu qemu-snp-experimental + qemu-tdx-experimental stratovirt rootfs-image rootfs-image-confidential @@ -706,6 +707,17 @@ install_qemu_snp_experimental() { "${qemu_experimental_builder}" } +install_qemu_tdx_experimental() { + export qemu_suffix="tdx-experimental" + export qemu_tarball_name="kata-static-qemu-${qemu_suffix}.tar.gz" + + install_qemu_helper \ + "assets.hypervisor.qemu-${qemu_suffix}.url" \ + "assets.hypervisor.qemu-${qemu_suffix}.tag" \ + "qemu-${qemu_suffix}" \ + "${qemu_experimental_builder}" +} + # Install static firecracker asset install_firecracker() { local firecracker_version=$(get_from_kata_deps ".assets.hypervisor.firecracker.version") @@ -1132,6 +1144,7 @@ handle_build() { install_ovmf_sev install_qemu install_qemu_snp_experimental + install_qemu_tdx_experimental install_stratovirt install_runk install_shimv2 @@ -1187,6 +1200,8 @@ handle_build() { qemu-snp-experimental) install_qemu_snp_experimental ;; + qemu-tdx-experimental) install_qemu_tdx_experimental ;; + stratovirt) install_stratovirt ;; rootfs-image) install_image ;; diff --git a/tools/packaging/qemu/patches/tag_patches/gpu-snp-20250211/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/gpu-snp-20250211/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/versions.yaml b/versions.yaml index a566edc0e3..f685949fcf 100644 --- a/versions.yaml +++ b/versions.yaml @@ -100,9 +100,14 @@ assets: .*/v?(\d\S+)\.tar\.gz qemu-snp-experimental: - description: "QEMU with SNP support" + description: "QEMU with GPU+SNP support" url: "https://github.com/confidential-containers/qemu.git" - tag: "amd-snp-202402240000" + tag: "gpu-snp-20250211" + + qemu-tdx-experimental: + description: "QEMU with GPU+TDX support" + url: "https://github.com/confidential-containers/qemu.git" + tag: "gpu-tdx-20250211" stratovirt: description: "StratoVirt is an lightweight opensource VMM"