Update nix to 0.30.1 to fix musl build

Currently muvm fails to build on musl due to getregs/setregs being
missing from the nix crate on musl/aarch64. This was fixed in 0.30.0. As
0.30.0 also made unistd interfaces type-safe, this commit makes changes
accordingly.

Signed-off-by: Violet Purcell <[email protected]>

Author: vimproved

Cargo.lock

@@ -18,7 +18,7 @@ input-linux = { version = "0.7.0", default-features = false, features = [] }
 input-linux-sys = { version = "0.9.0", default-features = false, features = [] }
 krun-sys = { path = "../krun-sys", version = "1.9.1", default-features = false, features = [] }
 log = { version = "0.4.21", default-features = false, features = ["kv"] }
-nix = { version = "0.29.0", default-features = false, features = ["event", "fs", "ioctl", "mman", "ptrace", "signal", "socket", "uio", "user"] }
+nix = { version = "0.30.0", default-features = false, features = ["event", "fs", "ioctl", "mman", "ptrace", "signal", "socket", "uio", "user"] }
 neli = { version = "0.7.0-rc3", default-features = false, features = ["sync"] }
 procfs = { version = "0.17.0", default-features = false, features = [] }
 rustix = { version = "0.38.34", default-features = false, features = ["fs", "mount", "process", "pty", "std", "stdio", "system", "termios", "use-libc-auxv"] }

crates/muvm/Cargo.toml

@@ -710,7 +710,7 @@ impl<'a, P: ProtocolHandler> Client<'a, P> {
     fn process_vgpu(&mut self) -> Result<bool> {
         let mut evt = DrmEvent::default();
         // SAFETY: `read` will return a valid DrmEvent
-        read(self.gpu_ctx.fd.as_raw_fd(), unsafe {
+        read(self.gpu_ctx.fd.as_fd(), unsafe {
             slice::from_raw_parts_mut(
                 &mut evt as *mut DrmEvent as *mut u8,
                 mem::size_of::<DrmEvent>(),

crates/muvm/src/guest/bridge/common.rs

@@ -3,7 +3,7 @@ use std::collections::{HashMap, VecDeque};
 use std::ffi::{c_long, c_void, CString};
 use std::fs::{read_to_string, remove_file, File};
 use std::io::{IoSlice, Write};
-use std::os::fd::{AsFd, AsRawFd, FromRawFd, OwnedFd, RawFd};
+use std::os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd};
 use std::process::exit;
 use std::ptr::NonNull;
 use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
@@ -375,7 +375,7 @@ impl X11ProtocolHandler {
     }
 
     fn replace_futex_storage(
-        my_fd: RawFd,
+        my_fd: BorrowedFd,
         pid: Pid,
         shmem_path: &str,
         shmem_file: &mut File,
@@ -392,7 +392,7 @@ impl X11ProtocolHandler {
         for entry in fs::read_dir(format!("/proc/{pid}/fd"))? {
             let entry = entry?;
             if let Ok(file) = File::options().open(entry.path()) {
-                if fstat(file.as_raw_fd())?.st_ino == my_ino {
+                if fstat(file.as_fd())?.st_ino == my_ino {
                     fds_to_replace.push(entry.file_name().to_string_lossy().parse::<i32>()?);
                 }
             }
@@ -461,9 +461,9 @@ impl X11ProtocolHandler {
             return Err(Errno::EOPNOTSUPP.into());
         } else {
             let (fd, shmem_path) = mkstemp(SHM_TEMPLATE)?;
-            let mut shmem_file = unsafe { File::from_raw_fd(fd) };
+            let mut shmem_file = File::from(fd);
             let ret = Self::replace_futex_storage(
-                memfd.as_raw_fd(),
+                memfd.as_fd(),
                 Pid::from_raw(pid),
                 shmem_path.as_os_str().to_str().unwrap(),
                 &mut shmem_file,