vsock saga, episode 1: vhost-free vsock device

Cargo.toml

@@ -25,7 +25,4 @@ panic = "abort"
 lto = true
 panic = "abort"
 
-[features]
-vsock = ["api_server/vsock", "jailer/vsock"]
-
 [workspace]

api_server/Cargo.toml

@@ -26,6 +26,3 @@ kernel = { path = "../kernel" }
 memory_model = { path = "../memory_model" }
 net_util = { path = "../net_util" }
 rate_limiter = { path = "../rate_limiter" }
-
-[features]
-vsock = ["vmm/vsock"]

api_server/src/http_service.rs

@@ -25,7 +25,6 @@ use vmm::vmm_config::instance_info::InstanceInfo;
 use vmm::vmm_config::logger::LoggerConfig;
 use vmm::vmm_config::machine_config::VmConfig;
 use vmm::vmm_config::net::{NetworkInterfaceConfig, NetworkInterfaceUpdateConfig};
-#[cfg(feature = "vsock")]
 use vmm::vmm_config::vsock::VsockDeviceConfig;
 use vmm::VmmAction;
 
@@ -365,7 +364,6 @@ fn parse_netif_req<'a>(path: &'a str, method: Method, body: &Chunk) -> Result<'a
     }
 }
 
-#[cfg(feature = "vsock")]
 // Turns a GET/PUT /vsocks HTTP request into a ParsedRequest.
 fn parse_vsocks_req<'a>(path: &'a str, method: Method, body: &Chunk) -> Result<'a, ParsedRequest> {
     let path_tokens: Vec<&str> = path[1..].split_terminator('/').collect();
@@ -432,7 +430,6 @@ fn parse_request<'a>(method: Method, path: &'a str, body: &Chunk) -> Result<'a,
         "machine-config" => parse_machine_config_req(path, method, body),
         "network-interfaces" => parse_netif_req(path, method, body),
         "mmds" => parse_mmds_request(path, method, body),
-        #[cfg(feature = "vsock")]
         "vsocks" => parse_vsocks_req(path, method, body),
         _ => Err(Error::InvalidPathMethod(path, method)),
     }

api_server/src/request/mod.rs

@@ -7,7 +7,6 @@ pub mod drive;
 pub mod logger;
 pub mod machine_configuration;
 pub mod net;
-#[cfg(feature = "vsock")]
 pub mod vsock;
 
 use serde_json::Value;

api_server/src/request/vsock.rs

@@ -17,7 +17,7 @@ impl IntoParsedRequest for VsockDeviceConfig {
         _: Method,
     ) -> result::Result<ParsedRequest, String> {
         let id_from_path = id_from_path.unwrap_or_default();
-        if id_from_path != self.id.as_str() {
+        if id_from_path != self.vsock_id.as_str() {
             return Err(String::from(
                 "The id from the path does not match the id from the body!",
             ));
@@ -38,8 +38,9 @@ mod tests {
     #[test]
     fn test_vsock_into_parsed_request() {
         let vsock = VsockDeviceConfig {
-            id: String::from("foo"),
+            vsock_id: String::from("foo"),
             guest_cid: 42,
+            uds_path: "vsock.sock".to_string(),
         };
         assert!(vsock
             .clone()