diff --git a/Cargo.lock b/Cargo.lock index 67e3d32..103339d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -23,7 +23,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -48,9 +48,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.76" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cfg-if" @@ -60,14 +60,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.0.26" +version = "4.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2148adefda54e14492fb9bddcc600b4344c5d1a3123bd666dcb939c6f0e0e57e" +checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" dependencies = [ - "atty", "bitflags", "clap_derive", "clap_lex", + "is-terminal", "once_cell", "strsim", "termcolor", @@ -131,6 +131,27 @@ dependencies = [ "libc", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "fastrand" version = "1.8.0" @@ -262,6 +283,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "humantime" version = "2.1.0" @@ -277,6 +307,28 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes", + "rustix", + "windows-sys", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -292,22 +344,28 @@ checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libgpiod" version = "0.1.0" -source = "git+https://github.com/vireshk/libgpiod#9d8e18e2ad2d4bc4f5e315c01c9c03418ff47993" +source = "git+https://github.com/vireshk/libgpiod#52f16effabd5c6838d00f4d4ad054d5304e0d5d6" dependencies = [ "libc", "libgpiod-sys", "thiserror", - "vmm-sys-util 0.10.0", + "vmm-sys-util", ] [[package]] name = "libgpiod-sys" version = "0.1.0" -source = "git+https://github.com/vireshk/libgpiod#9d8e18e2ad2d4bc4f5e315c01c9c03418ff47993" +source = "git+https://github.com/vireshk/libgpiod#52f16effabd5c6838d00f4d4ad054d5304e0d5d6" dependencies = [ "cc", ] +[[package]] +name = "linux-raw-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" + [[package]] name = "lock_api" version = "0.4.9" @@ -339,7 +397,7 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -351,9 +409,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "os_str_bytes" -version = "6.4.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "parking_lot" @@ -367,9 +425,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" dependencies = [ "cfg-if", "libc", @@ -503,6 +561,20 @@ dependencies = [ "winapi", ] +[[package]] +name = "rustix" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -558,9 +630,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" dependencies = [ "proc-macro2", "quote", @@ -624,14 +696,14 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vhost" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79243657c76e5c90dcbf60187c842614f6dfc7123972c55bb3bcc446792aca93" +checksum = "c9b791c5b0717a0558888a4cf7240cea836f39a99cb342e12ce633dcaa078072" dependencies = [ "bitflags", "libc", "vm-memory", - "vmm-sys-util 0.10.0", + "vmm-sys-util", ] [[package]] @@ -649,7 +721,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util 0.11.0", + "vmm-sys-util", ] [[package]] @@ -666,7 +738,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util 0.11.0", + "vmm-sys-util", ] [[package]] @@ -686,14 +758,14 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util 0.11.0", + "vmm-sys-util", ] [[package]] name = "vhost-user-backend" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0fc7d5f8e2943cd9f2ecd58be3f2078add863a49573d14dd9d64e1ab26544c" +checksum = "9f237b91db4ac339d639fb43398b52d785fa51e3c7760ac9425148863c1f4303" dependencies = [ "libc", "log", @@ -701,7 +773,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util 0.10.0", + "vmm-sys-util", ] [[package]] @@ -722,7 +794,7 @@ dependencies = [ "virtio-queue", "virtio-vsock", "vm-memory", - "vmm-sys-util 0.11.0", + "vmm-sys-util", ] [[package]] @@ -733,47 +805,38 @@ checksum = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b" [[package]] name = "virtio-queue" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435dd49c7b38419729afd43675850c7b5dc4728f2fabd70c7a9079a331e4f8c6" +checksum = "19e927d93d54c365034fd7f31a5f458a1f540de4a37c52e892670dad9692173c" dependencies = [ "log", "virtio-bindings", "vm-memory", - "vmm-sys-util 0.10.0", + "vmm-sys-util", ] [[package]] name = "virtio-vsock" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876299fc0f59e07aadc77541ce49dd75f7548f4d095eac6f7104b805394029e8" +checksum = "b4d79c8b2052025a5afaba39ca09880f5ab4623fabfe0514e587d100579d504c" dependencies = [ + "virtio-bindings", "virtio-queue", "vm-memory", ] [[package]] name = "vm-memory" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583f213899e8a5eea23d9c507252d4bed5bc88f0ecbe0783262f80034630744b" +checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c" dependencies = [ "arc-swap", "libc", "winapi", ] -[[package]] -name = "vmm-sys-util" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08604d7be03eb26e33b3cee3ed4aef2bf550b305d1cca60e84da5d28d3790b62" -dependencies = [ - "bitflags", - "libc", -] - [[package]] name = "vmm-sys-util" version = "0.11.0" diff --git a/crates/gpio/Cargo.toml b/crates/gpio/Cargo.toml index 7b0cc42..edffd50 100644 --- a/crates/gpio/Cargo.toml +++ b/crates/gpio/Cargo.toml @@ -17,16 +17,16 @@ env_logger = "0.9" libc = "0.2" log = "0.4" thiserror = "1.0" -vhost = { version = "0.5", features = ["vhost-user-slave"] } -vhost-user-backend = "0.7" +vhost = { version = "0.6", features = ["vhost-user-slave"] } +vhost-user-backend = "0.8" virtio-bindings = "0.1" -virtio-queue = "0.6" -vm-memory = "0.9" +virtio-queue = "0.7" +vm-memory = "0.10" vmm-sys-util = "0.11" [target.'cfg(target_env = "gnu")'.dependencies] libgpiod = { git = "https://github.com/vireshk/libgpiod" } [dev-dependencies] -virtio-queue = { version = "0.6", features = ["test-utils"] } -vm-memory = { version = "0.9", features = ["backend-mmap", "backend-atomic"] } +virtio-queue = { version = "0.7", features = ["test-utils"] } +vm-memory = { version = "0.10", features = ["backend-mmap", "backend-atomic"] } diff --git a/crates/i2c/Cargo.toml b/crates/i2c/Cargo.toml index 9156d29..b8a6c43 100644 --- a/crates/i2c/Cargo.toml +++ b/crates/i2c/Cargo.toml @@ -17,13 +17,13 @@ env_logger = "0.9" libc = "0.2" log = "0.4" thiserror = "1.0" -vhost = { version = "0.5", features = ["vhost-user-slave"] } -vhost-user-backend = "0.7" +vhost = { version = "0.6", features = ["vhost-user-slave"] } +vhost-user-backend = "0.8" virtio-bindings = "0.1" -virtio-queue = "0.6" -vm-memory = "0.9" +virtio-queue = "0.7" +vm-memory = "0.10" vmm-sys-util = "0.11" [dev-dependencies] -virtio-queue = { version = "0.6", features = ["test-utils"] } -vm-memory = { version = "0.9", features = ["backend-mmap", "backend-atomic"] } +virtio-queue = { version = "0.7", features = ["test-utils"] } +vm-memory = { version = "0.10", features = ["backend-mmap", "backend-atomic"] } diff --git a/crates/rng/Cargo.toml b/crates/rng/Cargo.toml index efb9938..d8bbf54 100644 --- a/crates/rng/Cargo.toml +++ b/crates/rng/Cargo.toml @@ -18,13 +18,13 @@ log = "0.4" rand = "0.8.5" tempfile = "3.2" thiserror = "1.0" -vhost = { version = "0.5", features = ["vhost-user-slave"] } -vhost-user-backend = "0.7" +vhost = { version = "0.6", features = ["vhost-user-slave"] } +vhost-user-backend = "0.8" virtio-bindings = "0.1" -virtio-queue = "0.6" -vm-memory = "0.9" +virtio-queue = "0.7" +vm-memory = "0.10" vmm-sys-util = "0.11" [dev-dependencies] -virtio-queue = { version = "0.6", features = ["test-utils"] } -vm-memory = { version = "0.9", features = ["backend-mmap", "backend-atomic"] } +virtio-queue = { version = "0.7", features = ["test-utils"] } +vm-memory = { version = "0.10", features = ["backend-mmap", "backend-atomic"] } diff --git a/crates/vsock/Cargo.toml b/crates/vsock/Cargo.toml index fb3c8ae..d8c448a 100644 --- a/crates/vsock/Cargo.toml +++ b/crates/vsock/Cargo.toml @@ -17,14 +17,14 @@ epoll = "4.3.1" futures = { version = "0.3", features = ["thread-pool"] } log = "0.4" thiserror = "1.0" -vhost = { version = "0.5", features = ["vhost-user-slave"] } -vhost-user-backend = "0.7" +vhost = { version = "0.6", features = ["vhost-user-slave"] } +vhost-user-backend = "0.8" virtio-bindings = "0.1" -virtio-queue = "0.6" -virtio-vsock = "0.1" -vm-memory = "0.9" +virtio-queue = "0.7" +virtio-vsock = "0.2" +vm-memory = "0.10" vmm-sys-util = "0.11" [dev-dependencies] -virtio-queue = { version = "0.6", features = ["test-utils"] } +virtio-queue = { version = "0.7", features = ["test-utils"] } serial_test = "0.9"