From dc2e8cd317095ff708925dfe4c96abbdbdaa19a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 16 Aug 2022 11:36:28 +0200 Subject: [PATCH] runtime: Fix TDVF configuration with QEMU TDX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of setting: ``` firmware = "/path/to/OVMF.fd" firmware_volume = "/path/to/OVMF_VARS.fd" ``` We should either be setting: ``` firmware = "/path/to/OVMF.fd" ``` Or: ``` firmware = "/path/to/OVMF_CODE.fd" firmware_volume = "/path/to/OVMF_VARS.fd" ``` I'm taking the approach to setting up the latter, as that's what's been tested as part of our TDX CI. Fixes: #4926 Signed-off-by: Fabiano Fidêncio --- src/runtime/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/Makefile b/src/runtime/Makefile index 320a608d49..6a4f87c9ff 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -113,7 +113,7 @@ KERNELDIR := $(PKGDATADIR) IMAGEPATH := $(PKGDATADIR)/$(IMAGENAME) FIRMWAREPATH := FIRMWAREVOLUMEPATH := -TDVFFIRMWAREPATH := $(PREFIXDEPS)/share/tdvf/OVMF.fd +TDVFFIRMWAREPATH := $(PREFIXDEPS)/share/tdvf/OVMF_CODE.fd TDVFFIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/tdvf/OVMF_VARS.fd TDXKERNELPARAMS := force_tdx_guest tdx_disable_filter