runtime: add SNP related changes for CLH (#33)

Add configuration file configuration-clh-snp.toml with SNP related settings enabled

Signed-off-by: Dallas Delaney <dadelan@microsoft.com>

Author: dallasd1

src/libs/protocols/Cargo.toml

@@ -13,7 +13,7 @@ async = ["ttrpc/async", "async-trait"]
 [dependencies]
 ttrpc = "0.8.4"
 async-trait = { version = "0.1.42", optional = true }
-protobuf = { version = "3.2.0" }
+protobuf = { version = "=3.7.1" }
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.68"
 oci-spec = { version = "0.6.8", features = ["runtime"] }

src/runtime/Makefile

@@ -65,6 +65,8 @@ IMAGENAME_NV = $(PROJECT_TAG)-nvidia-gpu.img
 IMAGENAME_CONFIDENTIAL_NV = $(PROJECT_TAG)-nvidia-gpu-confidential.img
 INITRDNAME_NV = $(PROJECT_TAG)-initrd-nvidia-gpu.img
 INITRDNAME_CONFIDENTIAL_NV = $(PROJECT_TAG)-initrd-nvidia-gpu-confidential.img
+INITRDSEVNAME = $(PROJECT_TAG)-initrd-sev.img
+IGVMNAME = $(PROJECT_TAG)-igvm.img
 
 TARGET = $(BIN_PREFIX)-runtime
 RUNTIME_OUTPUT = $(CURDIR)/$(TARGET)
@@ -111,6 +113,7 @@ GENERATED_VARS = \
 		CONFIG_QEMU_SNP_IN \
 		CONFIG_CLH_IN \
 		CONFIG_FC_IN \
+		CONFIG_CLH_SNP_IN \
 		CONFIG_STRATOVIRT_IN \
 		CONFIG_REMOTE_IN \
 		CONFIG_QEMU_SE_IN \
@@ -136,6 +139,8 @@ IMAGEPATH_NV := $(PKGDATADIR)/$(IMAGENAME_NV)
 IMAGEPATH_CONFIDENTIAL_NV := $(PKGDATADIR)/$(IMAGENAME_CONFIDENTIAL_NV)
 INITRDPATH_NV := $(PKGDATADIR)/$(INITRDNAME_NV)
 INITRDPATH_CONFIDENTIAL_NV := $(PKGDATADIR)/$(INITRDNAME_CONFIDENTIAL_NV)
+INITRDSEVPATH := $(PKGDATADIR)/$(INITRDSEVNAME)
+IGVMPATH := $(PKGDATADIR)/$(IGVMNAME)
 
 ROOTFSTYPE_EXT4 := \"ext4\"
 ROOTFSTYPE_XFS := \"xfs\"
@@ -187,6 +192,9 @@ QEMUVIRTIOFSPATH := $(QEMUBINDIR)/$(QEMUVIRTIOFSCMD)
 CLHPATH := $(CLHBINDIR)/$(CLHCMD)
 CLHVALIDHYPERVISORPATHS := [\"$(CLHPATH)\"]
 
+CLHSNPPATH := $(CLHBINDIR)/$(CLHSNPCMD)
+CLHSNPVALIDHYPERVISORPATHS := [\"$(CLHSNPPATH)\"]
+
 FCPATH = $(FCBINDIR)/$(FCCMD)
 FCVALIDHYPERVISORPATHS := [\"$(FCPATH)\"]
 FCJAILERPATH = $(FCBINDIR)/$(FCJAILERCMD)
@@ -422,6 +430,17 @@ ifneq (,$(QEMUCMD))
     SYSCONFIG_PATHS += $(SYSCONFIG_QEMU_SE)
 
     CONFIGS += $(CONFIG_QEMU_SE)
+    CONFIG_FILE_CLH_SNP = configuration-clh-snp.toml
+    CONFIG_CLH_SNP = config/$(CONFIG_FILE_CLH_SNP)
+    CONFIG_CLH_SNP_IN = $(CONFIG_CLH_SNP).in
+
+    CONFIG_PATH_CLH_SNP = $(abspath $(CONFDIR)/$(CONFIG_FILE_CLH_SNP))
+    CONFIG_PATHS += $(CONFIG_PATH_CLH_SNP)
+
+    SYSCONFIG_CLH_SNP = $(abspath $(SYSCONFDIR)/$(CONFIG_FILE_CLH_SNP))
+    SYSCONFIG_PATHS += $(SYSCONFIG_CLH_SNP)
+
+    CONFIGS += $(CONFIG_CLH_SNP)
 
     # qemu-specific options (all should be suffixed by "_QEMU")
     DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi
@@ -610,6 +629,9 @@ USER_VARS += DESTDIR
 USER_VARS += DEFAULT_HYPERVISOR
 USER_VARS += CLHPATH
 USER_VARS += CLHVALIDHYPERVISORPATHS
+USER_VARS += CLHSNPCMD
+USER_VARS += CLHSNPPATH
+USER_VARS += CLHSNPVALIDHYPERVISORPATHS
 USER_VARS += FIRMWAREPATH_CLH
 USER_VARS += FCCMD
 USER_VARS += FCPATH
@@ -649,6 +671,11 @@ USER_VARS += KERNELSNPPARAMS_NV
 USER_VARS += DEFAULTTIMEOUT_NV
 USER_VARS += DEFSANDBOXCGROUPONLY_NV
 USER_VARS += FIRMWAREPATH_NV
+USER_VARS += INITRDSEVNAME
+USER_VARS += IGVMNAME
+USER_VARS += INITRDPATH
+USER_VARS += INITRDSEVPATH
+USER_VARS += IGVMPATH
 USER_VARS += DEFROOTFSTYPE
 USER_VARS += MACHINETYPE
 USER_VARS += KERNELDIR

src/runtime/arch/amd64-options.mk

@@ -23,6 +23,7 @@ FCJAILERCMD := jailer
 
 # cloud-hypervisor binary name
 CLHCMD := cloud-hypervisor
+CLHSNPCMD := cloud-hypervisor-snp
 
 DEFSTATICRESOURCEMGMT_CLH := false
 

src/runtime/arch/arm64-options.mk

@@ -19,6 +19,7 @@ FCJAILERCMD := jailer
 
 # cloud-hypervisor binary name
 CLHCMD := cloud-hypervisor
+CLHSNPCMD := cloud-hypervisor-snp
 
 DEFSTATICRESOURCEMGMT_CLH := true