Fix for musl systems and update deps

frc4533-lincoln · frc4533-lincoln · commit b96a88d1dfb1 · 2025-05-27T15:36:51.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,15 @@
 members = ["src/libkrun"]
 resolver = "2"
 
+[workspace.dependencies]
+libc = { git = "https://github.com/frc4533-lincoln/libc.git", branch = "main", features = ["extra_traits"] }
+vmm-sys-util = "0.12.1"
+kvm-bindings = { version = "0.11", features = ["fam-wrappers"] }
+kvm-ioctls = "0.21"
+vm-memory = { version = "0.16", features = ["backend-mmap"] }
+tokio = { version = "1", features = ["rt", "sync"] }
+serde = { version = "1", features = ["derive"] }
+
 [profile.dev]
 #panic = "abort"
 
diff --git a/src/arch/Cargo.toml b/src/arch/Cargo.toml
@@ -10,16 +10,16 @@ amd-sev = [ "tee" ]
 efi = []
 
 [dependencies]
-libc = ">=0.2.39"
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+libc.workspace = true
+vm-memory.workspace = true
 
 arch_gen = { path = "../arch_gen" }
 smbios = { path = "../smbios" }
 utils = { path = "../utils" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-kvm-bindings = { version = ">=0.8", features = ["fam-wrappers"] }
-kvm-ioctls = ">=0.17"
+kvm-bindings.workspace = true
+kvm-ioctls.workspace = true
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 vm-fdt = ">= 0.2.0"
diff --git a/src/cpuid/Cargo.toml b/src/cpuid/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Amazon Firecracker team <firecracker-devel@amazon.com>"]
 edition = "2021"
 
 [dependencies]
-vmm-sys-util = ">=0.11"
+vmm-sys-util.workspace = true
 
 [target.'cfg(target_os = "linux")'.dependencies]
-kvm-bindings = { version = ">=0.8", features = ["fam-wrappers"] }
-kvm-ioctls = ">=0.17"
+kvm-bindings.workspace = true
+kvm-ioctls.workspace = true
diff --git a/src/cpuid/src/transformer/common.rs b/src/cpuid/src/transformer/common.rs
@@ -123,7 +123,7 @@ pub fn use_host_cpuid_function(
                 edx: entry.edx,
                 padding: [0, 0, 0],
             })
-            .map_err(FamError)?;
+            .map_err(|e| FamError(e))?;
 
         count += 1;
     }
diff --git a/src/devices/Cargo.toml b/src/devices/Cargo.toml
@@ -19,14 +19,14 @@ intaglio = "1.10.0"
 bitflags = "1.2.0"
 crossbeam-channel = "0.5"
 env_logger = "0.9.0"
-libc = { git = "https://github.com/frc4533-lincoln/libc.git", branch = "main" }
+libc.workspace = true
 log = "0.4.0"
 nix = { version = "0.24.1", features = ["poll"] }
 pw = { package = "pipewire", version = "0.8.0", optional = true }
 rand = "0.8.5"
 thiserror = { version = "1.0", optional = true }
 virtio-bindings = "0.2.0"
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory.workspace = true
 zerocopy = { version = "0.6.3", optional = true }
 zerocopy-derive = { version = "0.6.3", optional = true }
 ipnetwork = "0.21"
