Merge pull request #2204 from hermit-os/align-address-0.4

build(deps): upgrade align-address to 0.4

Author: mkroening

Cargo.lock

@@ -105,7 +105,7 @@ unreadable_literal = "warn"
 hermit-macro = { version = "=0.1.0", path = "hermit-macro" }
 virtio = { package = "virtio-spec", version = "0.3", optional = true, features = ["alloc", "mmio", "nightly", "zerocopy"] }
 ahash = { version = "0.8", default-features = false }
-align-address = "0.3"
+align-address = "0.4"
 anstyle = { version = "1", default-features = false }
 async-executor = { git = "https://github.com/hermit-os/async-executor.git", branch = "no_std", default-features = false, features = ["static"] }
 async-lock = { version = "3.4.2", default-features = false }
@@ -167,7 +167,7 @@ free-list = { version = "0.3", features = ["x86_64"] }
 raw-cpuid = "11"
 uart_16550 = "0.4"
 x86_64 = "0.15"
-memory_addresses = { version = "0.2.3", default-features = false, features = [
+memory_addresses = { version = "0.3", default-features = false, features = [
 	"x86_64",
 	"conv-x86_64",
 ] }
@@ -177,7 +177,7 @@ aarch64-cpu = "11"
 arm-gic = { version = "0.6" }
 arm-pl011-uart = { version = "0.4", default-features = false }
 semihosting = { version = "0.1", optional = true }
-memory_addresses = { version = "0.2.3", default-features = false, features = [
+memory_addresses = { version = "0.3", default-features = false, features = [
 	"aarch64",
 ] }
 
@@ -187,7 +187,7 @@ sbi-rt = "0.0.3"
 semihosting = { version = "0.1", optional = true }
 tock-registers = { version = "0.10", optional = true }
 trapframe = "0.10"
-memory_addresses = { version = "0.2.3", default-features = false, features = [
+memory_addresses = { version = "0.3", default-features = false, features = [
 	"riscv64",
 ] }
 

Cargo.toml

@@ -12,10 +12,12 @@ use crate::syscalls::interfaces::SyscallInterface;
 #[inline]
 #[cfg_attr(target_arch = "riscv64", expect(dead_code))]
 pub(crate) fn serial_buf_hypercall(buf: &[u8]) {
-	let p = SerialWriteBufferParams {
-		buf: virtual_to_physical(VirtAddr::from_ptr(core::ptr::from_ref::<[u8]>(buf))).unwrap(),
-		len: buf.len(),
-	};
+	let len = buf.len();
+	let buf = virtual_to_physical(VirtAddr::from_ptr(core::ptr::from_ref::<[u8]>(buf)))
+		.unwrap()
+		.as_u64()
+		.into();
+	let p = SerialWriteBufferParams { buf, len };
 	uhyve_hypercall(Hypercall::SerialWriteBuffer(&p));
 }