diff --git a/src/main.rs b/src/main.rs index a64b0a0c5..1694d26d9 100755 --- a/src/main.rs +++ b/src/main.rs @@ -509,7 +509,6 @@ mod unit_tests { iommu: false, }, devices: None, - vhost_user_net: None, vsock: None, iommu: false, }; @@ -1233,101 +1232,6 @@ mod unit_tests { }); } - #[test] - fn test_valid_vm_config_vunet() { - vec![ - // This test is expected to fail because the default MAC address is - // randomly generated. There's no way we can have twice the same - // default value. - ( - vec![ - "cloud-hypervisor", - "--vhost-user-net", - "sock=/path/to/sock/1", - "sock=/path/to/sock/2", - ], - r#"{ - "vhost_user_net": [ - {"sock": "/path/to/sock/1"}, - {"sock": "/path/to/sock/2"} - ] - }"#, - false, - ), - ( - vec![ - "cloud-hypervisor", - "--vhost-user-net", - "sock=/path/to/sock/1,mac=12:34:56:78:90:ab", - "sock=/path/to/sock/2,mac=12:34:56:78:90:cd", - ], - r#"{ - "vhost_user_net": [ - {"sock": "/path/to/sock/1", "mac": "12:34:56:78:90:ab"}, - {"sock": "/path/to/sock/2", "mac": "12:34:56:78:90:cd"} - ] - }"#, - true, - ), - ( - vec![ - "cloud-hypervisor", - "--vhost-user-net", - "sock=/path/to/sock,mac=12:34:56:78:90:ab,num_queues=4", - ], - r#"{ - "vhost_user_net": [ - {"sock": "/path/to/sock", "mac": "12:34:56:78:90:ab", "num_queues": 4} - ] - }"#, - true, - ), - ( - vec![ - "cloud-hypervisor", - "--vhost-user-net", - "sock=/path/to/sock,mac=12:34:56:78:90:ab,num_queues=4,queue_size=128", - ], - r#"{ - "vhost_user_net": [ - {"sock": "/path/to/sock", "mac": "12:34:56:78:90:ab", "num_queues": 4, "queue_size": 128} - ] - }"#, - true, - ), - ( - vec![ - "cloud-hypervisor", - "--vhost-user-net", - "sock=/path/to/sock,mac=12:34:56:78:90:ab,num_queues=2,queue_size=256", - ], - r#"{ - "vhost_user_net": [ - {"sock": "/path/to/sock", "mac": "12:34:56:78:90:ab"} - ] - }"#, - true, - ), - ( - vec![ - "cloud-hypervisor", - "--vhost-user-net", - "sock=/path/to/sock,mac=12:34:56:78:90:ab", - ], - r#"{ - "vhost_user_net": [ - {"sock": "/path/to/sock", "mac": "12:34:56:78:90:ab", "num_queues": 2, "queue_size": 256} - ] - }"#, - true, - ), - ] - .iter() - .for_each(|(cli, openapi, equal)| { - compare_vm_config_cli_vs_json(cli, openapi, *equal); - }); - } - #[test] fn test_valid_vm_config_vsock() { vec![ diff --git a/vmm/src/api/openapi/cloud-hypervisor.yaml b/vmm/src/api/openapi/cloud-hypervisor.yaml index eb244829f..39ebb9464 100644 --- a/vmm/src/api/openapi/cloud-hypervisor.yaml +++ b/vmm/src/api/openapi/cloud-hypervisor.yaml @@ -204,10 +204,6 @@ components: type: array items: $ref: '#/components/schemas/DeviceConfig' - vhost_user_net: - type: array - items: - $ref: '#/components/schemas/VhostUserNetConfig' vsock: type: array items: @@ -405,22 +401,6 @@ components: type: boolean default: false - VhostUserNetConfig: - required: - - sock - type: object - properties: - sock: - type: string - num_queues: - type: integer - default: 2 - queue_size: - type: integer - default: 256 - mac: - type: string - VsockConfig: required: - cid diff --git a/vmm/src/config.rs b/vmm/src/config.rs index a0125561a..348db4acf 100644 --- a/vmm/src/config.rs +++ b/vmm/src/config.rs @@ -121,7 +121,6 @@ pub struct VmParams<'a> { pub serial: &'a str, pub console: &'a str, pub devices: Option>, - pub vhost_user_net: Option>, pub vsock: Option>, } @@ -142,8 +141,6 @@ impl<'a> VmParams<'a> { let fs: Option> = args.values_of("fs").map(|x| x.collect()); let pmem: Option> = args.values_of("pmem").map(|x| x.collect()); let devices: Option> = args.values_of("device").map(|x| x.collect()); - let vhost_user_net: Option> = - args.values_of("vhost-user-net").map(|x| x.collect()); let vsock: Option> = args.values_of("vsock").map(|x| x.collect()); VmParams { @@ -159,7 +156,6 @@ impl<'a> VmParams<'a> { serial, console, devices, - vhost_user_net, vsock, } } @@ -926,82 +922,6 @@ impl DeviceConfig { } } -#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] -pub struct VhostUserNetConfig { - pub sock: String, - #[serde(default = "default_vunetconfig_num_queues")] - pub num_queues: usize, - #[serde(default = "default_vunetconfig_queue_size")] - pub queue_size: u16, - #[serde(default = "default_vunetconfig_mac")] - pub mac: MacAddr, -} - -fn default_vunetconfig_num_queues() -> usize { - DEFAULT_NUM_QUEUES_VUNET -} - -fn default_vunetconfig_queue_size() -> u16 { - DEFAULT_QUEUE_SIZE_VUNET -} - -fn default_vunetconfig_mac() -> MacAddr { - MacAddr::local_random() -} - -impl VhostUserNetConfig { - pub fn parse(vhost_user_net: &str) -> Result { - error!("Using deprecated --vhost-user-net syntax. Use --net with vhost_user=true,socket="); - // Split the parameters based on the comma delimiter - let params_list: Vec<&str> = vhost_user_net.split(',').collect(); - - let mut mac_str: &str = ""; - let mut sock: &str = ""; - let mut num_queues_str: &str = ""; - let mut queue_size_str: &str = ""; - - for param in params_list.iter() { - if param.starts_with("mac=") { - mac_str = ¶m[4..]; - } else if param.starts_with("sock=") { - sock = ¶m[5..]; - } else if param.starts_with("num_queues=") { - num_queues_str = ¶m[11..]; - } else if param.starts_with("queue_size=") { - queue_size_str = ¶m[11..]; - } - } - - let mut mac: MacAddr = default_vunetconfig_mac(); - let mut num_queues: usize = default_vunetconfig_num_queues(); - let mut queue_size: u16 = default_vunetconfig_queue_size(); - - if !mac_str.is_empty() { - mac = MacAddr::parse_str(mac_str).map_err(Error::ParseVuNetMacParam)?; - } - if sock.is_empty() { - return Err(Error::ParseVuSockParam); - } - if !num_queues_str.is_empty() { - num_queues = num_queues_str - .parse() - .map_err(Error::ParseVuNumQueuesParam)?; - } - if !queue_size_str.is_empty() { - queue_size = queue_size_str - .parse() - .map_err(Error::ParseVuQueueSizeParam)?; - } - - Ok(VhostUserNetConfig { - sock: sock.to_string(), - num_queues, - queue_size, - mac, - }) - } -} - #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)] pub struct VsockConfig { pub cid: u64, @@ -1061,7 +981,6 @@ pub struct VmConfig { #[serde(default = "ConsoleConfig::default_console")] pub console: ConsoleConfig, pub devices: Option>, - pub vhost_user_net: Option>, pub vsock: Option>, #[serde(default)] pub iommu: bool, @@ -1150,15 +1069,6 @@ impl VmConfig { devices = Some(device_config_list); } - let mut vhost_user_net: Option> = None; - if let Some(vhost_user_net_list) = &vm_params.vhost_user_net { - let mut vhost_user_net_config_list = Vec::new(); - for item in vhost_user_net_list.iter() { - vhost_user_net_config_list.push(VhostUserNetConfig::parse(item)?); - } - vhost_user_net = Some(vhost_user_net_config_list); - } - let mut vsock: Option> = None; if let Some(vsock_list) = &vm_params.vsock { let mut vsock_config_list = Vec::new(); @@ -1192,7 +1102,6 @@ impl VmConfig { serial, console, devices, - vhost_user_net, vsock, iommu, }) diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index 67f096a57..98244620b 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -856,9 +856,6 @@ impl DeviceManager { // Add virtio-pmem if required devices.append(&mut self.make_virtio_pmem_devices()?); - // Add virtio-vhost-user-net if required - devices.append(&mut self.make_virtio_vhost_user_net_devices()?); - // Add virtio-vsock if required devices.append(&mut self.make_virtio_vsock_devices()?); @@ -1265,36 +1262,6 @@ impl DeviceManager { Ok(devices) } - fn make_virtio_vhost_user_net_devices( - &mut self, - ) -> DeviceManagerResult> { - let mut devices = Vec::new(); - // Add vhost-user-net if required - if let Some(vhost_user_net_list_cfg) = &self.config.lock().unwrap().vhost_user_net { - for vhost_user_net_cfg in vhost_user_net_list_cfg.iter() { - let vu_cfg = VhostUserConfig { - sock: vhost_user_net_cfg.sock.clone(), - num_queues: vhost_user_net_cfg.num_queues, - queue_size: vhost_user_net_cfg.queue_size, - }; - let vhost_user_net_device = Arc::new(Mutex::new( - vm_virtio::vhost_user::Net::new(vhost_user_net_cfg.mac, vu_cfg) - .map_err(DeviceManagerError::CreateVhostUserNet)?, - )); - - devices.push(( - Arc::clone(&vhost_user_net_device) as Arc>, - false, - )); - - self.migratable_devices - .push(Arc::clone(&vhost_user_net_device) as Arc>); - } - } - - Ok(devices) - } - fn make_virtio_vsock_devices(&mut self) -> DeviceManagerResult> { let mut devices = Vec::new(); // Add vsock if required