External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-02 16:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: config: Extend NetConfig to include fd for tap device

Browse Source 
Add an "fd=" parameter to allow specifying a TAP fd to use. Currently
only one fd for one queue pair is supported.

Fixes: #2052

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-12-16 17:29:05 +00:00 committed by Samuel Ortiz
parent ca48f1c995
commit 72e5ed3372
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vmm/src/config.rs
View File

@ -764,6 +764,8 @@ pub struct NetConfig {
pub vhost_socket: Option<String>, pub vhost_socket: Option<String>,
#[serde(default)] #[serde(default)]
pub id: Option<String>, pub id: Option<String>,
#[serde(default)]
pub fd: Option<i32>,
} }
fn default_netconfig_tap() -> Option<String> { fn default_netconfig_tap() -> Option<String> {
@ -804,13 +806,14 @@ impl Default for NetConfig {
vhost_user: false, vhost_user: false,
vhost_socket: None, vhost_socket: None,
id: None, id: None,
fd: None,
} }
} }
} }
impl NetConfig { impl NetConfig {
pub const SYNTAX: &'static str = "Network parameters \ pub const SYNTAX: &'static str = "Network parameters \
\"tap=<if_name>,ip=<ip_addr>,mask=<net_mask>,mac=<mac_addr>,iommu=on|off,\ \"tap=<if_name>,ip=<ip_addr>,mask=<net_mask>,mac=<mac_addr>,fd=<fd>,iommu=on|off,\
num_queues=<number_of_queues>,queue_size=<size_of_each_queue>,\ num_queues=<number_of_queues>,queue_size=<size_of_each_queue>,\
vhost_user=<vhost_user_enable>,socket=<vhost_user_socket_path>,id=<device_id>\""; vhost_user=<vhost_user_enable>,socket=<vhost_user_socket_path>,id=<device_id>\"";
@ -828,7 +831,8 @@ impl NetConfig {
.add("num_queues") .add("num_queues")
.add("vhost_user") .add("vhost_user")
.add("socket") .add("socket")
.add("id"); .add("id")
.add("fd");
parser.parse(net).map_err(Error::ParseNetwork)?; parser.parse(net).map_err(Error::ParseNetwork)?;
let tap = parser.get("tap"); let tap = parser.get("tap");
@ -865,6 +869,7 @@ impl NetConfig {
.0; .0;
let vhost_socket = parser.get("socket"); let vhost_socket = parser.get("socket");
let id = parser.get("id"); let id = parser.get("id");
let fd = parser.convert("fd").map_err(Error::ParseNetwork)?;
let config = NetConfig { let config = NetConfig {
tap, tap,
ip, ip,
@ -877,6 +882,7 @@ impl NetConfig {
vhost_user, vhost_user,
vhost_socket, vhost_socket,
id, id,
fd,
}; };
config.validate().map_err(Error::Validation)?; config.validate().map_err(Error::Validation)?;
Ok(config) Ok(config)
@ -1942,6 +1948,15 @@ mod tests {
} }
); );
assert_eq!(
NetConfig::parse("mac=de:ad:be:ef:12:34,fd=3")?,
NetConfig {
mac: MacAddr::parse_str("de:ad:be:ef:12:34").unwrap(),
fd: Some(3),
..Default::default()
}
);
Ok(()) Ok(())
} }