github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-27 15:57:09 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: ch: Remove unused function

Browse Source 
Remove the redundant `parse_mac()` function: this was never used and we
already have an implementation in `crates/resource/src/network/utils/mod.rs`.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2023-11-06 15:05:48 +00:00
parent 949ac4d810
commit bdb83f8282
1 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/runtime-rs/crates/hypervisor/ch-config/src/convert.rs
View File

@ -2,15 +2,14 @@
// //
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
use crate::net_util::MAC_ADDR_LEN;
use crate::NamedHypervisorConfig; use crate::NamedHypervisorConfig;
use crate::VmConfig; use crate::VmConfig;
use crate::{ use crate::{
guest_protection_is_tdx, ConsoleConfig, ConsoleOutputMode, CpuFeatures, CpuTopology, guest_protection_is_tdx, ConsoleConfig, ConsoleOutputMode, CpuFeatures, CpuTopology,
CpusConfig, DiskConfig, MacAddr, MemoryConfig, PayloadConfig, PlatformConfig, PmemConfig, CpusConfig, DiskConfig, MemoryConfig, PayloadConfig, PlatformConfig, PmemConfig, RngConfig,
RngConfig, VsockConfig, VsockConfig,
}; };
use anyhow::{anyhow, Context, Result}; use anyhow::Result;
use kata_sys_util::protection::GuestProtection; use kata_sys_util::protection::GuestProtection;
use kata_types::config::default::DEFAULT_CH_ENTROPY_SOURCE; use kata_types::config::default::DEFAULT_CH_ENTROPY_SOURCE;
use kata_types::config::hypervisor::Hypervisor as HypervisorConfig; use kata_types::config::hypervisor::Hypervisor as HypervisorConfig;
@ -19,7 +18,6 @@ use kata_types::config::hypervisor::{
}; };
use kata_types::config::BootInfo; use kata_types::config::BootInfo;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::fmt::Display;
use std::path::PathBuf; use std::path::PathBuf;
use crate::errors::*; use crate::errors::*;
@ -542,41 +540,6 @@ fn get_platform_cfg(guest_protection_to_use: GuestProtection) -> Option<Platform
} }
} }
#[allow(dead_code)]
fn parse_mac<S>(s: &S) -> Result<MacAddr>
where
S: AsRef<str> + ?Sized + Display,
{
let v: Vec<&str> = s.as_ref().split(':').collect();
let mut bytes = [0u8; MAC_ADDR_LEN];
if v.len() != MAC_ADDR_LEN {
return Err(anyhow!(
"invalid MAC {} (length {}, expected {})",
s,
v.len(),
MAC_ADDR_LEN
));
}
for i in 0..MAC_ADDR_LEN {
if v[i].len() != 2 {
return Err(anyhow!(
"invalid MAC {} (segment {} length {}, expected {})",
s,
i,
v.len(),
2
));
}
bytes[i] =
u8::from_str_radix(v[i], 16).context(format!("failed to parse MAC address: {}", s))?;
}
Ok(MacAddr { bytes })
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;