diff --git a/src/devices/src/virtio/fs/linux/overlayfs.rs b/src/devices/src/virtio/fs/linux/overlayfs.rs
@@ -1996,13 +1996,25 @@ impl OverlayFs {
 
         // Perform the rename
         let res = unsafe {
+            #[cfg(target_env = "gnu")]
+            {
             libc::renameat2(
                 old_parent_data.file.as_raw_fd(),
                 old_name.as_ptr(),
                 new_parent_data.file.as_raw_fd(),
                 new_name.as_ptr(),
                 flags,
             )
+            }
+            #[cfg(target_env = "musl")]
+            {
+            libc::renameat(
+                old_parent_data.file.as_raw_fd(),
+                old_name.as_ptr(),
+                new_parent_data.file.as_raw_fd(),
+                new_name.as_ptr(),
+            )
+            }
         };
 
         if res < 0 {
diff --git a/src/imago/Cargo.toml b/src/imago/Cargo.toml
@@ -47,25 +47,20 @@ version = "0.8"
 features = ["std"]
 
 [dependencies.serde]
-version = "1.0"
-features = ["derive"]
+workspace = true
 
 [dependencies.tokio]
-version = "1"
-features = [
-    "rt",
-    "sync",
-]
+workspace = true
 
 [dependencies.tracing]
 version = "0.1"
 
 [dependencies.vm-memory]
-version = "0.16"
 optional = true
+workspace = true
 
 [build-dependencies.rustc_version]
 version = "0.4.0"
 
 [target."cfg(unix)".dependencies.libc]
-version = "0.2"
+workspace = true
diff --git a/src/kernel/Cargo.toml b/src/kernel/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory.workspace = true
 
 utils = { path = "../utils" }
diff --git a/src/libkrun/Cargo.toml b/src/libkrun/Cargo.toml
@@ -18,7 +18,7 @@ virgl_resource_map2 = []
 [dependencies]
 crossbeam-channel = "0.5"
 env_logger = "0.9.0"
-libc = ">=0.2.39"
+libc.workspace = true
 log = "0.4.0"
 once_cell = "1.4.1"
 ipnetwork = "0.21"
diff --git a/src/smbios/Cargo.toml b/src/smbios/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory.workspace = true
diff --git a/src/utils/Cargo.toml b/src/utils/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 [dependencies]
 bitflags = "1.2.0"
 env_logger = "0.9.0"
-libc = ">=0.2.85"
+libc.workspace = true
 log = "0.4.0"
-vmm-sys-util = ">=0.11"
+vmm-sys-util.workspace = true
diff --git a/src/vmm/Cargo.toml b/src/vmm/Cargo.toml
@@ -16,9 +16,9 @@ snd = []
 [dependencies]
 crossbeam-channel = "0.5"
 env_logger = "0.9.0"
-libc = ">=0.2.39"
+libc.workspace = true
 log = "0.4.0"
-vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
+vm-memory.workspace = true
 
 arch = { path = "../arch" }
 devices = { path = "../devices" }
@@ -42,11 +42,11 @@ ipnetwork = "0.21"
 cpuid = { path = "../cpuid" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-kvm-bindings = { version = ">=0.10", features = ["fam-wrappers"] }
-kvm-ioctls = ">=0.17"
+kvm-bindings.workspace = true
+kvm-ioctls.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
 hvf = { path = "../hvf" }
 
 [dev-dependencies]
-vmm-sys-util = ">=0.11"
+vmm-sys-util.workspace = true
diff --git a/src/vmm/src/linux/vstate.rs b/src/vmm/src/linux/vstate.rs
@@ -864,7 +864,7 @@ impl Vcpu {
     /// Registers a signal handler which makes use of TLS and kvm immediate exit to
     /// kick the vcpu running on the current thread, if there is one.
     pub fn register_kick_signal_handler() {
-        extern "C" fn handle_signal(_: c_int, _: *mut siginfo_t, _: *mut c_void) {
+        extern "C" fn handle_signal(_: c_int, _: *mut nix::libc::siginfo_t, _: *mut nix::libc::c_void) {
             // This is safe because it's temporarily aliasing the `Vcpu` object, but we are
             // only reading `vcpu.fd` which does not change for the lifetime of the `Vcpu`.
             unsafe {
@@ -1175,9 +1175,11 @@ impl Vcpu {
         self.fd
             .set_sregs(&state.sregs)
             .map_err(Error::VcpuSetSregs)?;
-        self.fd
-            .set_xsave(&state.xsave)
-            .map_err(Error::VcpuSetXsave)?;
+        unsafe {
+            self.fd
+                .set_xsave(&state.xsave)
+                .map_err(Error::VcpuSetXsave)?;
+        }
         self.fd.set_xcrs(&state.xcrs).map_err(Error::VcpuSetXcrs)?;
         self.fd
             .set_debug_regs(&state.debug_regs)
diff --git a/src/vmm/src/signal_handler.rs b/src/vmm/src/signal_handler.rs
@@ -23,7 +23,7 @@ static CONSOLE_SIGINT_FD: AtomicI32 = AtomicI32::new(-1);
 ///
 /// Increments the `seccomp.num_faults` metric, logs an error message and terminates the process
 /// with a specific exit code.
-extern "C" fn sigsys_handler(num: c_int, info: *mut siginfo_t, _unused: *mut c_void) {
+extern "C" fn sigsys_handler(num: c_int, info: *mut nix::libc::siginfo_t, _unused: *mut nix::libc::c_void) {
     // Safe because we're just reading some fields from a supposedly valid argument.
     let si_signo = unsafe { (*info).si_signo };
     let si_code = unsafe { (*info).si_code };
@@ -52,7 +52,7 @@ extern "C" fn sigsys_handler(num: c_int, info: *mut siginfo_t, _unused: *mut c_v
 /// Signal handler for `SIGBUS` and `SIGSEGV`.
 ///
 /// Logs an error message and terminates the process with a specific exit code.
-extern "C" fn sigbus_sigsegv_handler(num: c_int, info: *mut siginfo_t, _unused: *mut c_void) {
+extern "C" fn sigbus_sigsegv_handler(num: c_int, info: *mut nix::libc::siginfo_t, _unused: *mut nix::libc::c_void) {
     // Safe because we're just reading some fields from a supposedly valid argument.
     let si_signo = unsafe { (*info).si_signo };
     let si_code = unsafe { (*info).si_code };
@@ -80,7 +80,7 @@ extern "C" fn sigbus_sigsegv_handler(num: c_int, info: *mut siginfo_t, _unused:
     };
 }
 
-extern "C" fn sigwinch_handler(num: c_int, info: *mut siginfo_t, _unused: *mut c_void) {
+extern "C" fn sigwinch_handler(num: c_int, info: *mut nix::libc::siginfo_t, _unused: *mut nix::libc::c_void) {
     // Safe because we're just reading some fields from a supposedly valid argument.
     let si_signo = unsafe { (*info).si_signo };
 
@@ -95,7 +95,7 @@ extern "C" fn sigwinch_handler(num: c_int, info: *mut siginfo_t, _unused: *mut c
     let _ = unsafe { libc::write(console_fd, &val as *const _ as *const c_void, 8) };
 }
 
-extern "C" fn sigint_handler(num: c_int, info: *mut siginfo_t, _unused: *mut c_void) {
+extern "C" fn sigint_handler(num: c_int, info: *mut nix::libc::siginfo_t, _unused: *mut nix::libc::c_void) {
     // Safe because we're just reading some fields from a supposedly valid argument.
     let si_signo = unsafe { (*info).si_signo };
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ pub fn use_host_cpuid_function(`
`123`	`123`	`edx: entry.edx,`
`124`	`124`	`padding: [0, 0, 0],`
`125`	`125`	`})`
`126`		`- .map_err(FamError)?;`
	`126`	`+ .map_err(\|e\| FamError(e))?;`
`127`	`127`
`128`	`128`	`count += 1;`
`129`	`129`	`}`