github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-13 21:09:31 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: reduce generate_netdev_fds() dependencies

Browse Source 
generate_netdev_fds() takes NetworkConfig from which it however only needs
a host-side network device name.  This commit makes it take the device name
directly, making the function useful to callers who don't have the whole
NetworkConfig but do have the requisite device name.

Signed-off-by: Pavel Mores <pmores@redhat.com>
This commit is contained in:
Pavel Mores
2024-03-21 12:48:29 +01:00
parent d4ac45d840
commit 7f23734172
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs
View File

@@ -1135,8 +1135,9 @@ impl<'a> QemuCmdLine<'a> {
) -> Result<Vec<File>> {
let disable_vhost_net = network_info.disable_vhost_net;
let queues = network_info.network_queues;
let if_name = config.host_dev_name.as_str();
let (tun_files, vhost_files) = generate_netdev_fds(config, queues)?;
let (tun_files, vhost_files) = generate_netdev_fds(if_name, queues)?;
let tun_fds: Vec<i32> = tun_files.iter().map(|dev| dev.as_raw_fd()).collect();
let vhost_fds: Vec<i32> = vhost_files.iter().map(|dev| dev.as_raw_fd()).collect();

6
src/runtime-rs/crates/hypervisor/src/qemu/network.rs
View File

@@ -313,11 +313,7 @@ fn create_fds(device: &str, num_fds: usize) -> Result<Vec<File>> {
Ok(fds)
}
pub fn generate_netdev_fds(
network_config: &NetworkConfig,
queues: u32,
) -> Result<(Vec<File>, Vec<File>)> {
let if_name = network_config.host_dev_name.as_str();
pub fn generate_netdev_fds(if_name: &str, queues: u32) -> Result<(Vec<File>, Vec<File>)> {
let tun_taps = open_named_tuntap(if_name, queues)?;
let vhost_fds = create_vhost_net_fds(queues)?;