feat: add macos sync io

cloud-hypervisor · Jan 12, 2024 · 2b3daf5 · 2b3daf5
1 parent 4299e69
commit 2b3daf5
Show file tree

Hide file tree

Showing 8 changed files with 356 additions and 257 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -117,7 +117,10 @@ pub type Result<T> = ::std::result::Result<T, Error>;
 pub mod abi;
 pub mod api;
 
-// #[cfg(all(any(feature = "fusedev", feature = "virtiofs"), target_os = "linux"))]
+#[cfg(all(
+    any(feature = "fusedev", feature = "virtiofs"),
+    any(target_os = "macos", target_os = "linux")
+))]
 pub mod passthrough;
 pub mod transport;
 

diff --git a/src/passthrough/macos_sync_io.rs b/src/passthrough/macos_sync_io.rs
diff --git a/src/passthrough/mod.rs b/src/passthrough/mod.rs
@@ -58,17 +58,14 @@ mod config;
 mod file_handle;
 mod inode_store;
 #[cfg(target_os = "linux")]
-mod linux_sync_io;
-#[cfg(target_os = "macos")]
-mod macos_sync_io;
-#[cfg(target_os = "linux")]
 mod mount_fd;
 #[cfg(target_os = "linux")]
 mod os_compat;
 #[cfg(target_os = "macos")]
 mod stat;
 #[cfg(target_os = "linux")]
 mod statx;
+mod sync_io;
 mod util;
 
 type Inode = u64;
@@ -89,6 +86,16 @@ type LibCStat = libc::stat64;
 #[cfg(target_os = "macos")]
 type LibCStat = libc::stat;
 
+#[cfg(target_os = "linux")]
+type OffT = libc::off64_t;
+#[cfg(target_os = "macos")]
+type OffT = libc::off_t;
+
+#[cfg(target_os = "linux")]
+type StatVfs = libc::statvfs64;
+#[cfg(target_os = "macos")]
+type StatVfs = libc::statvfs;
+
 /// Maximum host inode number supported by passthroughfs
 const MAX_HOST_INO: u64 = 0x7fff_ffff_ffff;