github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-23 18:21:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6933 from fidencio/topic/cc-fix-image-used-with-qemu-tdx

Browse Source 
CC | runtime: config: Fix image path for QEMU TDX
This commit is contained in:
Steve Horsman 2023-05-24 21:15:28 +01:00 committed by GitHub
commit 499ec324a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/Makefile
View File

@ -152,7 +152,7 @@ SEVKERNELPARAMS := $(AGENTCONFIGFILEKERNELPARAM) agent.enable_signature_verifica
SNPKERNELPARAMS := $(AGENTCONFIGFILEKERNELPARAM) agent.enable_signature_verification=false $(AGENT_AA_KBC_PARAMS_SNP) SNPKERNELPARAMS := $(AGENTCONFIGFILEKERNELPARAM) agent.enable_signature_verification=false $(AGENT_AA_KBC_PARAMS_SNP)
KERNELPARAMS += $(ROOTMEASURECONFIG) agent.enable_signature_verification=false $(AGENT_AA_KBC_PARAMS) KERNELPARAMS += $(ROOTMEASURECONFIG) agent.enable_signature_verification=false $(AGENT_AA_KBC_PARAMS)
FIRMWARETDVFPATH := $(PREFIXDEPS)/share/tdvf/OVMF.fd FIRMWARETDVFPATH := $(PREFIXDEPS)/share/tdvf/OVMF_CODE.fd
FIRMWARETDVFVOLUMEPATH := $(PREFIXDEPS)/share/tdvf/OVMF_VARS.fd FIRMWARETDVFVOLUMEPATH := $(PREFIXDEPS)/share/tdvf/OVMF_VARS.fd
# Name of default configuration file the runtime will use. # Name of default configuration file the runtime will use.

4
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@"
@ -664,7 +664,7 @@ experimental=@DEFAULTEXPFEATURES@
# #
# Offload the CRI image management service to the Kata agent. # Offload the CRI image management service to the Kata agent.
# (default: false) # (default: false)
#service_offload = true service_offload = true
# Container image decryption keys provisioning. # Container image decryption keys provisioning.
# Applies only if service_offload is true. # Applies only if service_offload is true.