Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ mman = []
mmap = ["mman"] # Deprecated in favor of mman
newlib = []
nostd = []
nvme = ["pci", "vroom"]
pci = ["virtio?/pci"]
rtl8139 = ["net", "pci"]
semihosting = ["dep:semihosting"]
Expand Down Expand Up @@ -143,6 +144,7 @@ talc = { version = "4" }
thiserror = { version = "2", default-features = false }
time = { version = "0.3", default-features = false }
volatile = "0.6"
vroom = { git = "https://github.com/valopok/vroom", branch = "main", default-features = false, optional = true }
zerocopy = { version = "0.8", default-features = false }
uhyve-interface = "0.1.3"

Expand Down
2 changes: 1 addition & 1 deletion src/arch/x86_64/mm/paging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pub fn virtual_to_physical(virtual_address: VirtAddr) -> Option<PhysAddr> {

match translate_result {
TranslateResult::NotMapped | TranslateResult::InvalidFrameAddress(_) => {
trace!("Uable to determine the physical address of 0x{virtual_address:X}");
trace!("Unable to determine the physical address of 0x{virtual_address:X}");
None
}
TranslateResult::Mapped { frame, offset, .. } => {
Expand Down
2 changes: 2 additions & 0 deletions src/drivers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ pub mod fs;
pub mod mmio;
#[cfg(feature = "net")]
pub mod net;
#[cfg(feature = "nvme")]
pub mod nvme;
#[cfg(feature = "pci")]
pub mod pci;
#[cfg(any(
Expand Down
Loading