From f0db4032f281138e169997e9836a609eab08c25e Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Tue, 19 Aug 2025 10:13:22 +0200 Subject: [PATCH] Revert "kata-types: Align the initdata annotation with kata-runtime's definition" This reverts commit ede773db176d60aea0a134953f2c3bf05b17c2ea. `cc_init_data` should be under a hypervisor category because it is a hypervisor-specific feature. The annotation including `runtime` also breaks a logic for `is_annotation_enabled()`. Signed-off-by: Hyounggyu Choi --- src/libs/kata-types/src/annotations/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/kata-types/src/annotations/mod.rs b/src/libs/kata-types/src/annotations/mod.rs index 8e2f455f17..c7c9975eb2 100644 --- a/src/libs/kata-types/src/annotations/mod.rs +++ b/src/libs/kata-types/src/annotations/mod.rs @@ -273,7 +273,8 @@ 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_RUNTIME_INIT_DATA: &str = "io.katacontainers.config.runtime.cc_init_data"; +pub const KATA_ANNO_CFG_HYPERVISOR_INIT_DATA: &str = + "io.katacontainers.config.hypervisor.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.