From 5b336e9d5e8b7bb315554d7704770023d2a7a724 Mon Sep 17 00:00:00 2001 From: "Ibuki.O" Date: Thu, 22 Jan 2026 13:29:42 +0900 Subject: [PATCH 1/3] chore: Update error log when memory root fd is not initialized in drivers common. --- drivers/common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/src/lib.rs b/drivers/common/src/lib.rs index 8259bbdc53..7fccd97c10 100644 --- a/drivers/common/src/lib.rs +++ b/drivers/common/src/lib.rs @@ -40,7 +40,7 @@ pub fn init() { pub fn memory_root_fd() -> &'static libredox::Fd { MEMORY_ROOT_FD .get() - .expect("acpid: failed to get memory_root_fd") + .expect("drivers common: failed to get memory_root_fd") } /// Specifies the write behavior for a specific region of memory From bc6ad8c5f7c6a702594eb13235098fe1de4c58a2 Mon Sep 17 00:00:00 2001 From: "Ibuki.O" Date: Thu, 22 Jan 2026 13:34:14 +0900 Subject: [PATCH 2/3] fix: Call common::init in virtio-blkd main. --- drivers/storage/virtio-blkd/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/storage/virtio-blkd/src/main.rs b/drivers/storage/virtio-blkd/src/main.rs index d21236b377..ef703afa5c 100644 --- a/drivers/storage/virtio-blkd/src/main.rs +++ b/drivers/storage/virtio-blkd/src/main.rs @@ -99,6 +99,7 @@ pub struct BlockVirtRequest { const_assert_eq!(core::mem::size_of::(), 16); fn main() { + common::init(); pcid_interface::pci_daemon(daemon_runner); } From 36e957e7b0b94827759937d9780b5b1c6ac90244 Mon Sep 17 00:00:00 2001 From: "Ibuki.O" Date: Thu, 22 Jan 2026 14:17:16 +0900 Subject: [PATCH 3/3] chore: Improve error message when memory root fd is not initialized. --- drivers/common/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/src/lib.rs b/drivers/common/src/lib.rs index 7fccd97c10..9509b51f3d 100644 --- a/drivers/common/src/lib.rs +++ b/drivers/common/src/lib.rs @@ -40,7 +40,7 @@ pub fn init() { pub fn memory_root_fd() -> &'static libredox::Fd { MEMORY_ROOT_FD .get() - .expect("drivers common: failed to get memory_root_fd") + .expect("drivers common: memory root fd not initialized. Please call `common::init` in your main function.") } /// Specifies the write behavior for a specific region of memory