Skip to content

Add SNP related changes for CLH #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 10, 2023
Merged

Add SNP related changes for CLH #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e60427
Add SNP related changes for CLH
dallasd1 Jul 5, 2023
3a02db5
Revert timeout patch, and increase dial_timeout
dallasd1 Jul 5, 2023
b97a077
Remove DEFSHAREDFS_CLH_SNP_VIRTIOFS and increase clhAPITimeoutConfide…
dallasd1 Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/runtime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ IMAGENAME = $(PROJECT_TAG).img
IMAGETDXNAME = $(PROJECT_TAG)-tdx.img
INITRDNAME = $(PROJECT_TAG)-initrd.img
INITRDSEVNAME = $(PROJECT_TAG)-initrd-sev.img
IGVMNAME = $(PROJECT_TAG)-igvm.img

TARGET = $(BIN_PREFIX)-runtime
RUNTIME_OUTPUT = $(CURDIR)/$(TARGET)
Expand Down Expand Up @@ -104,6 +105,7 @@ GENERATED_VARS = \
CONFIG_CLH_IN \
CONFIG_FC_IN \
CONFIG_CLH_TDX_IN \
CONFIG_CLH_SNP_IN \
CONFIG_QEMU_SE_IN \
CONFIG_REMOTE_IN \
$(USER_VARS)
Expand All @@ -123,6 +125,7 @@ IMAGEPATH := $(PKGDATADIR)/$(IMAGENAME)
IMAGETDXPATH := $(PKGDATADIR)/$(IMAGETDXNAME)
INITRDPATH := $(PKGDATADIR)/$(INITRDNAME)
INITRDSEVPATH := $(PKGDATADIR)/$(INITRDSEVNAME)
IGVMPATH := $(PKGDATADIR)/$(IGVMNAME)

ROOTFSTYPE_EXT4 := \"ext4\"
ROOTFSTYPE_XFS := \"xfs\"
Expand Down Expand Up @@ -187,6 +190,9 @@ QEMUVIRTIOFSPATH := $(QEMUBINDIR)/$(QEMUVIRTIOFSCMD)
CLHPATH := $(CLHBINDIR)/$(CLHCMD)
CLHVALIDHYPERVISORPATHS := [\"$(CLHPATH)\"]

CLHSNPPATH := $(CLHBINDIR)/$(CLHSNPCMD)
CLHSNPVALIDHYPERVISORPATHS := [\"$(CLHSNPPATH)\"]

FCPATH = $(FCBINDIR)/$(FCCMD)
FCVALIDHYPERVISORPATHS := [\"$(FCPATH)\"]
FCJAILERPATH = $(FCBINDIR)/$(FCJAILERCMD)
Expand Down Expand Up @@ -418,6 +424,18 @@ ifneq (,$(QEMUCMD))

CONFIGS += $(CONFIG_QEMU_NVIDIA_GPU)

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
DEFBLOCKDEVICEAIO_QEMU := io_uring
Expand Down Expand Up @@ -597,6 +615,9 @@ USER_VARS += ACRNCTLPATH
USER_VARS += ACRNVALIDCTLPATHS
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
Expand All @@ -610,8 +631,10 @@ USER_VARS += IMAGETDXNAME
USER_VARS += IMAGETDXPATH
USER_VARS += INITRDNAME
USER_VARS += INITRDSEVNAME
USER_VARS += IGVMNAME
USER_VARS += INITRDPATH
USER_VARS += INITRDSEVPATH
USER_VARS += IGVMPATH
USER_VARS += DEFROOTFSTYPE
USER_VARS += MACHINETYPE
USER_VARS += KERNELDIR
Expand Down
1 change: 1 addition & 0 deletions src/runtime/arch/amd64-options.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ ACRNCTLCMD := acrnctl

# cloud-hypervisor binary name
CLHCMD := cloud-hypervisor
CLHSNPCMD := cloud-hypervisor-snp
1 change: 1 addition & 0 deletions src/runtime/arch/arm64-options.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ FCJAILERCMD := jailer

# cloud-hypervisor binary name
CLHCMD := cloud-hypervisor
CLHSNPCMD := cloud-hypervisor-snp
Loading