Merge pull request #566 from hermitcore/nix-0.27.1

build(deps): upgrade nix from 0.26.2 to 0.27.1
hermit-os · Aug 28, 2023 · 3cfa5a2 · 3cfa5a2
2 parents b112f15 + d1f4168
commit 3cfa5a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -62,7 +62,7 @@ rftrace-frontend = { version = "0.1", optional = true }
 kvm-bindings = "0.6"
 kvm-ioctls = "0.12"
 mac_address = "1.1"
-nix = "0.26"
+nix = { version = "0.27", features = ["mman", "pthread", "signal"] }
 tun-tap = { version = "0.1", default-features = false }
 virtio-bindings = { version = "0.2", features = ["virtio-v4_14_0"] }
 vmm-sys-util = "0.11"

diff --git a/src/linux/uhyve.rs b/src/linux/uhyve.rs
@@ -5,7 +5,7 @@ use std::{
 	cmp,
 	ffi::OsString,
 	fmt, mem,
-	os::raw::c_void,
+	os::{fd::BorrowedFd, raw::c_void},
 	path::{Path, PathBuf},
 	ptr,
 	sync::{Arc, Mutex},
@@ -313,12 +313,12 @@ impl MmapMemory {
 		mergeable: bool,
 	) -> MmapMemory {
 		let host_address = unsafe {
-			mmap(
+			mmap::<BorrowedFd<'_>>(
 				None,
 				memory_size.try_into().unwrap(),
 				ProtFlags::PROT_READ | ProtFlags::PROT_WRITE,
 				MapFlags::MAP_PRIVATE | MapFlags::MAP_ANONYMOUS | MapFlags::MAP_NORESERVE,
-				-1,
+				None,
 				0,
 			)
 			.expect("mmap failed")