github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-22 12:29:49 +00:00
Code Issues Projects Releases Wiki Activity

runtime: Use confidential image / initrd instead of TEE specific ones

Browse Source 
Now that we have a confidential image / initrd being built, instead of a
specific one for each TEE, let's use it everywhere possible.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2024-02-03 12:36:51 +01:00
parent e0bb632053
commit e4258d8694
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/runtime/Makefile
View File

@@ -56,9 +56,9 @@ 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 IMAGECONFIDENTIALNAME = $(PROJECT_TAG)-confidential.img
INITRDNAME = $(PROJECT_TAG)-initrd.img INITRDNAME = $(PROJECT_TAG)-initrd.img
INITRDSEVNAME = $(PROJECT_TAG)-initrd-sev.img INITRDCONFIDENTIALNAME = $(PROJECT_TAG)-initrd-confidential.img
TARGET = $(BIN_PREFIX)-runtime TARGET = $(BIN_PREFIX)-runtime
RUNTIME_OUTPUT = $(CURDIR)/$(TARGET) RUNTIME_OUTPUT = $(CURDIR)/$(TARGET)
@@ -121,9 +121,9 @@ PKGLIBEXECDIR := $(LIBEXECDIR)/$(PROJECT_DIR)
KERNELDIR := $(PKGDATADIR) KERNELDIR := $(PKGDATADIR)
IMAGEPATH := $(PKGDATADIR)/$(IMAGENAME) IMAGEPATH := $(PKGDATADIR)/$(IMAGENAME)
IMAGETDXPATH := $(PKGDATADIR)/$(IMAGETDXNAME) IMAGECONFIDENTIALPATH := $(PKGDATADIR)/$(IMAGECONFIDENTIALNAME)
INITRDPATH := $(PKGDATADIR)/$(INITRDNAME) INITRDPATH := $(PKGDATADIR)/$(INITRDNAME)
INITRDSEVPATH := $(PKGDATADIR)/$(INITRDSEVNAME) INITRDCONFIDENTIALPATH := $(PKGDATADIR)/$(INITRDCONFIDENTIALNAME)
ROOTFSTYPE_EXT4 := \"ext4\" ROOTFSTYPE_EXT4 := \"ext4\"
ROOTFSTYPE_XFS := \"xfs\" ROOTFSTYPE_XFS := \"xfs\"
@@ -561,13 +561,13 @@ USER_VARS += STRATOVIRTPATH
USER_VARS += STRATOVIRTVALIDHYPERVISORPATHS USER_VARS += STRATOVIRTVALIDHYPERVISORPATHS
USER_VARS += SYSCONFIG USER_VARS += SYSCONFIG
USER_VARS += IMAGENAME USER_VARS += IMAGENAME
USER_VARS += IMAGETDXNAME USER_VARS += IMAGECONFIDENTIALNAME
USER_VARS += IMAGEPATH USER_VARS += IMAGEPATH
USER_VARS += IMAGETDXPATH USER_VARS += IMAGECONFIDENTIALPATH
USER_VARS += INITRDNAME USER_VARS += INITRDNAME
USER_VARS += INITRDSEVNAME USER_VARS += INITRDCONFIDENTIALNAME
USER_VARS += INITRDPATH USER_VARS += INITRDPATH
USER_VARS += INITRDSEVPATH USER_VARS += INITRDCONFIDENTIALPATH
USER_VARS += DEFROOTFSTYPE USER_VARS += DEFROOTFSTYPE
USER_VARS += MACHINETYPE USER_VARS += MACHINETYPE
USER_VARS += KERNELDIR USER_VARS += KERNELDIR

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

@@ -13,7 +13,7 @@
[hypervisor.qemu] [hypervisor.qemu]
path = "@QEMUPATH@" path = "@QEMUPATH@"
kernel = "@KERNELCONFIDENTIALPATH@" kernel = "@KERNELCONFIDENTIALPATH@"
initrd = "@INITRDSEVPATH@" initrd = "@INITRDCONFIDENTIALPATH@"
machine_type = "@MACHINETYPE@" machine_type = "@MACHINETYPE@"
# Enable confidential guest support. # Enable confidential guest support.

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

@@ -16,7 +16,7 @@
path = "@QEMUSNPPATH@" path = "@QEMUSNPPATH@"
kernel = "@KERNELCONFIDENTIALPATH@" kernel = "@KERNELCONFIDENTIALPATH@"
#image = "@IMAGEPATH@" #image = "@IMAGEPATH@"
initrd = "@INITRDSEVPATH@" initrd = "@INITRDCONFIDENTIALPATH@"
machine_type = "@MACHINETYPE@" machine_type = "@MACHINETYPE@"
# rootfs filesystem type: # rootfs filesystem type:

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

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