diff --git a/Cargo.lock b/Cargo.lock index 71ad2b1..dce4aeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1894,21 +1894,9 @@ dependencies = [ "getrandom", "js-sys", "rand", - "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 2.0.87", -] - [[package]] name = "version-compare" version = "0.0.11" @@ -1929,15 +1917,15 @@ 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", "uuid", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -1956,7 +1944,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -1977,7 +1965,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -1996,7 +1984,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2019,7 +2007,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2037,7 +2025,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2060,7 +2048,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2081,7 +2069,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2099,7 +2087,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2119,7 +2107,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2141,7 +2129,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2160,7 +2148,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2178,7 +2166,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2202,15 +2190,15 @@ dependencies = [ "virtio-queue", "virtio-vsock", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", "vsock", ] [[package]] name = "vhost-user-backend" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa03d476437d005abd2dec0970c468ed2a692e6a0604b834699680e171de942" +checksum = "a76e8acbdaf760efa37dbd414870c81717a65a64d3351b1a93d03bc249a3e987" dependencies = [ "libc", "log", @@ -2218,7 +2206,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2239,7 +2227,7 @@ dependencies = [ "log", "virtio-bindings", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.12.1", ] [[package]] @@ -2255,15 +2243,15 @@ dependencies = [ [[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 = [ "arc-swap", "bitflags 2.9.1", "libc", "thiserror 1.0.69", - "vmm-sys-util", + "vmm-sys-util 0.14.0", "winapi", ] @@ -2277,6 +2265,16 @@ dependencies = [ "libc", ] +[[package]] +name = "vmm-sys-util" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d21f366bf22bfba3e868349978766a965cbe628c323d58e026be80b8357ab789" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "vsock" version = "0.5.1" diff --git a/staging/Cargo.lock b/staging/Cargo.lock index e28ccce..51abb4d 100644 --- a/staging/Cargo.lock +++ b/staging/Cargo.lock @@ -877,21 +877,9 @@ dependencies = [ "getrandom", "js-sys", "rand", - "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 = "v4l2r" version = "0.0.1" @@ -907,15 +895,15 @@ dependencies = [ [[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", "uuid", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -940,14 +928,14 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] name = "vhost-user-backend" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa03d476437d005abd2dec0970c468ed2a692e6a0604b834699680e171de942" +checksum = "a76e8acbdaf760efa37dbd414870c81717a65a64d3351b1a93d03bc249a3e987" dependencies = [ "libc", "log", @@ -955,7 +943,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -976,20 +964,20 @@ dependencies = [ "log", "virtio-bindings", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.12.1", ] [[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 = [ "arc-swap", "bitflags 2.9.1", "libc", "thiserror 1.0.69", - "vmm-sys-util", + "vmm-sys-util 0.14.0", "winapi", ] @@ -1003,6 +991,16 @@ dependencies = [ "libc", ] +[[package]] +name = "vmm-sys-util" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d21f366bf22bfba3e868349978766a965cbe628c323d58e026be80b8357ab789" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "wasi" version = "0.14.2+wasi-0.2.4" diff --git a/staging/vhost-device-video/Cargo.toml b/staging/vhost-device-video/Cargo.toml index e0dbcb9..f663167 100644 --- a/staging/vhost-device-video/Cargo.toml +++ b/staging/vhost-device-video/Cargo.toml @@ -26,12 +26,12 @@ log = "0.4" libc = "0.2.172" thiserror = "2.0" futures-executor = { version = "0.3", features = ["thread-pool"] } -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.0" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" v4l2r = { git = "https://github.com/Gnurou/v4l2r", rev = "110fd77", optional = true } [dev-dependencies] diff --git a/vhost-device-can/Cargo.toml b/vhost-device-can/Cargo.toml index 222180e..946872b 100644 --- a/vhost-device-can/Cargo.toml +++ b/vhost-device-can/Cargo.toml @@ -21,12 +21,12 @@ log = "0.4" thiserror = "2.0" queues = "1.0.2" socketcan = "3.5.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-console/Cargo.toml b/vhost-device-console/Cargo.toml index 2793789..e9fe729 100644 --- a/vhost-device-console/Cargo.toml +++ b/vhost-device-console/Cargo.toml @@ -23,12 +23,12 @@ env_logger = "0.11" epoll = "4.3" log = "0.4" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-gpio/Cargo.toml b/vhost-device-gpio/Cargo.toml index 7d05020..9556deb 100644 --- a/vhost-device-gpio/Cargo.toml +++ b/vhost-device-gpio/Cargo.toml @@ -21,12 +21,12 @@ env_logger = "0.11" libc = "0.2" log = "0.4" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" [target.'cfg(target_env = "gnu")'.dependencies] libgpiod = "0.2" diff --git a/vhost-device-gpu/Cargo.toml b/vhost-device-gpu/Cargo.toml index 5a667d7..9a13acf 100644 --- a/vhost-device-gpu/Cargo.toml +++ b/vhost-device-gpu/Cargo.toml @@ -27,12 +27,12 @@ log = "0.4" [target.'cfg(not(target_env = "musl"))'.dependencies] rutabaga_gfx = { version = "0.1.5", features = ["virgl_renderer"] } thiserror = "2.0.12" -vhost = { version = "0.13.0", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14.0", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14.0" vm-memory = "0.16.1" -vmm-sys-util = "0.12.1" +vmm-sys-util = "0.14.0" bitflags = "2.9.1" [dev-dependencies] diff --git a/vhost-device-i2c/Cargo.toml b/vhost-device-i2c/Cargo.toml index 804a6d8..2b122a0 100644 --- a/vhost-device-i2c/Cargo.toml +++ b/vhost-device-i2c/Cargo.toml @@ -20,12 +20,12 @@ env_logger = "0.11" libc = "0.2" log = "0.4" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-input/Cargo.toml b/vhost-device-input/Cargo.toml index c2662a4..ee0c632 100644 --- a/vhost-device-input/Cargo.toml +++ b/vhost-device-input/Cargo.toml @@ -22,12 +22,12 @@ log = "0.4" rand = "0.9.1" tempfile = "3.20" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" evdev = "0.13" nix = { version = "0.30", features = ["ioctl"] } diff --git a/vhost-device-rng/Cargo.toml b/vhost-device-rng/Cargo.toml index 3d320ef..38d5603 100644 --- a/vhost-device-rng/Cargo.toml +++ b/vhost-device-rng/Cargo.toml @@ -21,12 +21,12 @@ log = "0.4" rand = "0.9.1" tempfile = "3.20" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-scmi/Cargo.toml b/vhost-device-scmi/Cargo.toml index 8008030..5474443 100644 --- a/vhost-device-scmi/Cargo.toml +++ b/vhost-device-scmi/Cargo.toml @@ -15,12 +15,12 @@ env_logger = "0.11" itertools = "0.14" log = "0.4" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-scsi/Cargo.toml b/vhost-device-scsi/Cargo.toml index 4c07b90..0510efc 100644 --- a/vhost-device-scsi/Cargo.toml +++ b/vhost-device-scsi/Cargo.toml @@ -21,12 +21,12 @@ epoll = "4.3" log = "0.4" num_enum = "0.7" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-sound/Cargo.toml b/vhost-device-sound/Cargo.toml index 12cdcf2..bd1f0bc 100644 --- a/vhost-device-sound/Cargo.toml +++ b/vhost-device-sound/Cargo.toml @@ -21,12 +21,12 @@ clap = { version = "4.5", features = ["derive"] } env_logger = "0.11" log = "0.4" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" # Make alsa and pipewire backends available only on gnu [target.'cfg(target_env = "gnu")'.dependencies] diff --git a/vhost-device-spi/Cargo.toml b/vhost-device-spi/Cargo.toml index e09bf72..bef594c 100644 --- a/vhost-device-spi/Cargo.toml +++ b/vhost-device-spi/Cargo.toml @@ -21,12 +21,12 @@ env_logger = "0.11" libc = "0.2" log = "0.4" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" bitflags = "2.9.1" [dev-dependencies] diff --git a/vhost-device-spi/src/linux_spi.rs b/vhost-device-spi/src/linux_spi.rs index c08c604..56cbad9 100644 --- a/vhost-device-spi/src/linux_spi.rs +++ b/vhost-device-spi/src/linux_spi.rs @@ -6,7 +6,7 @@ // SPDX-License-Identifier: Apache-2.0 or BSD-3-Clause use bitflags::bitflags; -use vmm_sys_util::{ioctl_ioc_nr, ioctl_ior_nr, ioctl_iow_nr}; +use vmm_sys_util::{ioctl_ior_nr, ioctl_iow_nr}; /// Describes a single SPI transfer #[derive(Debug)] diff --git a/vhost-device-template/Cargo.toml b/vhost-device-template/Cargo.toml index 7c642f3..29a0cef 100644 --- a/vhost-device-template/Cargo.toml +++ b/vhost-device-template/Cargo.toml @@ -21,12 +21,12 @@ env_logger = "0.11" libc = "0.2" log = "0.4" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-vsock/Cargo.toml b/vhost-device-vsock/Cargo.toml index cf77f95..221858c 100644 --- a/vhost-device-vsock/Cargo.toml +++ b/vhost-device-vsock/Cargo.toml @@ -21,13 +21,13 @@ env_logger = "0.11" epoll = "4.3.2" log = "0.4" thiserror = "2.0" -vhost = { version = "0.13", features = ["vhost-user-backend"] } -vhost-user-backend = "0.17" +vhost = { version = "0.14", features = ["vhost-user-backend"] } +vhost-user-backend = "0.18" virtio-bindings = "0.2.5" virtio-queue = "0.14" virtio-vsock = "0.8" vm-memory = "0.16.1" -vmm-sys-util = "0.12" +vmm-sys-util = "0.14" figment = { version = "0.10.19", features = ["yaml"] } vsock = { version = "0.5.0", optional = true } libc = { version = "0.2.172", optional = true }