diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index 7cf88ac042..77cddf4b11 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -147,6 +147,7 @@ DEFMAXMEMSZ := 0 ##VAR DEFBRIDGES= Default number of bridges DEFBRIDGES := 0 DEFENABLEANNOTATIONS := [\"kernel_params\"] +DEFENABLEANNOTATIONS_COCO := [\"kernel_params\",\"cc_init_data\"] DEFDISABLEGUESTSECCOMP := true DEFDISABLEGUESTEMPTYDIR := false ##VAR DEFAULTEXPFEATURES=[features] Default experimental features enabled @@ -482,6 +483,7 @@ USER_VARS += DEFVIRTIOFSCACHE USER_VARS += DEFVIRTIOFSQUEUESIZE USER_VARS += DEFVIRTIOFSEXTRAARGS USER_VARS += DEFENABLEANNOTATIONS +USER_VARS += DEFENABLEANNOTATIONS_COCO USER_VARS += DEFENABLEIOTHREADS USER_VARS += DEFSECCOMPSANDBOXPARAM USER_VARS += DEFGUESTSELINUXLABEL diff --git a/src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in b/src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in index a2d6fbecb1..46d1d68647 100644 --- a/src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in +++ b/src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in @@ -45,7 +45,7 @@ confidential_guest = true # List of valid annotation names for the hypervisor # 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" -enable_annotations = @DEFENABLEANNOTATIONS@ +enable_annotations = @DEFENABLEANNOTATIONS_COCO@ # List of valid annotations values for the hypervisor # Each member of the list is a path pattern as described by glob(3). diff --git a/src/runtime/Makefile b/src/runtime/Makefile index b10bd0f3f6..748a222c8e 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -217,7 +217,7 @@ DEFMAXMEMSZ := 0 #Default number of bridges DEFBRIDGES := 1 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 DEFDISABLEGUESTEMPTYDIR := false #Default experimental features enabled @@ -731,7 +731,7 @@ USER_VARS += DEFVIRTIOFSCACHE USER_VARS += DEFVIRTIOFSQUEUESIZE USER_VARS += DEFVIRTIOFSEXTRAARGS USER_VARS += DEFENABLEANNOTATIONS -USER_VARS += DEFENABLEANNOTATIONSTEE +USER_VARS += DEFENABLEANNOTATIONS_COCO USER_VARS += DEFENABLEIOTHREADS USER_VARS += DEFSECCOMPSANDBOXPARAM USER_VARS += DEFENABLEVHOSTUSERSTORE diff --git a/src/runtime/config/configuration-qemu-coco-dev.toml.in b/src/runtime/config/configuration-qemu-coco-dev.toml.in index 79de271708..05ef3b54bb 100644 --- a/src/runtime/config/configuration-qemu-coco-dev.toml.in +++ b/src/runtime/config/configuration-qemu-coco-dev.toml.in @@ -55,7 +55,7 @@ rootfs_type=@DEFROOTFSTYPE@ # List of valid annotation names for the hypervisor # 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" -enable_annotations = @DEFENABLEANNOTATIONSTEE@ +enable_annotations = @DEFENABLEANNOTATIONS_COCO@ # List of valid annotations values for the hypervisor # Each member of the list is a path pattern as described by glob(3). diff --git a/src/runtime/config/configuration-qemu-se.toml.in b/src/runtime/config/configuration-qemu-se.toml.in index 9f3c258dc8..fba6f4c34d 100644 --- a/src/runtime/config/configuration-qemu-se.toml.in +++ b/src/runtime/config/configuration-qemu-se.toml.in @@ -40,7 +40,7 @@ confidential_guest = true # List of valid annotation names for the hypervisor # 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" -enable_annotations = @DEFENABLEANNOTATIONS@ +enable_annotations = @DEFENABLEANNOTATIONS_COCO@ # List of valid annotations values for the hypervisor # Each member of the list is a path pattern as described by glob(3). diff --git a/src/runtime/config/configuration-qemu-tdx.toml.in b/src/runtime/config/configuration-qemu-tdx.toml.in index 1c810e8cd6..de8b34c436 100644 --- a/src/runtime/config/configuration-qemu-tdx.toml.in +++ b/src/runtime/config/configuration-qemu-tdx.toml.in @@ -49,7 +49,7 @@ confidential_guest = true # List of valid annotation names for the hypervisor # 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" -enable_annotations = @DEFENABLEANNOTATIONSTEE@ +enable_annotations = @DEFENABLEANNOTATIONS_COCO@ # List of valid annotations values for the hypervisor # Each member of the list is a path pattern as described by glob(3).