github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 08:17:37 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: refactor QemuCmdLine::add_network_device() signature

Browse Source 
add_network_device() doesn't need to be passed NetworkInfo since it
already has access to the full HypervisorConfig.

Also, one of the goals of QemuCmdLine interface's design is to avoid
coupling between QemuCmdLine and the hypervisor crate's device module,
if at all possible.  That's why add_network_device() shouldn't take
device module's NetworkConfig but just parts that are useful in
add_network_device()'s implementation.

Signed-off-by: Pavel Mores <pmores@redhat.com>
This commit is contained in:
Pavel Mores 2024-03-22 19:33:33 +01:00
parent a4f033f864
commit 0cf0e923fc
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,11 +5,10 @@
use super::network::{generate_netdev_fds, NetDevice};
use crate::utils::clear_cloexec;
use crate::{kernel_param::KernelParams, Address, HypervisorConfig, NetworkConfig};
use crate::{kernel_param::KernelParams, Address, HypervisorConfig};
use anyhow::{anyhow, Context, Result};
use async_trait::async_trait;
use kata_types::config::hypervisor::NetworkInfo;
use std::collections::HashMap;
use std::fmt::Display;
use std::fs::{read_to_string, File};
@ -1262,20 +1261,20 @@ impl<'a> QemuCmdLine<'a> {
pub fn add_network_device(
&mut self,
config: &NetworkConfig,
_network_info: &NetworkInfo,
) -> Result<Vec<File>> {
dev_index: u64,
host_dev_name: &str,
guest_mac: Address,
) -> Result<()> {
let mut netdev = Netdev::new(
&format!("network-{}", &config.index),
&config.host_dev_name,
&format!("network-{}", dev_index),
host_dev_name,
self.config.network_info.network_queues,
)?;
if self.config.network_info.disable_vhost_net {
netdev.set_disable_vhost_net(true);
}
let mut virtio_net_device =
DeviceVirtioNet::new(&netdev.id, config.guest_mac.clone().unwrap());
let mut virtio_net_device = DeviceVirtioNet::new(&netdev.id, guest_mac);
if should_disable_modern() {
virtio_net_device.set_disable_modern(true);
@ -1286,7 +1285,7 @@ impl<'a> QemuCmdLine<'a> {
self.devices.push(Box::new(netdev));
self.devices.push(Box::new(virtio_net_device));
Ok(vec![])
Ok(())
}
pub fn add_console(&mut self, console_socket_path: &str) {

9
src/runtime-rs/crates/hypervisor/src/qemu/inner.rs
View File

@ -112,13 +112,14 @@ impl QemuInner {
}
}
DeviceType::Network(network) => {
let network_info = &self.config.network_info;
// we need ensure add_network_device happens in netns.
let _netns_guard = NetnsGuard::new(&netns).context("new netns guard")?;
_fds_for_qemu
.append(&mut cmdline.add_network_device(&network.config, network_info)?);
cmdline.add_network_device(
network.config.index,
&network.config.host_dev_name,
network.config.guest_mac.clone().unwrap(),
)?;
}
_ => info!(sl!(), "qemu cmdline: unsupported device: {:?}", device),
}