Skip to content

libkrun: Produce a proper Rust library #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
d-e-s-o wants to merge 2 commits into
base: main
Choose a base branch
from
Open

libkrun: Produce a proper Rust library #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b5f1fa
Use vm-memory 0.17
d-e-s-o Mar 22, 2026
001ca16
libkrun: Produce a proper Rust library
d-e-s-o Mar 7, 2026
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
755 changes: 287 additions & 468 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/Cargo.lock
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions src/arch/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ efi = []

[dependencies]
libc = ">=0.2.39"
vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
vmm-sys-util = ">= 0.14"
vm-memory = { version = "0.17", features = ["backend-mmap"] }
vmm-sys-util = "0.14"

arch_gen = { path = "../arch_gen" }
smbios = { path = "../smbios" }
utils = { path = "../utils" }

[target.'cfg(target_os = "linux")'.dependencies]
kvm-bindings = { version = ">=0.11", features = ["fam-wrappers"] }
kvm-ioctls = ">=0.21"
kvm-bindings = { version = "0.12", features = ["fam-wrappers"] }
kvm-ioctls = "0.22"
tdx = { version = "0.1.0", optional = true }

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions src/cpuid/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ edition = "2021"
tdx = []

[dependencies]
vmm-sys-util = ">= 0.14"
vmm-sys-util = "0.14"

[target.'cfg(target_os = "linux")'.dependencies]
kvm-bindings = { version = ">=0.11", features = ["fam-wrappers"] }
kvm-ioctls = ">=0.21"
kvm-bindings = { version = "0.12", features = ["fam-wrappers"] }
kvm-ioctls = "0.22"
8 changes: 4 additions & 4 deletions src/devices/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pw = { package = "pipewire", version = "0.8.0", optional = true }
rand = "0.9.2"
thiserror = { version = "2.0", optional = true }
virtio-bindings = "0.2.0"
vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
vm-memory = { version = "0.17", features = ["backend-mmap"] }
zerocopy = { version = "0.8.26", optional = true, features = ["derive"] }
krun_display = { path = "../krun_display", optional = true, features = ["bindgen_clang_runtime"] }
krun_input = { path = "../krun_input", features = ["bindgen_clang_runtime"], optional = true }
Expand All @@ -39,7 +39,7 @@ arch = { path = "../arch" }
utils = { path = "../utils" }
polly = { path = "../polly" }
rutabaga_gfx = { path = "../rutabaga_gfx", features = ["virgl_renderer", "virgl_renderer_next"], optional = true }
imago = { version = "0.2.1", features = ["sync-wrappers", "vm-memory"] }
imago = { version = "0.2.2", features = ["sync-wrappers", "vm-memory"] }

[target.'cfg(target_os = "macos")'.dependencies]
hvf = { path = "../hvf" }
Expand All @@ -48,8 +48,8 @@ lru = ">=0.9"
[target.'cfg(target_os = "linux")'.dependencies]
rutabaga_gfx = { path = "../rutabaga_gfx", features = ["x"], optional = true }
caps = "0.5.5"
kvm-bindings = { version = ">=0.11", features = ["fam-wrappers"] }
kvm-ioctls = ">=0.21"
kvm-bindings = { version = "0.12", features = ["fam-wrappers"] }
kvm-ioctls = "0.22"

