refactor: remove reexport of vmm-sys-util

It is better not to reexport `vmm-sys-util` as it
entangles the code. Additionally, the original
reason of having one place to update this dependency
does not hold any more as now we rely on dependabot
for updates, so specifying dependency in multiple crates
is not an issue.

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

Cargo.lock

@@ -19,7 +19,7 @@ serde_json = "1.0.128"
 thiserror = "1.0.63"
 
 vmm = { path = "../vmm" }
-vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
+vmm-sys-util = "0.12.1"
 
 [features]
 tracing = ["log-instrument", "vmm/tracing"]

src/cpu-template-helper/Cargo.toml

@@ -30,6 +30,7 @@ thiserror = "1.0.63"
 timerfd = "1.6.0"
 utils = { path = "../utils" }
 vmm = { path = "../vmm" }
+vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 
 [dev-dependencies]
 cargo_toml = "0.20.4"

src/firecracker/Cargo.toml

@@ -12,7 +12,7 @@ use std::ptr;
 
 use serde::{Deserialize, Serialize};
 use userfaultfd::{Error, Event, Uffd};
-use utils::sock_ctrl_msg::ScmSocket;
+use vmm_sys_util::sock_ctrl_msg::ScmSocket;
 
 // This is the same with the one used in src/vmm.
 /// This describes the mapping between Firecracker base virtual address and offset in the
@@ -299,8 +299,8 @@ mod tests {
     use std::mem::MaybeUninit;
     use std::os::unix::net::UnixListener;
 
-    use vmm::utils::tempdir::TempDir;
-    use vmm::utils::tempfile::TempFile;
+    use vmm_sys_util::tempdir::TempDir;
+    use vmm_sys_util::tempfile::TempFile;
 
     use super::*;
 

src/firecracker/examples/uffd/uffd_utils.rs

@@ -16,13 +16,13 @@ pub use micro_http::{Body, HttpServer, Request, Response, ServerError, StatusCod
 use parsed_request::{ParsedRequest, RequestAction};
 use seccompiler::BpfProgramRef;
 use serde_json::json;
-use utils::eventfd::EventFd;
 use utils::time::{get_time_us, ClockType};
 use vmm::logger::{
     debug, error, info, update_metric_with_elapsed_time, warn, ProcessTimeReporter, METRICS,
 };
 use vmm::rpc_interface::{ApiRequest, ApiResponse, VmmAction};
 use vmm::vmm_config::snapshot::SnapshotType;
+use vmm_sys_util::eventfd::EventFd;
 
 /// Structure associated with the API server implementation.
 #[derive(Debug)]
@@ -204,14 +204,14 @@ mod tests {
     use std::thread;
 
     use micro_http::HttpConnection;
-    use utils::tempfile::TempFile;
     use utils::time::ClockType;
     use vmm::builder::StartMicrovmError;
     use vmm::logger::StoreMetric;
     use vmm::rpc_interface::{VmmActionError, VmmData};
     use vmm::seccomp_filters::get_empty_filters;
     use vmm::vmm_config::instance_info::InstanceInfo;
     use vmm::vmm_config::snapshot::CreateSnapshotParams;
+    use vmm_sys_util::tempfile::TempFile;
 
     use super::request::cpu_configuration::parse_put_cpu_config;
     use super::*;

src/firecracker/src/api_server/mod.rs

@@ -9,8 +9,6 @@ use std::thread;
 
 use event_manager::{EventOps, Events, MutEventSubscriber, SubscriberOps};
 use seccompiler::BpfThreadMap;
-use utils::epoll::EventSet;
-use utils::eventfd::EventFd;
 use vmm::logger::{error, warn, ProcessTimeReporter};
 use vmm::resources::VmResources;
 use vmm::rpc_interface::{
@@ -19,6 +17,8 @@ use vmm::rpc_interface::{
 };
 use vmm::vmm_config::instance_info::InstanceInfo;
 use vmm::{EventManager, FcExitCode, Vmm};
+use vmm_sys_util::epoll::EventSet;
+use vmm_sys_util::eventfd::EventFd;
 
 use super::api_server::{ApiServer, HttpServer, ServerError};
 

src/firecracker/src/api_server_adapter.rs

@@ -19,7 +19,6 @@ use event_manager::SubscriberOps;
 use seccomp::FilterError;
 use seccompiler::BpfThreadMap;
 use utils::arg_parser::{ArgParser, Argument};
-use utils::terminal::Terminal;
 use utils::validators::validate_instance_id;
 use vmm::builder::StartMicrovmError;
 use vmm::logger::{
@@ -32,6 +31,7 @@ use vmm::snapshot::{Snapshot, SnapshotError};
 use vmm::vmm_config::instance_info::{InstanceInfo, VmState};
 use vmm::vmm_config::metrics::{init_metrics, MetricsConfig, MetricsConfigError};
 use vmm::{EventManager, FcExitCode, HTTP_MAX_PAYLOAD_SIZE};
+use vmm_sys_util::terminal::Terminal;
 
 use crate::seccomp::SeccompConfig;
 
@@ -47,7 +47,7 @@ enum MainError {
     /// Failed to set the logger: {0}
     SetLogger(vmm::logger::LoggerInitError),
     /// Failed to register signal handlers: {0}
-    RegisterSignalHandlers(#[source] utils::errno::Error),
+    RegisterSignalHandlers(#[source] vmm_sys_util::errno::Error),
     /// Arguments parsing error: {0} \n\nFor more information try --help.
     ParseArguments(#[from] utils::arg_parser::UtilsArgParserError),
     /// When printing Snapshot Data format: {0}

src/firecracker/src/main.rs

@@ -6,8 +6,8 @@ use std::time::Duration;
 
 use event_manager::{EventOps, Events, MutEventSubscriber};
 use timerfd::{ClockId, SetTimeFlags, TimerFd, TimerState};
-use utils::epoll::EventSet;
 use vmm::logger::{error, warn, IncMetric, METRICS};
+use vmm_sys_util::epoll::EventSet;
 
 /// Metrics reporting period.
 pub(crate) const WRITE_METRICS_PERIOD_MS: u64 = 60000;

src/firecracker/src/metrics.rs

@@ -119,7 +119,7 @@ mod tests {
     use std::sync::Arc;
 
     use seccompiler::BpfThreadMap;
-    use utils::tempfile::TempFile;
+    use vmm_sys_util::tempfile::TempFile;
 
     use super::*;
 

src/firecracker/src/seccomp.rs

@@ -17,6 +17,7 @@ log-instrument = { path = "../log-instrument", optional = true }
 nix = { version = "0.29.0", default-features = false, features = ["dir"] }
 regex = { version = "1.10.6", default-features = false, features = ["std"] }
 thiserror = "1.0.63"
+vmm-sys-util = "0.12.1"
 
 utils = { path = "../utils" }