github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-14 05:19:21 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Introduce CoCo-specific enable_annotations

Browse Source 
We need to include `cc_init_data` in the enable_annotations
array to pass the data. Since initdata is a CoCo-specific
feature, this commit introduces a new array,
`DEFENABLEANNOTATIONS_COCO`, which contains the required
string and applies it to the relevant CoCo configuration.

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This commit is contained in:
Hyounggyu Choi
2025-08-19 11:34:32 +02:00
parent 1f978ecc31
commit 208cec429a
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime-rs/Makefile
View File

@@ -147,6 +147,7 @@ DEFMAXMEMSZ := 0
##VAR DEFBRIDGES=<number> Default number of bridges ##VAR DEFBRIDGES=<number> Default number of bridges
DEFBRIDGES := 0 DEFBRIDGES := 0
DEFENABLEANNOTATIONS := [\"kernel_params\"] DEFENABLEANNOTATIONS := [\"kernel_params\"]
DEFENABLEANNOTATIONS_COCO := [\"kernel_params\",\"cc_init_data\"]
DEFDISABLEGUESTSECCOMP := true DEFDISABLEGUESTSECCOMP := true
DEFDISABLEGUESTEMPTYDIR := false DEFDISABLEGUESTEMPTYDIR := false
##VAR DEFAULTEXPFEATURES=[features] Default experimental features enabled ##VAR DEFAULTEXPFEATURES=[features] Default experimental features enabled
@@ -482,6 +483,7 @@ USER_VARS += DEFVIRTIOFSCACHE
USER_VARS += DEFVIRTIOFSQUEUESIZE USER_VARS += DEFVIRTIOFSQUEUESIZE
USER_VARS += DEFVIRTIOFSEXTRAARGS USER_VARS += DEFVIRTIOFSEXTRAARGS
USER_VARS += DEFENABLEANNOTATIONS USER_VARS += DEFENABLEANNOTATIONS
USER_VARS += DEFENABLEANNOTATIONS_COCO
USER_VARS += DEFENABLEIOTHREADS USER_VARS += DEFENABLEIOTHREADS
USER_VARS += DEFSECCOMPSANDBOXPARAM USER_VARS += DEFSECCOMPSANDBOXPARAM
USER_VARS += DEFGUESTSELINUXLABEL USER_VARS += DEFGUESTSELINUXLABEL

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

@@ -45,7 +45,7 @@ confidential_guest = true
# List of valid annotation names for the hypervisor # List of valid annotation names for the hypervisor
# Each member of the list is a regular expression, which is the base name # Each member of the list is a regular expression, which is the base name
# of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path"
enable_annotations = @DEFENABLEANNOTATIONS@ enable_annotations = @DEFENABLEANNOTATIONS_COCO@
# List of valid annotations values for the hypervisor # List of valid annotations values for the hypervisor
# Each member of the list is a path pattern as described by glob(3). # Each member of the list is a path pattern as described by glob(3).

4
src/runtime/Makefile
View File

@@ -217,7 +217,7 @@ DEFMAXMEMSZ := 0
#Default number of bridges #Default number of bridges
DEFBRIDGES := 1 DEFBRIDGES := 1
DEFENABLEANNOTATIONS := [\"enable_iommu\", \"virtio_fs_extra_args\", \"kernel_params\"] DEFENABLEANNOTATIONS := [\"enable_iommu\", \"virtio_fs_extra_args\", \"kernel_params\"]
DEFENABLEANNOTATIONSTEE := [\"enable_iommu\", \"virtio_fs_extra_args\", \"kernel_params\", \"default_vcpus\", \"default_memory\"] DEFENABLEANNOTATIONS_COCO := [\"enable_iommu\", \"virtio_fs_extra_args\", \"kernel_params\", \"default_vcpus\", \"default_memory\", \"cc_init_data\"]
DEFDISABLEGUESTSECCOMP := true DEFDISABLEGUESTSECCOMP := true
DEFDISABLEGUESTEMPTYDIR := false DEFDISABLEGUESTEMPTYDIR := false
#Default experimental features enabled #Default experimental features enabled
@@ -731,7 +731,7 @@ USER_VARS += DEFVIRTIOFSCACHE
USER_VARS += DEFVIRTIOFSQUEUESIZE USER_VARS += DEFVIRTIOFSQUEUESIZE
USER_VARS += DEFVIRTIOFSEXTRAARGS USER_VARS += DEFVIRTIOFSEXTRAARGS
USER_VARS += DEFENABLEANNOTATIONS USER_VARS += DEFENABLEANNOTATIONS
USER_VARS += DEFENABLEANNOTATIONSTEE USER_VARS += DEFENABLEANNOTATIONS_COCO
USER_VARS += DEFENABLEIOTHREADS USER_VARS += DEFENABLEIOTHREADS
USER_VARS += DEFSECCOMPSANDBOXPARAM USER_VARS += DEFSECCOMPSANDBOXPARAM
USER_VARS += DEFENABLEVHOSTUSERSTORE USER_VARS += DEFENABLEVHOSTUSERSTORE

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

@@ -55,7 +55,7 @@ rootfs_type=@DEFROOTFSTYPE@
# List of valid annotation names for the hypervisor # List of valid annotation names for the hypervisor
# Each member of the list is a regular expression, which is the base name # Each member of the list is a regular expression, which is the base name
# of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path"
enable_annotations = @DEFENABLEANNOTATIONSTEE@ enable_annotations = @DEFENABLEANNOTATIONS_COCO@
# List of valid annotations values for the hypervisor # List of valid annotations values for the hypervisor
# Each member of the list is a path pattern as described by glob(3). # Each member of the list is a path pattern as described by glob(3).

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

@@ -40,7 +40,7 @@ confidential_guest = true
# List of valid annotation names for the hypervisor # List of valid annotation names for the hypervisor
# Each member of the list is a regular expression, which is the base name # Each member of the list is a regular expression, which is the base name
# of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path"
enable_annotations = @DEFENABLEANNOTATIONS@ enable_annotations = @DEFENABLEANNOTATIONS_COCO@
# List of valid annotations values for the hypervisor # List of valid annotations values for the hypervisor
# Each member of the list is a path pattern as described by glob(3). # Each member of the list is a path pattern as described by glob(3).

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

@@ -49,7 +49,7 @@ confidential_guest = true
# List of valid annotation names for the hypervisor # List of valid annotation names for the hypervisor
# Each member of the list is a regular expression, which is the base name # Each member of the list is a regular expression, which is the base name
# of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path" # of the annotation, e.g. "path" for io.katacontainers.config.hypervisor.path"
enable_annotations = @DEFENABLEANNOTATIONSTEE@ enable_annotations = @DEFENABLEANNOTATIONS_COCO@
# List of valid annotations values for the hypervisor # List of valid annotations values for the hypervisor
# Each member of the list is a path pattern as described by glob(3). # Each member of the list is a path pattern as described by glob(3).