github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 20:54:26 +00:00
Code Issues Projects Releases Wiki Activity

runtime: Use TDX image with in the qemu-tdx config

Browse Source 
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>
This commit is contained in:
Fabiano Fidêncio 2023-08-22 20:32:00 +02:00 committed by Dan Mihai
parent ef70aeb6b8
commit 67fed26f18
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/Makefile
View File

@ -56,6 +56,7 @@ BINLIBEXECLIST :=
BIN_PREFIX = $(PROJECT_TYPE) BIN_PREFIX = $(PROJECT_TYPE)
PROJECT_DIR = $(PROJECT_TAG) PROJECT_DIR = $(PROJECT_TAG)
IMAGENAME = $(PROJECT_TAG).img IMAGENAME = $(PROJECT_TAG).img
IMAGETDXNAME = $(PROJECT_TAG)-tdx.img
INITRDNAME = $(PROJECT_TAG)-initrd.img INITRDNAME = $(PROJECT_TAG)-initrd.img
INITRDSEVNAME = $(PROJECT_TAG)-initrd-sev.img INITRDSEVNAME = $(PROJECT_TAG)-initrd-sev.img
@ -116,6 +117,7 @@ PKGLIBEXECDIR := $(LIBEXECDIR)/$(PROJECT_DIR)
KERNELDIR := $(PKGDATADIR) KERNELDIR := $(PKGDATADIR)
IMAGEPATH := $(PKGDATADIR)/$(IMAGENAME) IMAGEPATH := $(PKGDATADIR)/$(IMAGENAME)
IMAGETDXPATH := $(PKGDATADIR)/$(IMAGETDXNAME)
INITRDPATH := $(PKGDATADIR)/$(INITRDNAME) INITRDPATH := $(PKGDATADIR)/$(INITRDNAME)
INITRDSEVPATH := $(PKGDATADIR)/$(INITRDSEVNAME) INITRDSEVPATH := $(PKGDATADIR)/$(INITRDSEVNAME)
@ -497,7 +499,9 @@ USER_VARS += FCJAILERPATH
USER_VARS += FCVALIDJAILERPATHS USER_VARS += FCVALIDJAILERPATHS
USER_VARS += SYSCONFIG USER_VARS += SYSCONFIG
USER_VARS += IMAGENAME USER_VARS += IMAGENAME
USER_VARS += IMAGETDXNAME
USER_VARS += IMAGEPATH USER_VARS += IMAGEPATH
USER_VARS += IMAGETDXPATH
USER_VARS += INITRDNAME USER_VARS += INITRDNAME
USER_VARS += INITRDSEVNAME USER_VARS += INITRDSEVNAME
USER_VARS += INITRDPATH USER_VARS += INITRDPATH

2
src/runtime/config/configuration-qemu-tdx.toml.in
View File

@ -14,7 +14,7 @@
[hypervisor.qemu] [hypervisor.qemu]
path = "@QEMUTDXPATH@" path = "@QEMUTDXPATH@"
kernel = "@KERNELTDXPATH@" kernel = "@KERNELTDXPATH@"
image = "@IMAGEPATH@" image = "@IMAGETDXPATH@"
# initrd = "@INITRDPATH@" # initrd = "@INITRDPATH@"
machine_type = "@MACHINETYPE@" machine_type = "@MACHINETYPE@"