Skip to content
Merged
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
247 changes: 139 additions & 108 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions resources/seccomp/aarch64-unknown-linux-musl.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
"syscall": "fstat",
"comment": "Used for drive patching & rescanning, for reading the local timezone from /etc/localtime"
},
{
"syscall": "faccessat",
"comment": "Used by aws-lc-sys"
},
{
"syscall": "ftruncate",
"comment": "Used for snapshotting"
Expand Down
4 changes: 2 additions & 2 deletions src/acpi-tables/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ license = "Apache-2.0"

[dependencies]
displaydoc = "0.2.5"
thiserror = "2.0.11"
thiserror = "2.0.12"
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
zerocopy = { version = "0.8.20", features = ["derive"] }
zerocopy = { version = "0.8.23", features = ["derive"] }

[lib]
bench = false
Expand Down
10 changes: 5 additions & 5 deletions src/clippy-tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ name = "clippy-tracing"
bench = false

[dependencies]
clap = { version = "4.5.31", features = ["derive"] }
clap = { version = "4.5.32", features = ["derive"] }
itertools = "0.14.0"
proc-macro2 = { version = "1.0.93", features = ["span-locations"] }
quote = "1.0.38"
syn = { version = "2.0.98", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
proc-macro2 = { version = "1.0.94", features = ["span-locations"] }
quote = "1.0.40"
syn = { version = "2.0.100", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
walkdir = "2.5.0"

[dev-dependencies]
uuid = { version = "1.14.0", features = ["v4"] }
uuid = { version = "1.15.1", features = ["v4"] }

[lints]
workspace = true
10 changes: 5 additions & 5 deletions src/cpu-template-helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ name = "cpu-template-helper"
bench = false

[dependencies]
clap = { version = "4.5.31", features = ["derive", "string"] }
clap = { version = "4.5.32", features = ["derive", "string"] }
displaydoc = "0.2.5"
libc = "0.2.170"
libc = "0.2.171"
log-instrument = { path = "../log-instrument", optional = true }
serde = { version = "1.0.218", features = ["derive"] }
serde_json = "1.0.139"
thiserror = "2.0.11"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
thiserror = "2.0.12"

vmm = { path = "../vmm" }
vmm-sys-util = "0.12.1"
Expand Down
18 changes: 9 additions & 9 deletions src/firecracker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,32 @@ bench = false
[dependencies]
displaydoc = "0.2.5"
event-manager = "0.4.0"
libc = "0.2.170"
libc = "0.2.171"
log-instrument = { path = "../log-instrument", optional = true }
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }

serde = { version = "1.0.218", features = ["derive"] }
serde = { version = "1.0.219", features = ["derive"] }
serde_derive = "1.0.136"
serde_json = "1.0.139"
thiserror = "2.0.11"
serde_json = "1.0.140"
thiserror = "2.0.12"
timerfd = "1.6.0"
utils = { path = "../utils" }
vmm = { path = "../vmm" }
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }

[dev-dependencies]
cargo_toml = "0.21.0"
libc = "0.2.170"
cargo_toml = "0.22.1"
libc = "0.2.171"
regex = { version = "1.11.1", default-features = false, features = ["std", "unicode-perl"] }

# Dev-Dependencies for uffd examples
serde = { version = "1.0.218", features = ["derive"] }
serde = { version = "1.0.219", features = ["derive"] }
userfaultfd = "0.8.1"

[build-dependencies]
seccompiler = { path = "../seccompiler" }
serde = { version = "1.0.218" }
serde_json = "1.0.139"
serde = { version = "1.0.219" }
serde_json = "1.0.140"

[features]
tracing = ["log-instrument", "utils/tracing", "vmm/tracing"]
Expand Down
4 changes: 2 additions & 2 deletions src/jailer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ name = "jailer"
bench = false

[dependencies]
libc = "0.2.170"
libc = "0.2.171"
log-instrument = { path = "../log-instrument", optional = true }
regex = { version = "1.11.1", default-features = false, features = ["std"] }
thiserror = "2.0.11"
thiserror = "2.0.12"
vmm-sys-util = "0.12.1"

utils = { path = "../utils" }
Expand Down
12 changes: 2 additions & 10 deletions src/jailer/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -854,14 +854,6 @@ mod tests {
arg_vec
}

fn get_major(dev: u64) -> u32 {
unsafe { libc::major(dev) }
}

fn get_minor(dev: u64) -> u32 {
unsafe { libc::minor(dev) }
}

fn create_env(mock_proc_mounts: &str) -> Env {
// Create a standard environment.
let arg_parser = build_arg_parser();
Expand Down Expand Up @@ -1120,8 +1112,8 @@ mod tests {
// Ensure device's properties.
let metadata = fs::metadata(dev_path.to_str().unwrap()).unwrap();
assert!(metadata.file_type().is_char_device());
assert_eq!(get_major(metadata.st_rdev()), major);
assert_eq!(get_minor(metadata.st_rdev()), minor);
assert_eq!(libc::major(metadata.st_rdev()), major);
assert_eq!(libc::minor(metadata.st_rdev()), minor);
assert_eq!(
metadata.permissions().mode(),
libc::S_IFCHR | libc::S_IRUSR | libc::S_IWUSR
Expand Down
6 changes: 3 additions & 3 deletions src/log-instrument-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ proc-macro = true
bench = false

[dependencies]
proc-macro2 = "1.0.93"
quote = "1.0.38"
syn = { version = "2.0.98", features = ["full", "extra-traits"] }
proc-macro2 = "1.0.94"
quote = "1.0.40"
syn = { version = "2.0.100", features = ["full", "extra-traits"] }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion src/log-instrument/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ log = "0.4.26"
log-instrument-macros = { path = "../log-instrument-macros" }

[dev-dependencies]
env_logger = "0.11.6"
env_logger = "0.11.7"

[lints]
workspace = true
4 changes: 2 additions & 2 deletions src/rebase-snap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ bench = false

[dependencies]
displaydoc = "0.2.5"
libc = "0.2.170"
libc = "0.2.171"
log-instrument = { path = "../log-instrument", optional = true }
thiserror = "2.0.11"
thiserror = "2.0.12"
vmm-sys-util = "0.12.1"

utils = { path = "../utils" }
Expand Down
12 changes: 6 additions & 6 deletions src/seccompiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ bench = false

[dependencies]
bincode = "1.2.1"
clap = { version = "4.5.31", features = ["derive", "string"] }
clap = { version = "4.5.32", features = ["derive", "string"] }
displaydoc = "0.2.5"
libc = "0.2.170"
serde = { version = "1.0.218", features = ["derive"] }
serde_json = "1.0.139"
thiserror = "2.0.11"
zerocopy = { version = "0.8.20" }
libc = "0.2.171"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
thiserror = "2.0.12"
zerocopy = { version = "0.8.23" }

[lints]
workspace = true
8 changes: 4 additions & 4 deletions src/snapshot-editor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ name = "snapshot-editor"
bench = false

[dependencies]
clap = { version = "4.5.31", features = ["derive", "string"] }
clap = { version = "4.5.32", features = ["derive", "string"] }
displaydoc = "0.2.5"

fc_utils = { package = "utils", path = "../utils" }
libc = "0.2.170"
libc = "0.2.171"
log-instrument = { path = "../log-instrument", optional = true }
semver = "1.0.25"
thiserror = "2.0.11"
semver = "1.0.26"
thiserror = "2.0.12"
vmm = { path = "../vmm" }
vmm-sys-util = "0.12.1"

Expand Down
4 changes: 2 additions & 2 deletions src/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ bench = false

[dependencies]
displaydoc = "0.2.5"
libc = "0.2.170"
libc = "0.2.171"
log-instrument = { path = "../log-instrument", optional = true }
thiserror = "2.0.11"
thiserror = "2.0.12"

[features]
tracing = ["log-instrument"]
Expand Down
18 changes: 9 additions & 9 deletions src/vmm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@ bench = false
acpi_tables = { path = "../acpi-tables" }
aes-gcm = { version = "0.10.1", default-features = false, features = ["aes"] }
arrayvec = { version = "0.7.6", optional = true }
aws-lc-rs = { version = "1.12.4", features = ["bindgen"] }
aws-lc-rs = { version = "1.12.6", features = ["bindgen"] }
base64 = "0.22.1"
bincode = "1.2.1"
bitflags = "2.8.0"
bitflags = "2.9.0"
crc64 = "2.0.0"
derive_more = { version = "2.0.1", default-features = false, features = ["from", "display"] }
displaydoc = "0.2.5"
event-manager = "0.4.0"
gdbstub = { version = "0.7.3", optional = true }
gdbstub = { version = "0.7.5", optional = true }
gdbstub_arch = { version = "0.3.1", optional = true }
kvm-bindings = { version = "0.11.1", features = ["fam-wrappers", "serde"] }
kvm-ioctls = "0.21.0"
libc = "0.2.170"
libc = "0.2.171"
linux-loader = "0.13.0"
log = { version = "0.4.26", features = ["std", "serde"] }
log-instrument = { path = "../log-instrument", optional = true }
memfd = "0.6.3"
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }

semver = { version = "1.0.25", features = ["serde"] }
serde = { version = "1.0.218", features = ["derive", "rc"] }
serde_json = "1.0.139"
semver = { version = "1.0.26", features = ["serde"] }
serde = { version = "1.0.219", features = ["derive", "rc"] }
serde_json = "1.0.140"
slab = "0.4.7"
thiserror = "2.0.11"
thiserror = "2.0.12"
timerfd = "1.5.0"
userfaultfd = "0.8.1"
utils = { path = "../utils" }
Expand All @@ -44,7 +44,7 @@ vm-allocator = "0.1.0"
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
vm-superio = "0.8.0"
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
zerocopy = { version = "0.8.20" }
zerocopy = { version = "0.8.23" }

[target.'cfg(target_arch = "aarch64")'.dependencies]
vm-fdt = "0.3.0"
Expand Down
Loading