diff --git a/src/libs/kata-types/src/annotations/mod.rs b/src/libs/kata-types/src/annotations/mod.rs index 2974ab8cc8..57595fd8f8 100644 --- a/src/libs/kata-types/src/annotations/mod.rs +++ b/src/libs/kata-types/src/annotations/mod.rs @@ -273,8 +273,7 @@ pub const KATA_ANNO_CFG_HYPERVISOR_VIRTIO_FS_EXTRA_ARGS: &str = /// A sandbox annotation to specify as the msize for 9p shares. pub const KATA_ANNO_CFG_HYPERVISOR_MSIZE_9P: &str = "io.katacontainers.config.hypervisor.msize_9p"; /// The initdata annotation passed in when CVM launchs -pub const KATA_ANNO_CFG_HYPERVISOR_INIT_DATA: &str = - "io.katacontainers.config.runtime.cc_init_data"; +pub const KATA_ANNO_CFG_RUNTIME_INIT_DATA: &str = "io.katacontainers.config.runtime.cc_init_data"; /// GPU specific annotations for remote hypervisor to help with instance selection /// It's for minimum number of GPUs required for the VM. @@ -895,7 +894,7 @@ impl Annotation { hv.security_info.validate_path(value)?; hv.security_info.guest_hook_path = value.to_string(); } - KATA_ANNO_CFG_HYPERVISOR_INIT_DATA => { + KATA_ANNO_CFG_RUNTIME_INIT_DATA => { hv.security_info.initdata = add_hypervisor_initdata_overrides(value).unwrap(); } diff --git a/src/runtime-rs/crates/hypervisor/src/remote/inner.rs b/src/runtime-rs/crates/hypervisor/src/remote/inner.rs index ab6413773d..246c6f19b7 100644 --- a/src/runtime-rs/crates/hypervisor/src/remote/inner.rs +++ b/src/runtime-rs/crates/hypervisor/src/remote/inner.rs @@ -14,8 +14,8 @@ use kata_types::{ cri_containerd::{SANDBOX_NAMESPACE_LABEL_KEY, SANDBOX_NAME_LABEL_KEY}, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_GPUS, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_GPU_MODEL, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_MEMORY, KATA_ANNO_CFG_HYPERVISOR_DEFAULT_VCPUS, - KATA_ANNO_CFG_HYPERVISOR_IMAGE_PATH, KATA_ANNO_CFG_HYPERVISOR_INIT_DATA, - KATA_ANNO_CFG_HYPERVISOR_MACHINE_TYPE, + KATA_ANNO_CFG_HYPERVISOR_IMAGE_PATH, KATA_ANNO_CFG_HYPERVISOR_MACHINE_TYPE, + KATA_ANNO_CFG_RUNTIME_INIT_DATA, }, capabilities::{Capabilities, CapabilityBits}, }; @@ -127,7 +127,7 @@ impl RemoteInner { config.boot_info.image.to_string(), ); annotations.insert( - KATA_ANNO_CFG_HYPERVISOR_INIT_DATA.to_string(), + KATA_ANNO_CFG_RUNTIME_INIT_DATA.to_string(), config.security_info.initdata.to_string(), ); annotations.insert(