[target.'cfg(any(target_arch = "aarch64", target_arch = "riscv64"))'.dependencies]
vm-fdt = ">= 0.2.0"
3 changes: 3 additions & 0 deletions src/devices/src/virtio/console/process_rx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ fn read_to_desc(
input: &mut (dyn PortInput + Send),
eof: &mut bool,
) -> Result<usize, GuestMemoryError> {
// TODO: Switch to using `get_slices()` with the next vm-memory
// bump.
#[allow(deprecated)]
desc.mem
.try_access(desc.len as usize, desc.addr, |_, len, addr, region| {
let mut target = region.get_slice(addr, len).unwrap();
Expand Down
3 changes: 3 additions & 0 deletions src/devices/src/virtio/console/process_tx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ fn write_desc_to_output(
output: &mut (dyn PortOutput + Send),
interrupt: &InterruptTransport,
) -> Result<usize, GuestMemoryError> {
// TODO: Switch to using `get_slices()` with the next vm-memory
// bump.
#[allow(deprecated)]
desc.mem
.try_access(desc.len as usize, desc.addr, |_, len, addr, region| {
let src = region.get_slice(addr, len).unwrap();
Expand Down
2 changes: 1 addition & 1 deletion src/kernel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ version = "0.1.0"
edition = "2021"

[dependencies]
vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
vm-memory = { version = "0.17", features = ["backend-mmap"] }

utils = { path = "../utils" }
8 changes: 4 additions & 4 deletions src/libkrun/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ rand = "0.9.2"
hvf = { path = "../hvf" }

[target.'cfg(target_os = "linux")'.dependencies]
kvm-bindings = { version = ">=0.11", features = ["fam-wrappers"] }
kvm-ioctls = ">=0.21"
kvm-bindings = { version = "0.12", features = ["fam-wrappers"] }
kvm-ioctls = "0.22"
aws-nitro = { path = "../aws_nitro", optional = true }
nitro-enclaves = { version = "0.5.0", optional = true }
vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
vm-memory = { version = "0.17", features = ["backend-mmap"] }

[lib]
name = "krun"
crate-type = ["cdylib"]
crate-type = ["cdylib", "lib"]
2 changes: 1 addition & 1 deletion src/rutabaga_gfx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ remain = "0.2"
thiserror = "1.0.23"
zerocopy = { version = "0.8.26", features = ["derive"] }
log = "0.4"
vmm-sys-util = ">=0.14"
vmm-sys-util = "0.14"

[target.'cfg(unix)'.dependencies]
nix = { version = "0.30.1", features = ["event", "feature", "fs", "mman", "socket", "uio", "ioctl"] }
Expand Down
2 changes: 1 addition & 1 deletion src/smbios/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "0.1.0"
edition = "2021"

[dependencies]
vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
vm-memory = { version = "0.17", features = ["backend-mmap"] }
4 changes: 2 additions & 2 deletions src/utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ bitflags = "1.2.0"
libc = ">=0.2.85"
log = "0.4.0"
nix = "0.30.1"
vmm-sys-util = ">= 0.14"
vmm-sys-util = "0.14"
crossbeam-channel = ">=0.5.15"

[target.'cfg(target_os = "linux")'.dependencies]
kvm-bindings = { version = ">=0.11", features = ["fam-wrappers"] }
kvm-bindings = { version = "0.12", features = ["fam-wrappers"] }

[target.'cfg(target_os = "macos")'.dependencies]
nix = { version = "0.30.1", features = ["fs"] }
10 changes: 5 additions & 5 deletions src/vmm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ aws-nitro = []
crossbeam-channel = ">=0.5.15"
flate2 = "1.0.35"
libc = ">=0.2.39"
linux-loader = { version = "0.13.0", features = ["bzimage", "elf", "pe"] }
linux-loader = { version = "0.13.2", features = ["bzimage", "elf", "pe"] }
log = "0.4.0"
nix = { version = "0.30.1", features = ["fs", "term"] }
vm-memory = { version = ">=0.13", features = ["backend-mmap"] }
vmm-sys-util = ">=0.14"
vm-memory = { version = "0.17.0", features = ["backend-mmap"] }
vmm-sys-util = "0.14"
krun_display = { path = "../krun_display", optional = true, features = ["bindgen_clang_runtime"] }
krun_input = { path = "../krun_input", optional = true, features = ["bindgen_clang_runtime"] }

Expand All @@ -51,8 +51,8 @@ zstd = "0.13"

[target.'cfg(target_os = "linux")'.dependencies]
tdx = { version = "0.1.0", optional = true }
kvm-bindings = { version = ">=0.11", features = ["fam-wrappers"] }
kvm-ioctls = ">=0.21"
kvm-bindings = { version = "0.12", features = ["fam-wrappers"] }
kvm-ioctls = "0.22"

[target.'cfg(target_os = "macos")'.dependencies]
hvf = { path = "../hvf" }
Expand Down
12 changes: 8 additions & 4 deletions src/vmm/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ pub enum StartMicrovmError {
/// Cannot read firmware contents from file.
FirmwareRead(io::Error),
/// Memory regions are overlapping or mmap fails.
GuestMemoryMmap(vm_memory::Error),
GuestMemoryMmap(String),
/// The BZIP2 decoder couldn't decompress the kernel.
ImageBz2Decoder(io::Error),
/// Cannot find compressed kernel in file.
Expand Down Expand Up @@ -1340,9 +1340,13 @@ fn load_payload(
guest_mem
.insert_region(Arc::new(
GuestRegionMmap::new(kernel_region, GuestAddress(kernel_guest_addr))
.map_err(StartMicrovmError::GuestMemoryMmap)?,
.ok_or_else(|| {
StartMicrovmError::GuestMemoryMmap(
"Failed to create GuestRegionMmap".to_string(),
)
})?,
))
.map_err(StartMicrovmError::GuestMemoryMmap)?,
.map_err(|e| StartMicrovmError::GuestMemoryMmap(format!("{e:?}")))?,
GuestAddress(kernel_entry_addr),
None,
None,
Expand Down Expand Up @@ -1501,7 +1505,7 @@ pub fn create_guest_memory(
arch_mem_regions.extend(shm_manager.regions());

let guest_mem = GuestMemoryMmap::from_ranges(&arch_mem_regions)
.map_err(StartMicrovmError::GuestMemoryMmap)?;
.map_err(|e| StartMicrovmError::GuestMemoryMmap(format!("{e:?}")))?;

let (guest_mem, entry_addr, initrd_config, cmdline) =
load_payload(vm_resources, guest_mem, &arch_mem_info, payload)?;
Expand Down
Loading