diff --git a/Cargo.lock b/Cargo.lock index e3f9753c..2d085927 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -245,12 +245,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -376,7 +370,7 @@ dependencies = [ "document-features", "mio", "parking_lot", - "rustix 1.0.3", + "rustix 1.0.8", "signal-hook", "signal-hook-mio", "winapi", @@ -505,7 +499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -924,6 +918,21 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mesa3d_util" +version = "0.1.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c1f6486c29e39a4980ab0f454ab3127836b2768e054895260f2e10b3f7f8a6" +dependencies = [ + "cfg-if", + "libc", + "log", + "remain", + "rustix 1.0.8", + "thiserror 1.0.69", + "zerocopy", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1010,19 +1019,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.9.3", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.29.0" @@ -1031,7 +1027,7 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.9.3", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", "memoffset", ] @@ -1044,7 +1040,7 @@ checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" dependencies = [ "bitflags 2.9.3", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", ] @@ -1173,7 +1169,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.25", + "zerocopy", ] [[package]] @@ -1397,20 +1393,20 @@ dependencies = [ "errno 0.3.10", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "rustix" -version = "1.0.3" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96" +checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" dependencies = [ "bitflags 2.9.3", "errno 0.3.10", "libc", "linux-raw-sys 0.9.3", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -1433,22 +1429,21 @@ dependencies = [ [[package]] name = "rutabaga_gfx" -version = "0.1.5" +version = "0.1.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acd02427a8910f1913170f0452fd8367ba4f530fa3c479bf247b7c988934dd6" +checksum = "0dc6ab0c0556228daadfe367fcfd18b4d43d782f4baf968273652bd2c02e7ea8" dependencies = [ "anyhow", "cfg-if", "libc", "log", - "nix 0.28.0", + "mesa3d_util", "pkg-config", "remain", "serde", "serde_json", "thiserror 1.0.69", - "winapi", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -1704,7 +1699,7 @@ dependencies = [ "fastrand", "getrandom", "once_cell", - "rustix 1.0.3", + "rustix 1.0.8", "windows-sys 0.60.2", ] @@ -1927,7 +1922,7 @@ dependencies = [ "libc", "uuid", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -1946,7 +1941,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -1967,7 +1962,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -1986,7 +1981,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2009,7 +2004,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2027,7 +2022,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2050,7 +2045,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2071,7 +2066,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2089,7 +2084,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2109,7 +2104,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2131,7 +2126,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2150,7 +2145,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2168,7 +2163,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -2192,7 +2187,7 @@ dependencies = [ "virtio-queue", "virtio-vsock", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", "vsock", ] @@ -2208,7 +2203,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2226,7 +2221,7 @@ dependencies = [ "log", "virtio-bindings", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -2250,7 +2245,7 @@ dependencies = [ "bitflags 2.9.3", "libc", "thiserror 1.0.69", - "vmm-sys-util", + "vmm-sys-util 0.14.0", "winapi", ] @@ -2264,6 +2259,16 @@ dependencies = [ "libc", ] +[[package]] +name = "vmm-sys-util" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "506c62fdf617a5176827c2f9afbcf1be155b03a9b4bf9617a60dbc07e3a1642f" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "vsock" version = "0.5.1" @@ -2591,34 +2596,13 @@ dependencies = [ "winapi", ] -[[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 2.0.87", + "zerocopy-derive", ] [[package]] diff --git a/staging/Cargo.lock b/staging/Cargo.lock index f30ec4ba..3ac26e36 100644 --- a/staging/Cargo.lock +++ b/staging/Cargo.lock @@ -791,7 +791,7 @@ dependencies = [ "libc", "uuid", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -816,7 +816,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.15.0", ] [[package]] @@ -831,7 +831,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -849,7 +849,7 @@ dependencies = [ "log", "virtio-bindings", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.14.0", ] [[package]] @@ -862,7 +862,7 @@ dependencies = [ "bitflags 2.9.3", "libc", "thiserror 1.0.69", - "vmm-sys-util", + "vmm-sys-util 0.14.0", "winapi", ] @@ -876,6 +876,16 @@ dependencies = [ "libc", ] +[[package]] +name = "vmm-sys-util" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "506c62fdf617a5176827c2f9afbcf1be155b03a9b4bf9617a60dbc07e3a1642f" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "wasi" version = "0.14.3+wasi-0.2.4" diff --git a/staging/vhost-device-video/Cargo.toml b/staging/vhost-device-video/Cargo.toml index a3cc5eab..a4d3c63c 100644 --- a/staging/vhost-device-video/Cargo.toml +++ b/staging/vhost-device-video/Cargo.toml @@ -31,7 +31,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.0" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" 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 dc0ce253..f1057454 100644 --- a/vhost-device-can/Cargo.toml +++ b/vhost-device-can/Cargo.toml @@ -26,7 +26,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-console/Cargo.toml b/vhost-device-console/Cargo.toml index 1efe6deb..116c5175 100644 --- a/vhost-device-console/Cargo.toml +++ b/vhost-device-console/Cargo.toml @@ -28,7 +28,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-gpio/Cargo.toml b/vhost-device-gpio/Cargo.toml index e16ad133..4b3da04e 100644 --- a/vhost-device-gpio/Cargo.toml +++ b/vhost-device-gpio/Cargo.toml @@ -26,7 +26,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" [target.'cfg(target_env = "gnu")'.dependencies] libgpiod = "0.2" diff --git a/vhost-device-gpu/Cargo.toml b/vhost-device-gpu/Cargo.toml index e032203a..87f385c8 100644 --- a/vhost-device-gpu/Cargo.toml +++ b/vhost-device-gpu/Cargo.toml @@ -32,7 +32,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16.0" vm-memory = "0.16.1" -vmm-sys-util = "0.14.0" +vmm-sys-util = "0.15.0" bitflags = "2.9.3" [dev-dependencies] diff --git a/vhost-device-i2c/Cargo.toml b/vhost-device-i2c/Cargo.toml index 1151a814..e76dbbe7 100644 --- a/vhost-device-i2c/Cargo.toml +++ b/vhost-device-i2c/Cargo.toml @@ -25,7 +25,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-input/Cargo.toml b/vhost-device-input/Cargo.toml index b9d0801f..74931fd2 100644 --- a/vhost-device-input/Cargo.toml +++ b/vhost-device-input/Cargo.toml @@ -27,7 +27,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" evdev = "0.13" nix = { version = "0.30", features = ["ioctl"] } diff --git a/vhost-device-rng/Cargo.toml b/vhost-device-rng/Cargo.toml index d40732d6..e01fc80d 100644 --- a/vhost-device-rng/Cargo.toml +++ b/vhost-device-rng/Cargo.toml @@ -26,7 +26,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-scmi/Cargo.toml b/vhost-device-scmi/Cargo.toml index 83de8003..80ac3bde 100644 --- a/vhost-device-scmi/Cargo.toml +++ b/vhost-device-scmi/Cargo.toml @@ -20,7 +20,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-scsi/Cargo.toml b/vhost-device-scsi/Cargo.toml index b4711a6e..b87b2995 100644 --- a/vhost-device-scsi/Cargo.toml +++ b/vhost-device-scsi/Cargo.toml @@ -26,7 +26,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-sound/Cargo.toml b/vhost-device-sound/Cargo.toml index ad886650..3e815329 100644 --- a/vhost-device-sound/Cargo.toml +++ b/vhost-device-sound/Cargo.toml @@ -26,7 +26,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" # 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 96a106ca..558e1017 100644 --- a/vhost-device-spi/Cargo.toml +++ b/vhost-device-spi/Cargo.toml @@ -26,7 +26,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" bitflags = "2.9.3" [dev-dependencies] diff --git a/vhost-device-template/Cargo.toml b/vhost-device-template/Cargo.toml index 1453572f..dc381f53 100644 --- a/vhost-device-template/Cargo.toml +++ b/vhost-device-template/Cargo.toml @@ -26,7 +26,7 @@ vhost-user-backend = "0.20" virtio-bindings = "0.2.5" virtio-queue = "0.16" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" [dev-dependencies] assert_matches = "1.5" diff --git a/vhost-device-vsock/Cargo.toml b/vhost-device-vsock/Cargo.toml index 3a178f6d..11fcc11c 100644 --- a/vhost-device-vsock/Cargo.toml +++ b/vhost-device-vsock/Cargo.toml @@ -27,7 +27,7 @@ virtio-bindings = "0.2.5" virtio-queue = "0.16" virtio-vsock = "0.10" vm-memory = "0.16.1" -vmm-sys-util = "0.14" +vmm-sys-util = "0.15" figment = { version = "0.10.19", features = ["yaml"] } vsock = { version = "0.5.0", optional = true } libc = { version = "0.2.175", optional = true }