mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-08-23 08:21:15 +00:00
Revert "vmm: config: Avoid closing invalid FDs from 'test_net_parsing()'"
This reverts commit 0567def931
.
Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
parent
c143cb3af0
commit
e431a48201
@ -2351,17 +2351,6 @@ mod tests {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn memfd_create(name: &std::ffi::CStr, flags: u32) -> std::result::Result<i32, std::io::Error> {
|
|
||||||
// SAFETY: FFI call with correct arguments
|
|
||||||
let res = unsafe { libc::syscall(libc::SYS_memfd_create, name.as_ptr(), flags) };
|
|
||||||
|
|
||||||
if res < 0 {
|
|
||||||
Err(std::io::Error::last_os_error())
|
|
||||||
} else {
|
|
||||||
Ok(res as i32)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_net_parsing() -> Result<()> {
|
fn test_net_parsing() -> Result<()> {
|
||||||
// mac address is random
|
// mac address is random
|
||||||
@ -2440,23 +2429,17 @@ mod tests {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
let fd1 =
|
|
||||||
memfd_create(&std::ffi::CString::new("test_net_parsing_fd1").unwrap(), 0).unwrap();
|
|
||||||
let fd2 =
|
|
||||||
memfd_create(&std::ffi::CString::new("test_net_parsing_fd2").unwrap(), 0).unwrap();
|
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
&format!(
|
NetConfig::parse("mac=de:ad:be:ef:12:34,fd=[3,7],num_queues=4")?,
|
||||||
"{:?}",
|
NetConfig {
|
||||||
NetConfig::parse(&format!(
|
mac: MacAddr::parse_str("de:ad:be:ef:12:34").unwrap(),
|
||||||
"mac=de:ad:be:ef:12:34,fd=[{fd1},{fd2}],num_queues=4"
|
fds: Some(vec![3, 7]),
|
||||||
))?
|
num_queues: 4,
|
||||||
),
|
id: None,
|
||||||
&format!("NetConfig {{ tap: None, ip: 192.168.249.1, mask: 255.255.255.0, \
|
tap: None,
|
||||||
mac: MacAddr {{ bytes: [222, 173, 190, 239, 18, 52] }}, host_mac: None, mtu: None, \
|
vhost_socket: None,
|
||||||
iommu: false, num_queues: 4, queue_size: 256, vhost_user: false, vhost_socket: None, \
|
..Default::default()
|
||||||
vhost_mode: Client, id: None, fds: Some([{fd1}, {fd2}]), \
|
}
|
||||||
rate_limiter_config: None, pci_segment: 0, offload_tso: true, offload_ufo: true, offload_csum: true }}")
|
|
||||||
);
|
);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
Loading…
Reference in New Issue
Block a user