Fix errors

Author: lukasfrank

src/daemon.rs

@@ -507,11 +507,7 @@ pub async fn daemon_start(
     Ok(())
 }
 
-pub async fn start_feos(
-    ipv6_address: Ipv6Addr,
-    prefix_length: u8,
-    test_mode: bool,
-) -> Result<(), String> {
+pub async fn start_feos(ipv6_address: Ipv6Addr, prefix_length: u8) -> Result<(), String> {
     println!(
         "
 

src/isolated_container/mod.rs

@@ -7,7 +7,6 @@ use crate::{network, vm};
 use hyper_util::rt::TokioIo;
 use isolated_container_service::isolated_container_service_server::IsolatedContainerService;
 use log::info;
-use std::io::Write;
 use std::sync::Arc;
 use std::{collections::HashMap, sync::Mutex};
 use std::{fmt::Debug, io, path::PathBuf, time};
@@ -72,7 +71,7 @@ fn handle_error(e: vm::Error) -> tonic::Status {
 async fn get_channel(path: String) -> Result<Channel, Error> {
     async fn get_channel(path: String) -> Result<Channel, Error> {
         let channel = Endpoint::try_from("http://[::]:50051")
-            .map_err(|e| Error::Failed)?
+            .map_err(|_| Error::Failed)?
             .connect_with_connector(service_fn(move |_: Uri| {
                 let path = path.clone();
                 async move {
@@ -108,7 +107,7 @@ async fn get_channel(path: String) -> Result<Channel, Error> {
                 }
             }))
             .await
-            .map_err(|e| Error::Failed)?;
+            .map_err(|_| Error::Failed)?;
         Ok(channel)
     }
 
@@ -146,10 +145,8 @@ impl IsolatedContainerService for IsolatedContainerAPI {
                 2,
                 4294967296,
                 vm::BootMode::KernelBoot(vm::KernelBootMode {
-                    // kernel:   PathBuf::from("/usr/share/feos/vmlinuz"),
-                    kernel: PathBuf::from("/home/lukasfrank/dev/FeOS/target/kernel/vmlinuz"),
-                    initramfs: PathBuf::from("/home/lukasfrank/dev/FeOS/target/initramfs.zst"),
-                    // initramfs: PathBuf::from("/usr/share/feos/initramfs"),
+                    kernel: PathBuf::from("/usr/share/feos/vmlinuz"),
+                    initramfs: PathBuf::from("/usr/share/feos/initramfs"),
                     // TODO
                     cmdline: "console=tty0 console=ttyS0,115200 intel_iommu=on iommu=pt"
                         .to_string(),
@@ -223,7 +220,7 @@ impl IsolatedContainerService for IsolatedContainerAPI {
         let request = tonic::Request::new(RunContainerRequest {
             uuid: container_id.to_string(),
         });
-        let response = client.run_container(request).await?;
+        client.run_container(request).await?;
 
         Ok(Response::new(
             isolated_container_service::RunContainerResponse {},
@@ -261,8 +258,6 @@ impl IsolatedContainerService for IsolatedContainerAPI {
     ) -> Result<Response<isolated_container_service::StateContainerResponse>, Status> {
         info!("Got state_container request");
 
-        let container_id: String = request.get_ref().uuid.clone();
-
         let vm_id: String = request.get_ref().uuid.clone();
         let vm_id = Uuid::parse_str(&vm_id)
             .map_err(|_| Status::invalid_argument("failed to parse uuid"))?;

src/main.rs

@@ -29,9 +29,7 @@ async fn main() -> Result<(), String> {
         (ipv6_address, prefix_length) = parse_command_line()?;
     }
 
-    let test_mode = env::var("RUN_MODE").map_or(false, |v| v == "test");
-
-    start_feos(ipv6_address, prefix_length, test_mode).await?;
+    start_feos(ipv6_address, prefix_length).await?;
     Err("FeOS exited".to_string())
 }
 

src/network/mod.rs

@@ -9,14 +9,14 @@ use tokio::task::JoinHandle;
 use uuid::Uuid;
 
 pub mod dhcpv6;
-mod network;
+mod utils;
 
 use crate::network::dhcpv6::{
     add_ipv6_route, add_to_ipv6, adjust_base_ip, run_dhcpv6_server, IpRange,
 };
 use crate::radv::start_radv_server;
-pub use network::configure_network_devices;
-pub use network::configure_sriov;
+pub use utils::configure_network_devices;
+pub use utils::configure_sriov;
 
 #[derive(Debug)]
 pub enum Error {

src/network/network.rs src/network/utils.rssrc/network/network.rs renamed to src/network/utils.rs

@@ -59,7 +59,7 @@ pub enum NetworkMode {
 
 #[derive(Debug)]
 struct VmInfo {
-    pub child: Child,
+    child: Child,
 }
 
 #[derive(Debug)]
@@ -369,10 +369,6 @@ impl Manager {
 
     pub fn kill_vm(&self, id: Uuid) -> Result<String, Error> {
         let mut vms = self.vms.lock().unwrap();
-        let vm_info = match vms.get_mut(&id) {
-            Some(info) => info,
-            None => return Err(Error::NotFound),
-        };
 
         let mut socket = UnixStream::connect(id.to_string()).map_err(Error::SocketFailure)?;
         let response = api_client::simple_api_full_command_and_response(
@@ -399,7 +395,11 @@ impl Manager {
             info!("shutdown vmm: id {}, response: {}", id, x);
         }
 
-        vms.remove(&id);
+        if let Some(mut info) = vms.remove(&id) {
+            if let Err(e) = info.child.kill() {
+                info!("failed to kill vm process {}: {}", id, e);
+            }
+        }
 
         Ok(String::new())
     }