diff --git a/Cargo.lock b/Cargo.lock index 1c8f24b4c62..0a9b2bc06a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,7 +9,7 @@ dependencies = [ "displaydoc", "thiserror 2.0.12", "vm-memory", - "zerocopy 0.8.25", + "zerocopy", ] [[package]] @@ -250,12 +250,6 @@ version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "cargo_toml" version = "0.22.1" @@ -274,9 +268,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.24" +version = "1.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7" +checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951" dependencies = [ "jobserver", "libc", @@ -348,9 +342,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.38" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" +checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" dependencies = [ "clap_builder", "clap_derive", @@ -367,9 +361,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.38" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" +checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" dependencies = [ "anstream", "anstyle", @@ -600,9 +594,9 @@ dependencies = [ [[package]] name = "event-manager" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b16fe5161a1160c9c7cece9f7504f2412ef5e2c0643d1e322eccf37692a42b" +checksum = "97f377bdec2bbca5e5f69859595bd48b43f3a26ab063532f7d6e95f8e42056e3" dependencies = [ "libc", "vmm-sys-util", @@ -866,20 +860,20 @@ dependencies = [ [[package]] name = "kvm-bindings" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13baf7bdfda2e10bcb109fcb099ef40cff82374eb6b7cdcf4695bdec4e522c" +checksum = "d4b153a59bb3ca930ff8148655b2ef68c34259a623ae08cf2fb9b570b2e45363" dependencies = [ "serde", "vmm-sys-util", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] name = "kvm-ioctls" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083c460d5a272c2f22205973e319147b791d92a288d7d7a8d4c6194f95229440" +checksum = "b702df98508cb63ad89dd9beb9f6409761b30edca10d48e57941d3f11513a006" dependencies = [ "bitflags 2.9.1", "kvm-bindings", @@ -907,9 +901,9 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libloading" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c" +checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", "windows-targets", @@ -981,7 +975,7 @@ dependencies = [ [[package]] name = "micro_http" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/micro-http#4f621532e81ee2ad096a9c9592fdacc40d19de48" +source = "git+https://github.com/firecracker-microvm/micro-http#bf5098916006912f8dd35aaa6daa5579c6c297b2" dependencies = [ "libc", "vmm-sys-util", @@ -1092,14 +1086,14 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.25", + "zerocopy", ] [[package]] name = "prettyplease" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" +checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d" dependencies = [ "proc-macro2", "syn", @@ -1305,7 +1299,7 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.12", - "zerocopy 0.8.25", + "zerocopy", ] [[package]] @@ -1608,21 +1602,9 @@ dependencies = [ "getrandom 0.3.2", "js-sys", "rand 0.9.1", - "uuid-macro-internal", "wasm-bindgen", ] -[[package]] -name = "uuid-macro-internal" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b682e8c381995ea03130e381928e0e005b7c9eb483c6c8682f50e07b33c2b7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "version_check" version = "0.9.5" @@ -1631,9 +1613,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vhost" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bce0aad4d8776cb64f1ac591e908a561c50ba6adac4416296efee590b155623f" +checksum = "2a4dcad85a129d97d5d4b2f3c47a4affdeedd76bdcd02094bcb5d9b76cac2d05" dependencies = [ "bitflags 2.9.1", "libc", @@ -1650,12 +1632,12 @@ checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1" [[package]] name = "vm-allocator" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4ce718bd4e8d74b1747363e27f715a6b1bd6971597cb21425dadbf4e712241" +checksum = "3c2fce39487bd03b5b0ab176f584682e9eaab7875254bafd3d188c69c85fce6e" dependencies = [ "libc", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] @@ -1666,9 +1648,9 @@ checksum = "7e21282841a059bb62627ce8441c491f09603622cd5a21c43bfedc85a2952f23" [[package]] name = "vm-memory" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1720e7240cdc739f935456eb77f370d7e9b2a3909204da1e2b47bef1137a013" +checksum = "1fd5e56d48353c5f54ef50bd158a0452fc82f5383da840f7b8efc31695dd3b9d" dependencies = [ "libc", "thiserror 1.0.69", @@ -1724,14 +1706,14 @@ dependencies = [ "vm-memory", "vm-superio", "vmm-sys-util", - "zerocopy 0.8.25", + "zerocopy", ] [[package]] name = "vmm-sys-util" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" +checksum = "d21f366bf22bfba3e868349978766a965cbe628c323d58e026be80b8357ab789" dependencies = [ "bitflags 1.3.2", "libc", @@ -1956,34 +1938,13 @@ dependencies = [ "bitflags 2.9.1", ] -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive 0.7.35", -] - [[package]] name = "zerocopy" version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ - "zerocopy-derive 0.8.25", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "zerocopy-derive", ] [[package]] diff --git a/src/acpi-tables/Cargo.toml b/src/acpi-tables/Cargo.toml index 414c7e5fa4e..3a4c30c9328 100644 --- a/src/acpi-tables/Cargo.toml +++ b/src/acpi-tables/Cargo.toml @@ -15,7 +15,7 @@ bench = false [dependencies] displaydoc = "0.2.5" thiserror = "2.0.12" -vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] } +vm-memory = { version = "0.16.2", features = ["backend-mmap", "backend-bitmap"] } zerocopy = { version = "0.8.25", features = ["derive"] } [lints] diff --git a/src/clippy-tracing/Cargo.toml b/src/clippy-tracing/Cargo.toml index 0a949fb0cef..f128bb8783b 100644 --- a/src/clippy-tracing/Cargo.toml +++ b/src/clippy-tracing/Cargo.toml @@ -10,7 +10,7 @@ name = "clippy-tracing" bench = false [dependencies] -clap = { version = "4.5.38", features = ["derive"] } +clap = { version = "4.5.39", features = ["derive"] } itertools = "0.14.0" proc-macro2 = { version = "1.0.95", features = ["span-locations"] } quote = "1.0.40" diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml index 07559f310b0..653685527bc 100644 --- a/src/cpu-template-helper/Cargo.toml +++ b/src/cpu-template-helper/Cargo.toml @@ -13,7 +13,7 @@ bench = false tracing = ["log-instrument", "vmm/tracing"] [dependencies] -clap = { version = "4.5.38", features = ["derive", "string"] } +clap = { version = "4.5.39", features = ["derive", "string"] } displaydoc = "0.2.5" libc = "0.2.172" log-instrument = { path = "../log-instrument", optional = true } @@ -22,7 +22,7 @@ serde_json = "1.0.140" thiserror = "2.0.12" vmm = { path = "../vmm" } -vmm-sys-util = "0.12.1" +vmm-sys-util = "0.14.0" [lints] workspace = true diff --git a/src/firecracker/Cargo.toml b/src/firecracker/Cargo.toml index fb43a68aaa1..57aeabc1648 100644 --- a/src/firecracker/Cargo.toml +++ b/src/firecracker/Cargo.toml @@ -21,7 +21,7 @@ gdb = ["vmm/gdb"] [dependencies] displaydoc = "0.2.5" -event-manager = "0.4.0" +event-manager = "0.4.1" libc = "0.2.172" log-instrument = { path = "../log-instrument", optional = true } micro_http = { git = "https://github.com/firecracker-microvm/micro-http" } @@ -32,7 +32,7 @@ thiserror = "2.0.12" timerfd = "1.6.0" utils = { path = "../utils" } vmm = { path = "../vmm" } -vmm-sys-util = { version = "0.12.1", features = ["with-serde"] } +vmm-sys-util = { version = "0.14.0", features = ["with-serde"] } [build-dependencies] seccompiler = { path = "../seccompiler" } diff --git a/src/jailer/Cargo.toml b/src/jailer/Cargo.toml index eb1da57f5c4..fef7cfaaa26 100644 --- a/src/jailer/Cargo.toml +++ b/src/jailer/Cargo.toml @@ -19,7 +19,7 @@ libc = "0.2.172" log-instrument = { path = "../log-instrument", optional = true } regex = { version = "1.11.1", default-features = false, features = ["std"] } thiserror = "2.0.12" -vmm-sys-util = "0.12.1" +vmm-sys-util = "0.14.0" utils = { path = "../utils" } diff --git a/src/rebase-snap/Cargo.toml b/src/rebase-snap/Cargo.toml index 022562fa0ad..6cf69972585 100644 --- a/src/rebase-snap/Cargo.toml +++ b/src/rebase-snap/Cargo.toml @@ -17,7 +17,7 @@ displaydoc = "0.2.5" libc = "0.2.172" log-instrument = { path = "../log-instrument", optional = true } thiserror = "2.0.12" -vmm-sys-util = "0.12.1" +vmm-sys-util = "0.14.0" utils = { path = "../utils" } diff --git a/src/seccompiler/Cargo.toml b/src/seccompiler/Cargo.toml index 627d863020c..e993b602526 100644 --- a/src/seccompiler/Cargo.toml +++ b/src/seccompiler/Cargo.toml @@ -17,7 +17,7 @@ bench = false [dependencies] bincode = { version = "2.0.1", features = ["serde"] } -clap = { version = "4.5.38", features = ["derive", "string"] } +clap = { version = "4.5.39", features = ["derive", "string"] } displaydoc = "0.2.5" libc = "0.2.172" serde = { version = "1.0.219", features = ["derive"] } diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml index cc25bd3fa02..198081f78af 100644 --- a/src/snapshot-editor/Cargo.toml +++ b/src/snapshot-editor/Cargo.toml @@ -13,7 +13,7 @@ bench = false tracing = ["log-instrument", "fc_utils/tracing", "vmm/tracing"] [dependencies] -clap = { version = "4.5.38", features = ["derive", "string"] } +clap = { version = "4.5.39", features = ["derive", "string"] } displaydoc = "0.2.5" fc_utils = { package = "utils", path = "../utils" } @@ -22,7 +22,7 @@ log-instrument = { path = "../log-instrument", optional = true } semver = "1.0.26" thiserror = "2.0.12" vmm = { path = "../vmm" } -vmm-sys-util = "0.12.1" +vmm-sys-util = "0.14.0" [target.'cfg(target_arch = "aarch64")'.dependencies] clap-num = "1.2.0" diff --git a/src/vmm/Cargo.toml b/src/vmm/Cargo.toml index 26e68ca1518..685dea66c16 100644 --- a/src/vmm/Cargo.toml +++ b/src/vmm/Cargo.toml @@ -24,11 +24,11 @@ bitflags = "2.9.1" 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" +event-manager = "0.4.1" 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" +kvm-bindings = { version = "0.12.0", features = ["fam-wrappers", "serde"] } +kvm-ioctls = "0.22.0" libc = "0.2.172" linux-loader = "0.13.0" log = { version = "0.4.27", features = ["std", "serde"] } @@ -43,11 +43,11 @@ thiserror = "2.0.12" timerfd = "1.5.0" userfaultfd = "0.8.1" utils = { path = "../utils" } -vhost = { version = "0.13.0", features = ["vhost-user-frontend"] } -vm-allocator = "0.1.0" -vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] } +vhost = { version = "0.14.0", features = ["vhost-user-frontend"] } +vm-allocator = "0.1.2" +vm-memory = { version = "0.16.2", features = ["backend-mmap", "backend-bitmap"] } vm-superio = "0.8.0" -vmm-sys-util = { version = "0.12.1", features = ["with-serde"] } +vmm-sys-util = { version = "0.14.0", features = ["with-serde"] } zerocopy = { version = "0.8.25" } [target.'cfg(target_arch = "aarch64")'.dependencies] diff --git a/src/vmm/src/devices/virtio/net/tap.rs b/src/vmm/src/devices/virtio/net/tap.rs index c516705af31..40a8491ffad 100644 --- a/src/vmm/src/devices/virtio/net/tap.rs +++ b/src/vmm/src/devices/virtio/net/tap.rs @@ -12,7 +12,7 @@ use std::os::raw::*; use std::os::unix::io::{AsRawFd, FromRawFd, RawFd}; use vmm_sys_util::ioctl::{ioctl_with_mut_ref, ioctl_with_ref, ioctl_with_val}; -use vmm_sys_util::{ioctl_ioc_nr, ioctl_iow_nr}; +use vmm_sys_util::ioctl_iow_nr; use crate::devices::virtio::iovec::IoVecBuffer; use crate::devices::virtio::net::generated;