From 67fed26f18c4393cedf1e47b14c832182d6645e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Tue, 22 Aug 2023 20:32:00 +0200
Subject: [PATCH] runtime: Use TDX image with in the qemu-tdx config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let's make sure we use the TDX image as part of the QEMU TDX
configuration, which will help us to have the policies tested here.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 src/runtime/Makefile                              | 4 ++++
 src/runtime/config/configuration-qemu-tdx.toml.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index f34d21249a..cef38076e7 100644
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -56,6 +56,7 @@ BINLIBEXECLIST :=
 BIN_PREFIX = $(PROJECT_TYPE)
 PROJECT_DIR = $(PROJECT_TAG)
 IMAGENAME = $(PROJECT_TAG).img
+IMAGETDXNAME = $(PROJECT_TAG)-tdx.img
 INITRDNAME = $(PROJECT_TAG)-initrd.img
 INITRDSEVNAME = $(PROJECT_TAG)-initrd-sev.img
 
@@ -116,6 +117,7 @@ PKGLIBEXECDIR := $(LIBEXECDIR)/$(PROJECT_DIR)
 KERNELDIR := $(PKGDATADIR)
 
 IMAGEPATH := $(PKGDATADIR)/$(IMAGENAME)
+IMAGETDXPATH := $(PKGDATADIR)/$(IMAGETDXNAME)
 INITRDPATH := $(PKGDATADIR)/$(INITRDNAME)
 INITRDSEVPATH := $(PKGDATADIR)/$(INITRDSEVNAME)
 
@@ -497,7 +499,9 @@ USER_VARS += FCJAILERPATH
 USER_VARS += FCVALIDJAILERPATHS
 USER_VARS += SYSCONFIG
 USER_VARS += IMAGENAME
+USER_VARS += IMAGETDXNAME
 USER_VARS += IMAGEPATH
+USER_VARS += IMAGETDXPATH
 USER_VARS += INITRDNAME
 USER_VARS += INITRDSEVNAME
 USER_VARS += INITRDPATH
diff --git a/src/runtime/config/configuration-qemu-tdx.toml.in b/src/runtime/config/configuration-qemu-tdx.toml.in
index ab0b57a21e..ca5d0ded3a 100644
--- a/src/runtime/config/configuration-qemu-tdx.toml.in
+++ b/src/runtime/config/configuration-qemu-tdx.toml.in
@@ -14,7 +14,7 @@
 [hypervisor.qemu]
 path = "@QEMUTDXPATH@"
 kernel = "@KERNELTDXPATH@"
-image = "@IMAGEPATH@"
+image = "@IMAGETDXPATH@"
 # initrd = "@INITRDPATH@"
 machine_type = "@MACHINETYPE@"