passthrough.rs fails with cannot find type statx in crate libc

musl 1.2.5 added support for the statx system call
rust ships unknown-linux-musl with musl 1.2.3
milage on other libs may varay

Intermediate solution using forked version of statx-sys
to replace libc::statx until statx becomes available on musl

Fixes: #431
Signed-off-by: Pepper Gray <hello@peppergray.xyz>

Author: peppergrayxyz

Cargo.lock

@@ -9,3 +9,6 @@ resolver = "2"
 [profile.release]
 #panic = "abort"
 lto = true
+
+[patch.crates-io]
+statx-sys = { git = "https://github.com/peppergrayxyz/statx-sys", rev = "c0cd9f6b654279be5b4e37fd06d17004687b2ed7" }

Cargo.toml

@@ -37,6 +37,7 @@ utils = { path = "../utils" }
 polly = { path = "../polly" }
 rutabaga_gfx = { path = "../rutabaga_gfx", features = ["virgl_renderer", "virgl_renderer_next"], optional = true }
 imago = { version = "0.1.4", features = ["sync-wrappers", "vm-memory"] }
+statx-sys = "0.4.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 hvf = { path = "../hvf" }

src/devices/Cargo.toml

@@ -147,19 +147,19 @@ fn stat(f: &File) -> io::Result<libc::stat64> {
 }
 
 fn statx(f: &File) -> io::Result<(libc::stat64, u64)> {
-    let mut stx = MaybeUninit::<libc::statx>::zeroed();
+    let mut stx = MaybeUninit::<statx_sys::statx>::zeroed();
 
     // Safe because this is a constant value and a valid C string.
     let pathname = unsafe { CStr::from_bytes_with_nul_unchecked(EMPTY_CSTR) };
 
     // Safe because the kernel will only write data in `st` and we check the return
     // value.
     let res = unsafe {
-        libc::statx(
+        statx_sys::statx(
             f.as_raw_fd(),
             pathname.as_ptr(),
-            libc::AT_EMPTY_PATH | libc::AT_SYMLINK_NOFOLLOW,
-            libc::STATX_BASIC_STATS | libc::STATX_MNT_ID,
+            statx_sys::AT_EMPTY_PATH | statx_sys::AT_SYMLINK_NOFOLLOW,
+            statx_sys::STATX_BASIC_STATS | statx_sys::STATX_MNT_ID,
             stx.as_mut_ptr(),
         )
     };