Merge pull request #9011 from fidencio/topic/switch-to-using-the-conf…

…idential-rootfs

runtime: Replace TEE specific initrd / image for the confidential one

.github/workflows/build-kata-static-tarball-amd64.yaml

@@ -50,11 +50,9 @@ jobs:
           - stratovirt
           - rootfs-image
           - rootfs-image-confidential
-          - rootfs-image-tdx
           - rootfs-initrd
           - rootfs-initrd-confidential
           - rootfs-initrd-mariner
-          - rootfs-initrd-sev
           - runk
           - shim-v2
           - tdvf

src/runtime/Makefile

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

src/runtime/config/configuration-qemu-sev.toml.in

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

src/runtime/config/configuration-qemu-snp.toml.in

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

src/runtime/config/configuration-qemu-tdx.toml.in

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