diff --git a/src/libs/kata-types/src/config/hypervisor/mod.rs b/src/libs/kata-types/src/config/hypervisor/mod.rs index a4fe367250..b320fa23b7 100644 --- a/src/libs/kata-types/src/config/hypervisor/mod.rs +++ b/src/libs/kata-types/src/config/hypervisor/mod.rs @@ -241,14 +241,12 @@ impl BootInfo { /// Add kernel parameters to bootinfo. It is always added before the original /// to let the original one takes priority - pub fn add_kparams(&mut self, params: Vec) { + pub fn add_kernel_params(&mut self, params: Vec) { let mut p = params; - if self.kernel_params.is_empty() { - self.kernel_params = p.join(KERNEL_PARAM_DELIMITER); - } else { + if !self.kernel_params.is_empty() { p.push(self.kernel_params.clone()); // [new_params0, new_params1, ..., original_params] - self.kernel_params = p.join(KERNEL_PARAM_DELIMITER); } + self.kernel_params = p.join(KERNEL_PARAM_DELIMITER); } /// Validate guest kernel image annotaion @@ -1083,7 +1081,7 @@ mod tests { } #[test] - fn test_add_kparams() { + fn test_add_kernel_params() { let mut boot_info = BootInfo { ..Default::default() }; @@ -1092,7 +1090,7 @@ mod tests { String::from("bar"), String::from("baz=faz"), ]; - boot_info.add_kparams(params); + boot_info.add_kernel_params(params); assert_eq!(boot_info.kernel_params, String::from("foo bar baz=faz")); @@ -1101,7 +1099,7 @@ mod tests { String::from("a"), String::from("b=c"), ]; - boot_info.add_kparams(new_params); + boot_info.add_kernel_params(new_params); assert_eq!( boot_info.kernel_params, diff --git a/src/libs/kata-types/src/config/mod.rs b/src/libs/kata-types/src/config/mod.rs index 514210c942..863dd7590e 100644 --- a/src/libs/kata-types/src/config/mod.rs +++ b/src/libs/kata-types/src/config/mod.rs @@ -171,7 +171,7 @@ impl TomlConfig { } /// Get agent-specfic kernel parameters for further Hypervisor config revision - pub fn get_agent_kparams(&self) -> Result> { + pub fn get_agent_kernel_params(&self) -> Result> { let mut kv = HashMap::new(); if let Some(cfg) = self.agent.get(&self.runtime.agent_name) { if cfg.debug { @@ -349,7 +349,7 @@ mod tests { } #[test] - fn test_get_agent_kparams() { + fn test_get_agent_kernel_params() { let mut config = TomlConfig { ..Default::default() }; @@ -364,7 +364,7 @@ mod tests { config.runtime.agent_name = agent_name.to_string(); config.agent.insert(agent_name.to_owned(), agent_config); - let kv = config.get_agent_kparams().unwrap(); + let kv = config.get_agent_kernel_params().unwrap(); assert_eq!(kv.get("agent.log").unwrap(), "debug"); assert_eq!(kv.get("agent.trace").unwrap(), "true"); assert_eq!(kv.get("agent.container_pipe_size").unwrap(), "20"); diff --git a/src/runtime-rs/crates/runtimes/src/manager.rs b/src/runtime-rs/crates/runtimes/src/manager.rs index 7b049d86ac..c6761d7e05 100644 --- a/src/runtime-rs/crates/runtimes/src/manager.rs +++ b/src/runtime-rs/crates/runtimes/src/manager.rs @@ -324,7 +324,7 @@ fn load_config(spec: &oci::Spec) -> Result { let (mut toml_config, _) = TomlConfig::load_from_file(&config_path).context("load toml config")?; annotation.update_config_by_annotation(&mut toml_config)?; - update_agent_kparams(&mut toml_config)?; + update_agent_kernel_params(&mut toml_config)?; // validate configuration and return the error toml_config.validate()?; @@ -351,16 +351,16 @@ fn load_config(spec: &oci::Spec) -> Result { // this update the agent-specfic kernel parameters into hypervisor's bootinfo // the agent inside the VM will read from file cmdline to get the params and function -fn update_agent_kparams(config: &mut TomlConfig) -> Result<()> { +fn update_agent_kernel_params(config: &mut TomlConfig) -> Result<()> { let mut params = vec![]; - if let Ok(kv) = config.get_agent_kparams() { + if let Ok(kv) = config.get_agent_kernel_params() { for (k, v) in kv.into_iter() { if let Ok(s) = Param::new(k.as_str(), v.as_str()).to_string() { params.push(s); } } if let Some(h) = config.hypervisor.get_mut(&config.runtime.hypervisor_name) { - h.boot_info.add_kparams(params); + h.boot_info.add_kernel_params(params); } } Ok(())