feat(uhyve-interface): Uhyve Interface v3 (crate uhyve-interface v0.4.0)

Author: fogti

Cargo.lock

@@ -61,7 +61,7 @@ tempfile = "3.27"
 thiserror = "2.0.18"
 time = { version = "0.3", default-features = false, features = ["std"] }
 toml = { version = "1", default-features = false, features = ["parse", "serde"] }
-uhyve-interface = { version = "0.3.0", path = "uhyve-interface", features = ["std"] }
+uhyve-interface = { version = "0.4", path = "uhyve-interface", features = ["std"] }
 virtio-bindings = "~0.2.7"
 vm-fdt = "0.3"
 vm-memory = { version = "0.18", features = ["backend-mmap"] }
@@ -99,7 +99,7 @@ memory_addresses = { version = "0.4", default-features = false, features = [
 criterion = "0.8"
 home = "0.5"
 regex = { version = "1.12.3", default-features = false, features = ["unicode-perl"] }
-uhyve-interface = { version = "0.3.0", path = "uhyve-interface", features = ["std"] }
+uhyve-interface = { path = "uhyve-interface", features = ["std"] }
 
 [profile.dist]
 inherits = "release"

Cargo.toml

@@ -7,10 +7,7 @@ use std::{
 	sync::Arc,
 };
 
-use uhyve_interface::{
-	GuestPhysAddr,
-	v2::parameters::{FileType, *},
-};
+use uhyve_interface::{GuestPhysAddr, v2::parameters::*, v3::parameters::FileType};
 
 use crate::{
 	hypercall::translate_last_errno,
@@ -197,6 +194,7 @@ pub(super) fn open(mem: &MmapMemory, sysopen: &mut OpenParams, file_map: &mut Uh
 	}
 }
 
+/*
 /// Attempts `mkdir(host_path)` on the host, mapping the outcome to a [`MkdirResult`].
 fn host_mkdir(host_path_c: &CString) -> MkdirResult {
 	// SAFETY: `host_path_c` is a valid, null-terminated C string.
@@ -238,3 +236,4 @@ pub(super) fn mkdir(mem: &MmapMemory, sysmkdir: &mut MkdirParams, file_map: &mut
 		}
 	};
 }
+*/

src/hypercall/by_path.rs

@@ -14,13 +14,13 @@ use crate::{
 mod by_fd;
 mod by_path;
 mod cmdval_copy;
-mod fstat;
-mod getdents;
+//mod fstat;
+//mod getdents;
 
 use by_fd::{close, lseek, lseek_v1, read, read_v1, write, write_v1};
-use by_path::{mkdir, open, unlink};
-use fstat::{fstat, stat};
-use getdents::getdents;
+use by_path::{open, unlink};
+//use fstat::{fstat, stat};
+//use getdents::getdents;
 
 /// `addr` is the address of the hypercall parameter in the guest's memory space. `data` is the
 /// parameter that was sent to that address by the guest.
@@ -95,10 +95,6 @@ pub unsafe fn address_to_hypercall_v2(
 		HypercallAddress::SerialReadBuffer => Hypercall::SerialReadBuffer(get_data!()),
 		HypercallAddress::SerialWriteBuffer => Hypercall::SerialWriteBuffer(get_data!()),
 		HypercallAddress::SerialWriteByte => Hypercall::SerialWriteByte(data.as_u64() as u8),
-		HypercallAddress::Getdents => Hypercall::Getdents(get_data!()),
-		HypercallAddress::FileStat => Hypercall::FileStat(get_data!()),
-		HypercallAddress::FileFstat => Hypercall::FileFstat(get_data!()),
-		HypercallAddress::Mkdir => Hypercall::Mkdir(get_data!()),
 		_ => return None,
 	})
 }
@@ -136,12 +132,6 @@ pub fn handle_hypercall_v2<N: NetworkBackend>(
 		v2::Hypercall::FileUnlink(sysunlink) => {
 			unlink(&peripherals.mem, sysunlink, &mut file_mapping())
 		}
-		v2::Hypercall::Getdents(sysgetdents) => {
-			getdents(&peripherals.mem, sysgetdents, &mut file_mapping())
-		}
-		v2::Hypercall::FileStat(sysstat) => stat(&peripherals.mem, sysstat, &file_mapping()),
-		v2::Hypercall::FileFstat(sysfstat) => fstat(&peripherals.mem, sysfstat, &file_mapping()),
-		v2::Hypercall::Mkdir(sysmkdir) => mkdir(&peripherals.mem, sysmkdir, &mut file_mapping()),
 		v2::Hypercall::SerialWriteByte(buf) => peripherals
 			.serial
 			.output(&[buf])

src/hypercall/mod.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use nohash::NoHashHasher;
-use uhyve_interface::v2::parameters::FileType;
+use uhyve_interface::v3::parameters::FileType;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct GuestFd(pub i32);
@@ -145,6 +145,7 @@ impl UhyveFileDescriptorLayer {
 		self.fds.get_mut(&fd.get())
 	}
 
+	#[expect(unused)]
 	pub fn get(&self, fd: GuestFd) -> Option<&FdData> {
 		self.fds.get(&fd.get())
 	}

src/isolation/fd.rs

@@ -197,6 +197,7 @@ impl UhyveFileMap {
 	/// so that the caller can create it on the host.
 	///
 	/// * `guest_path` - The requested guest path.
+	#[expect(unused)]
 	pub fn create_temporary_directory(&mut self, guest_path: &str) -> Option<CString> {
 		let host_path = self.tempdir.path().join(Uuid::new_v4().to_string());
 		trace!("create_temporary_directory (host_path): {host_path:#?}");

src/isolation/filemap/mod.rs

@@ -1,6 +1,8 @@
+#![expect(unused)]
+
 use std::os::fd::RawFd;
 
-use uhyve_interface::v2::parameters::{FileAttr, Timespec};
+use uhyve_interface::v3::parameters::{FileAttr, Timespec};
 
 pub(crate) fn host_stat_to_file_attr(st: libc::stat) -> FileAttr {
 	FileAttr {

src/linux/fs.rs

@@ -5,9 +5,10 @@ use core::{
 use std::{io, os::fd::RawFd};
 
 use align_address::Align;
-use uhyve_interface::v2::parameters::{Dirent64, FileAttr, FileType, Timespec};
+use uhyve_interface::v3::parameters::{Dirent64, FileAttr, FileType, Timespec};
 
 /// MacOS file attributes have slightly different types than Linux, so we need a separate conversion function.
+#[allow(unused)]
 pub(crate) fn host_stat_to_file_attr(st: libc::stat) -> FileAttr {
 	FileAttr {
 		st_dev: st.st_dev as u64,
@@ -55,6 +56,7 @@ unsafe extern "C" {
 }
 
 /// Reads host directory entries and writes Linux `dirent64` records into `buf`.
+#[allow(unused)]
 pub(crate) unsafe fn raw_getdents(host_fd: RawFd, buf: &mut [u8]) -> isize {
 	let mut guest_off = 0usize;
 	let mut host_buf = [0u8; 2048];

src/macos/fs.rs

@@ -14,14 +14,16 @@ use common::{
 };
 use rand::{RngExt, distr::Alphanumeric};
 use tempfile::TempDir;
-use uhyve_interface::{v1, v2};
+//use uhyve_interface::{v1, v2};
 use uhyvelib::{
 	UhyveVm,
 	params::{Output, Params},
+	/*
 	stats::{
 		HypercallAddresses::{V1, V2},
 		VmExit,
 	},
+	*/
 };
 
 /// Verifies successful file creation on the host OS and its contents.
@@ -432,6 +434,7 @@ fn fd_write_to_fd() {
 	);
 }
 
+/*
 /// Tests the Mkdir hypercall: the guest creates a directory inside a mapped host
 /// directory and populates it with files. The host then verifies the result.
 #[test]
@@ -500,6 +503,7 @@ fn hypercall_mkdir_unmapped_test() {
 		3
 	);
 }
+*/
 
 #[test]
 fn mounts_test() {
@@ -555,6 +559,7 @@ fn lseek_test() {
 	check_result_and_print_output(&res, 0);
 }
 
+/*
 /// Tests the Getdents hypercall: opens a mapped directory and reads its entries.
 #[test]
 fn getdents_test() {
@@ -615,3 +620,4 @@ fn hypercall_fstat_test() {
 	let res = run_vm_in_thread(bin_path, params);
 	check_result_and_print_output(&res, 0);
 }
+*/