diff --git a/Cargo.lock b/Cargo.lock index 855370d7b..91efb9bbe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,9 +11,9 @@ dependencies = [ [[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", ] @@ -59,17 +59,6 @@ dependencies = [ "vmm-sys-util", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -118,9 +107,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cfg-if" @@ -130,13 +119,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.0.18" +version = "4.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b" +checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" dependencies = [ - "atty", "bitflags", "clap_lex", + "is-terminal", "once_cell", "strsim", "termcolor", @@ -276,12 +265,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -365,9 +354,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -382,9 +371,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hermit-abi" -version = "0.1.20" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a30908dbce072eca83216eab939d2290080e00ca71611b96a09e5cdce5f3fa" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] @@ -444,15 +433,19 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.4" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e481ccbe3dea62107216d0d1138bb8ad8e5e5c43009a098bd1990272c497b0" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys", +] [[package]] name = "io-uring" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d78c9f2db2a9800dfd15c69543896dae2135112dde0d1944442e83da8ce23a" +checksum = "7ba34abb5175052fc1a2227a10d2275b7386c9990167de9786c0b88d8b062330" dependencies = [ "bitflags", "libc", @@ -467,6 +460,18 @@ dependencies = [ "serde", ] +[[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + [[package]] name = "itoa" version = "1.0.4" @@ -475,8 +480,8 @@ checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "kvm-bindings" -version = "0.5.0" -source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.5.0-tdx#52e56d0e8ef0f6ea32fc0492e6a175b73617a49f" +version = "0.6.0" +source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.6.0-tdx#7d9ffb47e5b9b1989577258800a0f57c93f1445f" dependencies = [ "serde", "serde_derive", @@ -485,8 +490,9 @@ dependencies = [ [[package]] name = "kvm-ioctls" -version = "0.11.0" -source = "git+https://github.com/rust-vmm/kvm-ioctls?branch=main#e6739aeebcc56dfea62216b2cc4cddd13d0a1182" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" dependencies = [ "kvm-bindings", "libc", @@ -501,9 +507,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libssh2-sys" @@ -533,18 +539,18 @@ dependencies = [ [[package]] name = "linux-loader" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8242360c7d79a7713a28043c994b815e9820b0e97e44b228ec9bd913c16bdfe" +checksum = "b9259ddbfbb52cc918f6bbc60390004ddd0228cf1d85f402009ff2b3d95de83f" dependencies = [ "vm-memory", ] [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" [[package]] name = "lock_api" @@ -580,7 +586,7 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "micro_http" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#863b0370ba7e57f7df5b908ada9e5b44809ccae9" +source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#4b18a043e997da5b5f679e3defc279fec908753e" dependencies = [ "libc", "vmm-sys-util", @@ -589,7 +595,7 @@ dependencies = [ [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#1a9ca01801e78f8ddc2630660cbab3bc3300e39e" +source = "git+https://github.com/rust-vmm/mshv?branch=main#10d0c5208cc41a3958e0fd31fabf2c88b18a97b5" dependencies = [ "libc", "serde", @@ -601,7 +607,7 @@ dependencies = [ [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#1a9ca01801e78f8ddc2630660cbab3bc3300e39e" +source = "git+https://github.com/rust-vmm/mshv?branch=main#10d0c5208cc41a3958e0fd31fabf2c88b18a97b5" dependencies = [ "libc", "mshv-bindings", @@ -672,9 +678,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.77" +version = "0.9.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" dependencies = [ "autocfg", "cc", @@ -690,9 +696,9 @@ version = "0.1.0" [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "parking_lot" @@ -707,9 +713,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -721,9 +727,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b" [[package]] name = "pci" @@ -973,9 +979,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -984,9 +990,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remain" @@ -1010,16 +1016,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.35.12" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985947f9b6423159c4726323f373be0a21bdb514c5af06a849cb3d2dce2d01e8" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.36.1", + "windows-sys", ] [[package]] @@ -1051,18 +1057,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ "proc-macro2", "quote", @@ -1071,9 +1077,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa", "ryu", @@ -1082,9 +1088,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7" +checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" dependencies = [ "serde", "serde_with_macros", @@ -1092,9 +1098,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93" +checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa" dependencies = [ "darling", "proc-macro2", @@ -1163,9 +1169,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2", "quote", @@ -1183,12 +1189,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" +checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" dependencies = [ "rustix", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -1257,9 +1263,9 @@ checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "uuid" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ "getrandom", ] @@ -1272,9 +1278,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "versionize" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7429cf68de8f091b667d27323ed323afd39584a56d533995b12ddd748e5e6ca9" +checksum = "d6e2495726cf917e7ba7ec8bf0f0fceab543dd38d0a4195ed6bef331e38a290f" dependencies = [ "bincode", "crc64", @@ -1299,17 +1305,16 @@ dependencies = [ [[package]] name = "vfio-bindings" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43449b404c488f70507dca193debd4bea361fe8089869b947adc19720e464bce" +version = "0.4.0" +source = "git+https://github.com/rust-vmm/vfio?branch=main#7ef33f6759ae6d37a54cd66f749aa47c1c81509c" dependencies = [ "vmm-sys-util", ] [[package]] name = "vfio-ioctls" -version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#ad86d843a22fbf98efa9c02a5689fe2bf17ed54a" +version = "0.2.0" +source = "git+https://github.com/rust-vmm/vfio?branch=main#7ef33f6759ae6d37a54cd66f749aa47c1c81509c" dependencies = [ "byteorder", "kvm-bindings", @@ -1354,8 +1359,9 @@ dependencies = [ [[package]] name = "vhost" -version = "0.5.0" -source = "git+https://github.com/rust-vmm/vhost?branch=main#f87156b77662af63b9fc9f116a213dd69e16007b" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9b791c5b0717a0558888a4cf7240cea836f39a99cb342e12ce633dcaa078072" dependencies = [ "bitflags", "libc", @@ -1365,9 +1371,9 @@ dependencies = [ [[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", @@ -1459,9 +1465,9 @@ dependencies = [ [[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", @@ -1494,13 +1500,13 @@ dependencies = [ [[package]] name = "vm-fdt" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#d9425907389e1fbbfb803017d01824a4bb16e6a8" +source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#c5a99ab71b130435927d19b50c85fcd5ce904a8c" [[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", @@ -1580,9 +1586,9 @@ dependencies = [ [[package]] name = "vmm-sys-util" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08604d7be03eb26e33b3cee3ed4aef2bf550b305d1cca60e84da5d28d3790b62" +checksum = "cc06a16ee8ebf0d9269aed304030b0d20a866b8b3dd3d4ce532596ac567a0d24" dependencies = [ "bitflags", "libc", @@ -1636,19 +1642,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -1656,12 +1649,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc", ] [[package]] @@ -1670,48 +1663,24 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.0" @@ -1724,12 +1693,6 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.0" diff --git a/Cargo.toml b/Cargo.toml index 3e5eb7780..91b038e10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,38 +20,36 @@ opt-level = "s" [dependencies] anyhow = "1.0.66" api_client = { path = "api_client" } -clap = { version = "4.0.18", features = ["wrap_help","cargo","string"] } +clap = { version = "4.0.29", features = ["wrap_help","cargo","string"] } epoll = "4.3.1" event_monitor = { path = "event_monitor" } hypervisor = { path = "hypervisor" } -libc = "0.2.137" +libc = "0.2.138" log = { version = "0.4.17", features = ["std"] } option_parser = { path = "option_parser" } seccompiler = "0.3.0" -serde_json = "1.0.87" +serde_json = "1.0.89" signal-hook = "0.3.14" thiserror = "1.0.37" tpm = { path = "tpm"} tracer = { path = "tracer" } vmm = { path = "vmm" } -vmm-sys-util = "0.10.0" -vm-memory = "0.9.0" +vmm-sys-util = "0.11.0" +vm-memory = "0.10.0" [build-dependencies] -clap = { version = "4.0.18", features = ["cargo"] } +clap = { version = "4.0.29", features = ["cargo"] } # List of patched crates [patch.crates-io] -kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.5.0-tdx" } -kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "main" } +kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx" } versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" } -vhost = { git = "https://github.com/rust-vmm/vhost", branch = "main" } [dev-dependencies] dirs = "4.0.0" net_util = { path = "net_util" } once_cell = "1.16.0" -serde_json = "1.0.87" +serde_json = "1.0.89" test_infra = { path = "test_infra" } wait-timeout = "0.2.0" diff --git a/acpi_tables/Cargo.toml b/acpi_tables/Cargo.toml index 0b404a892..d0968d7fe 100644 --- a/acpi_tables/Cargo.toml +++ b/acpi_tables/Cargo.toml @@ -5,4 +5,4 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2021" [dependencies] -vm-memory = "0.9.0" +vm-memory = "0.10.0" diff --git a/api_client/Cargo.toml b/api_client/Cargo.toml index fbd48047d..5be434702 100644 --- a/api_client/Cargo.toml +++ b/api_client/Cargo.toml @@ -5,4 +5,4 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2021" [dependencies] -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" diff --git a/arch/Cargo.toml b/arch/Cargo.toml index 6bfb9ff27..bca63fbbd 100644 --- a/arch/Cargo.toml +++ b/arch/Cargo.toml @@ -12,17 +12,17 @@ tdx = [] anyhow = "1.0.66" byteorder = "1.4.3" hypervisor = { path = "../hypervisor" } -libc = "0.2.137" -linux-loader = { version = "0.7.0", features = ["elf", "bzimage", "pe"] } +libc = "0.2.138" +linux-loader = { version = "0.8.1", features = ["elf", "bzimage", "pe"] } log = "0.4.17" -serde = { version = "1.0.147", features = ["rc", "derive"] } +serde = { version = "1.0.150", features = ["rc", "derive"] } thiserror = "1.0.37" -uuid = "1.2.1" -versionize = "0.1.6" +uuid = "1.2.2" +versionize = "0.1.9" versionize_derive = "0.1.4" -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-bitmap"] } +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-bitmap"] } vm-migration = { path = "../vm-migration" } -vmm-sys-util = { version = "0.10.0", features = ["with-serde"] } +vmm-sys-util = { version = "0.11.0", features = ["with-serde"] } [target.'cfg(target_arch = "aarch64")'.dependencies] fdt_parser = { version = "0.1.4", package = "fdt" } diff --git a/block_util/Cargo.toml b/block_util/Cargo.toml index 9895a1ba5..1bfe621a2 100644 --- a/block_util/Cargo.toml +++ b/block_util/Cargo.toml @@ -8,17 +8,17 @@ edition = "2021" default = [] [dependencies] -io-uring = "0.5.8" -libc = "0.2.137" +io-uring = "0.5.9" +libc = "0.2.138" log = "0.4.17" qcow = { path = "../qcow" } thiserror = "1.0.37" -versionize = "0.1.6" +versionize = "0.1.9" versionize_derive = "0.1.4" vhdx = { path = "../vhdx" } virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] } -virtio-queue = "0.6.1" -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +virtio-queue = "0.7.0" +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" diff --git a/devices/Cargo.toml b/devices/Cargo.toml index 3f7a7cd9a..a38e89461 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -11,17 +11,17 @@ arch = { path = "../arch" } bitflags = "1.3.2" byteorder = "1.4.3" hypervisor = { path = "../hypervisor" } -libc = "0.2.137" +libc = "0.2.138" log = "0.4.17" -phf = { version = "0.11", features = ["macros"] } -thiserror = "1.0.30" +phf = { version = "0.11.1", features = ["macros"] } +thiserror = "1.0.37" tpm = { path = "../tpm" } -versionize = "0.1.6" +versionize = "0.1.9" versionize_derive = "0.1.4" vm-device = { path = "../vm-device" } -vm-memory = "0.9.0" +vm-memory = "0.10.0" vm-migration = { path = "../vm-migration" } -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" [target.'cfg(target_arch = "aarch64")'.dependencies] arch = { path = "../arch" } diff --git a/event_monitor/Cargo.toml b/event_monitor/Cargo.toml index fe7b03ad6..15ea36c89 100644 --- a/event_monitor/Cargo.toml +++ b/event_monitor/Cargo.toml @@ -5,6 +5,6 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2021" [dependencies] -libc = "0.2.137" -serde = { version = "1.0.147", features = ["rc", "derive"] } -serde_json = "1.0.87" +libc = "0.2.138" +serde = { version = "1.0.150", features = ["rc", "derive"] } +serde_json = "1.0.89" diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index caa45f52c..1c2bf0ba1 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -56,17 +56,6 @@ dependencies = [ "vmm-sys-util", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - [[package]] name = "bincode" version = "1.3.3" @@ -109,9 +98,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" dependencies = [ "jobserver", ] @@ -124,13 +113,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.0.18" +version = "4.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b" +checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" dependencies = [ - "atty", "bitflags", "clap_lex", + "is-terminal", "once_cell", "strsim", "termcolor", @@ -148,7 +137,7 @@ dependencies = [ [[package]] name = "cloud-hypervisor" -version = "27.0.0" +version = "28.0.0" dependencies = [ "anyhow", "api_client", @@ -332,9 +321,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.20" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a30908dbce072eca83216eab939d2290080e00ca71611b96a09e5cdce5f3fa" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] @@ -376,9 +365,13 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "io-lifetimes" -version = "0.7.5" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys", +] [[package]] name = "io-uring" @@ -390,6 +383,18 @@ dependencies = [ "libc", ] +[[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + [[package]] name = "itoa" version = "1.0.4" @@ -407,8 +412,8 @@ dependencies = [ [[package]] name = "kvm-bindings" -version = "0.5.0" -source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.5.0-tdx#52e56d0e8ef0f6ea32fc0492e6a175b73617a49f" +version = "0.6.0" +source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.6.0-tdx#7d9ffb47e5b9b1989577258800a0f57c93f1445f" dependencies = [ "serde", "serde_derive", @@ -417,8 +422,9 @@ dependencies = [ [[package]] name = "kvm-ioctls" -version = "0.11.0" -source = "git+https://github.com/rust-vmm/kvm-ioctls?branch=main#1e03e29cdfbb0cb108a98de7a78045a5a517f18e" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4" dependencies = [ "kvm-bindings", "libc", @@ -433,9 +439,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libfuzzer-sys" @@ -450,18 +456,18 @@ dependencies = [ [[package]] name = "linux-loader" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8242360c7d79a7713a28043c994b815e9820b0e97e44b228ec9bd913c16bdfe" +checksum = "b9259ddbfbb52cc918f6bbc60390004ddd0228cf1d85f402009ff2b3d95de83f" dependencies = [ "vm-memory", ] [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" [[package]] name = "log" @@ -475,7 +481,7 @@ dependencies = [ [[package]] name = "micro_http" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#863b0370ba7e57f7df5b908ada9e5b44809ccae9" +source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#4b18a043e997da5b5f679e3defc279fec908753e" dependencies = [ "libc", "vmm-sys-util", @@ -521,9 +527,9 @@ version = "0.1.0" [[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 = "pci" @@ -665,9 +671,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.35.13" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" dependencies = [ "bitflags", "errno", @@ -700,18 +706,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ "proc-macro2", "quote", @@ -720,9 +726,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa", "ryu", @@ -731,9 +737,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7" +checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" dependencies = [ "serde", "serde_with_macros", @@ -741,9 +747,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93" +checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa" dependencies = [ "darling", "proc-macro2", @@ -794,9 +800,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2", "quote", @@ -814,9 +820,9 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" +checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" dependencies = [ "rustix", "windows-sys", @@ -882,9 +888,9 @@ dependencies = [ [[package]] name = "versionize" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7429cf68de8f091b667d27323ed323afd39584a56d533995b12ddd748e5e6ca9" +checksum = "d6e2495726cf917e7ba7ec8bf0f0fceab543dd38d0a4195ed6bef331e38a290f" dependencies = [ "bincode", "crc64", @@ -909,17 +915,16 @@ dependencies = [ [[package]] name = "vfio-bindings" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43449b404c488f70507dca193debd4bea361fe8089869b947adc19720e464bce" +version = "0.4.0" +source = "git+https://github.com/rust-vmm/vfio?branch=main#7ef33f6759ae6d37a54cd66f749aa47c1c81509c" dependencies = [ "vmm-sys-util", ] [[package]] name = "vfio-ioctls" -version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#bf7c9b997b4ad0ca1ab4bfe96dc1b10d4bc5be24" +version = "0.2.0" +source = "git+https://github.com/rust-vmm/vfio?branch=main#7ef33f6759ae6d37a54cd66f749aa47c1c81509c" dependencies = [ "byteorder", "kvm-bindings", @@ -962,8 +967,9 @@ dependencies = [ [[package]] name = "vhost" -version = "0.5.0" -source = "git+https://github.com/rust-vmm/vhost?branch=main#f87156b77662af63b9fc9f116a213dd69e16007b" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9b791c5b0717a0558888a4cf7240cea836f39a99cb342e12ce633dcaa078072" dependencies = [ "bitflags", "libc", @@ -1014,9 +1020,9 @@ dependencies = [ [[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", @@ -1048,14 +1054,14 @@ dependencies = [ [[package]] name = "vm-fdt" -version = "0.1.0" -source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#720e48e435b791ec6cbe8d2b229448b71dcb1ab9" +version = "0.2.0" +source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#c5a99ab71b130435927d19b50c85fcd5ce904a8c" [[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", @@ -1133,9 +1139,9 @@ dependencies = [ [[package]] name = "vmm-sys-util" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08604d7be03eb26e33b3cee3ed4aef2bf550b305d1cca60e84da5d28d3790b62" +checksum = "cc06a16ee8ebf0d9269aed304030b0d20a866b8b3dd3d4ce532596ac567a0d24" dependencies = [ "bitflags", "libc", diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 2afeb70e8..9b6142a08 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -20,10 +20,10 @@ qcow = { path = "../qcow" } seccompiler = "0.3.0" vhdx = { path = "../vhdx" } virtio-devices = { path = "../virtio-devices" } -virtio-queue = "0.6.1" +virtio-queue = "0.7.0" vmm = { path = "../vmm" } -vmm-sys-util = "0.10.0" -vm-memory = "0.9.0" +vmm-sys-util = "0.11.0" +vm-memory = "0.10.0" vm-device = { path = "../vm-device" } vm-virtio = { path = "../vm-virtio" } @@ -31,10 +31,8 @@ vm-virtio = { path = "../vm-virtio" } path = ".." [patch.crates-io] -kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.5.0-tdx" } -kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "main" } +kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx" } versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" } -vhost = { git = "https://github.com/rust-vmm/vhost", branch = "main" } # Prevent this from interfering with workspaces [workspace] diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index 3f8a14290..ef635402b 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -14,17 +14,17 @@ tdx = [] anyhow = "1.0.66" byteorder = "1.4.3" thiserror = "1.0.37" -libc = "0.2.137" +libc = "0.2.138" log = "0.4.17" -kvm-ioctls = { version = "0.11.0", optional = true } -kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.5.0-tdx", features = ["with-serde", "fam-wrappers"], optional = true } +kvm-ioctls = { version = "0.12.0", optional = true } +kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx", features = ["with-serde", "fam-wrappers"], optional = true } mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional = true } mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional = true} -serde = { version = "1.0.147", features = ["rc", "derive"] } -serde_with = { version = "2.0.1", default-features = false, features = ["macros"] } +serde = { version = "1.0.150", features = ["rc", "derive"] } +serde_with = { version = "2.1.0", default-features = false, features = ["macros"] } vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic"] } -vmm-sys-util = { version = "0.10.0", features = ["with-serde"] } +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] } +vmm-sys-util = { version = "0.11.0", features = ["with-serde"] } [target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86] version = "1.17.0" @@ -32,4 +32,4 @@ default-features = false features = ["std", "decoder", "op_code_info", "instr_info", "fast_fmt"] [dev-dependencies] -env_logger = "0.9.3" +env_logger = "0.10.0" diff --git a/net_gen/Cargo.toml b/net_gen/Cargo.toml index 206279981..263135807 100644 --- a/net_gen/Cargo.toml +++ b/net_gen/Cargo.toml @@ -5,4 +5,4 @@ authors = ["The Chromium OS Authors"] edition = "2021" [dependencies] -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index 5b286157f..cfdb92273 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -6,23 +6,23 @@ edition = "2021" [dependencies] epoll = "4.3.1" -getrandom = "0.2.7" -libc = "0.2.137" +getrandom = "0.2.8" +libc = "0.2.138" log = "0.4.17" net_gen = { path = "../net_gen" } rate_limiter = { path = "../rate_limiter" } -serde = "1.0.147" +serde = "1.0.150" thiserror = "1.0.37" -versionize = "0.1.6" +versionize = "0.1.9" versionize_derive = "0.1.4" virtio-bindings = "0.1.0" -virtio-queue = "0.6.1" -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +virtio-queue = "0.7.0" +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" [dev-dependencies] once_cell = "1.16.0" pnet = "0.31.0" pnet_datalink = "0.31.0" -serde_json = "1.0.87" +serde_json = "1.0.89" diff --git a/pci/Cargo.toml b/pci/Cargo.toml index 30e7b55d7..970f1c315 100644 --- a/pci/Cargo.toml +++ b/pci/Cargo.toml @@ -13,20 +13,17 @@ mshv = ["vfio-ioctls/mshv"] anyhow = "1.0.66" byteorder = "1.4.3" hypervisor = { path = "../hypervisor" } +vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = ["fam-wrappers"] } vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } vfio_user = { path = "../vfio_user" } -vmm-sys-util = "0.10.0" -libc = "0.2.137" +vmm-sys-util = "0.11.0" +libc = "0.2.138" log = "0.4.17" -serde = { version = "1.0.147", features = ["derive"] } +serde = { version = "1.0.150", features = ["derive"] } thiserror = "1.0.37" -versionize = "0.1.6" +versionize = "0.1.9" versionize_derive = "0.1.4" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = "0.9.0" -vm-migration = { path = "../vm-migration" } - -[dependencies.vfio-bindings] -version = "0.3.1" -features = ["fam-wrappers"] +vm-memory = "0.10.0" +vm-migration = { path = "../vm-migration" } \ No newline at end of file diff --git a/performance-metrics/Cargo.toml b/performance-metrics/Cargo.toml index 8a88c8be6..06122b52e 100644 --- a/performance-metrics/Cargo.toml +++ b/performance-metrics/Cargo.toml @@ -6,13 +6,13 @@ edition = "2021" build = "build.rs" [dependencies] -clap = { version = "4.0.18", features = ["wrap_help","cargo"] } +clap = { version = "4.0.29", features = ["wrap_help","cargo"] } dirs = "4.0.0" -serde = { version = "1.0.147", features = ["rc", "derive"] } -serde_json = "1.0.87" +serde = { version = "1.0.150", features = ["rc", "derive"] } +serde_json = "1.0.89" test_infra = { path = "../test_infra" } thiserror = "1.0.37" wait-timeout = "0.2.0" [build-dependencies] -clap = { version = "4.0.18", features = ["cargo"] } +clap = { version = "4.0.29", features = ["cargo"] } diff --git a/qcow/Cargo.toml b/qcow/Cargo.toml index 99d157471..026472a64 100644 --- a/qcow/Cargo.toml +++ b/qcow/Cargo.toml @@ -10,7 +10,7 @@ path = "src/qcow.rs" [dependencies] byteorder = "1.4.3" -libc = "0.2.137" +libc = "0.2.138" log = "0.4.17" remain = "0.2.5" -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" diff --git a/rate_limiter/Cargo.toml b/rate_limiter/Cargo.toml index 04926bfa8..930d2183c 100644 --- a/rate_limiter/Cargo.toml +++ b/rate_limiter/Cargo.toml @@ -4,6 +4,6 @@ version = "0.1.0" edition = "2021" [dependencies] -libc = "0.2.137" +libc = "0.2.138" log = "0.4.17" -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" diff --git a/test_infra/Cargo.toml b/test_infra/Cargo.toml index b065f4952..01ee95fa7 100644 --- a/test_infra/Cargo.toml +++ b/test_infra/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" [dependencies] dirs = "4.0.0" epoll = "4.3.1" -libc = "0.2.137" +libc = "0.2.138" once_cell = "1.16.0" -serde = { version = "1.0.147", features = ["rc", "derive"] } -serde_json = "1.0.87" +serde = { version = "1.0.150", features = ["rc", "derive"] } +serde_json = "1.0.89" ssh2 = { version = "0.9.3", features = ["vendored-openssl"] } -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" wait-timeout = "0.2.0" diff --git a/tpm/Cargo.toml b/tpm/Cargo.toml index 721535348..b915deee8 100644 --- a/tpm/Cargo.toml +++ b/tpm/Cargo.toml @@ -6,9 +6,9 @@ license = "Apache-2.0" version = "0.1.0" [dependencies] -anyhow = "1.0.56" +anyhow = "1.0.66" byteorder = "1.4.3" -libc = "0.2.133" -log = "0.4.14" -thiserror = "1.0.30" -vmm-sys-util = "0.10.0" +libc = "0.2.138" +log = "0.4.17" +thiserror = "1.0.37" +vmm-sys-util = "0.11.0" diff --git a/tracer/Cargo.toml b/tracer/Cargo.toml index 7c68b1737..80ab3b26a 100644 --- a/tracer/Cargo.toml +++ b/tracer/Cargo.toml @@ -5,11 +5,11 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2021" [dependencies] -libc = "0.2.137" +libc = "0.2.138" log = "0.4.17" once_cell = "1.16.0" -serde = { version = "1.0.147", features = ["rc", "derive"] } -serde_json = "1.0.87" +serde = { version = "1.0.150", features = ["rc", "derive"] } +serde_json = "1.0.89" [features] tracing = [] diff --git a/vfio_user/Cargo.toml b/vfio_user/Cargo.toml index 259cca97d..7d8ab0c0f 100644 --- a/vfio_user/Cargo.toml +++ b/vfio_user/Cargo.toml @@ -5,15 +5,13 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2021" [dependencies] -libc = "0.2.137" +libc = "0.2.138" log = "0.4.17" -serde = { version = "1.0.147", features = ["rc"] } -serde_derive = "1.0.142" -serde_json = "1.0.87" +serde = { version = "1.0.150", features = ["rc"] } +serde_derive = "1.0.150" +serde_json = "1.0.89" thiserror = "1.0.37" -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic"] } -vmm-sys-util = "0.10.0" +vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = ["fam-wrappers"] } +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] } +vmm-sys-util = "0.11.0" -[dependencies.vfio-bindings] -version = "0.3.1" -features = ["fam-wrappers"] diff --git a/vhdx/Cargo.toml b/vhdx/Cargo.toml index 77c18d340..fa1d8c0bb 100644 --- a/vhdx/Cargo.toml +++ b/vhdx/Cargo.toml @@ -8,8 +8,8 @@ license = "Apache-2.0" [dependencies] byteorder = "1.4.3" crc32c = "0.6.3" -libc = "0.2.137" +libc = "0.2.138" log = "0.4.17" remain = "0.2.5" thiserror = "1.0.37" -uuid = { version = "1.2.1", features = ["v4"] } +uuid = { version = "1.2.2", features = ["v4"] } diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index f2265d185..f90307a09 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -6,19 +6,19 @@ edition = "2021" [dependencies] block_util = { path = "../block_util" } -clap = { version = "4.0.18", features = ["wrap_help","cargo"] } -env_logger = "0.9.3" +clap = { version = "4.0.29", features = ["wrap_help","cargo"] } +env_logger = "0.10.0" epoll = "4.3.1" -libc = "0.2.137" +libc = "0.2.138" log = "0.4.17" option_parser = { path = "../option_parser" } qcow = { path = "../qcow" } -vhost = { version = "0.5.0", features = ["vhost-user-slave"] } -vhost-user-backend = "0.7.0" +vhost = { version = "0.6.0", features = ["vhost-user-slave"] } +vhost-user-backend = "0.8.0" virtio-bindings = "0.1.0" -virtio-queue = "0.6.1" -vm-memory = "0.9.0" -vmm-sys-util = "0.10.0" +virtio-queue = "0.7.0" +vm-memory = "0.10.0" +vmm-sys-util = "0.11.0" [build-dependencies] -clap = { version = "4.0.18", features = ["cargo"] } +clap = { version = "4.0.29", features = ["cargo"] } diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index 7edf2305f..39e9536ef 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -5,18 +5,18 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2021" [dependencies] -clap = { version = "4.0.18", features = ["wrap_help","cargo"] } -env_logger = "0.9.3" +clap = { version = "4.0.29", features = ["wrap_help","cargo"] } +env_logger = "0.10.0" epoll = "4.3.1" -libc = "0.2.137" +libc = "0.2.138" log = "0.4.17" net_util = { path = "../net_util" } option_parser = { path = "../option_parser" } -vhost = { version = "0.5.0", features = ["vhost-user-slave"] } -vhost-user-backend = "0.7.0" +vhost = { version = "0.6.0", features = ["vhost-user-slave"] } +vhost-user-backend = "0.8.0" virtio-bindings = "0.1.0" -vm-memory = "0.9.0" -vmm-sys-util = "0.10.0" +vm-memory = "0.10.0" +vmm-sys-util = "0.11.0" [build-dependencies] -clap = { version = "4.0.18", features = ["cargo"] } +clap = { version = "4.0.29", features = ["cargo"] } diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml index eba434bd8..bfeb4d10a 100644 --- a/virtio-devices/Cargo.toml +++ b/virtio-devices/Cargo.toml @@ -14,26 +14,26 @@ block_util = { path = "../block_util" } byteorder = "1.4.3" epoll = "4.3.1" event_monitor = { path = "../event_monitor" } -io-uring = "0.5.8" -libc = "0.2.137" +io-uring = "0.5.9" +libc = "0.2.138" log = "0.4.17" net_gen = { path = "../net_gen" } net_util = { path = "../net_util" } pci = { path = "../pci" } rate_limiter = { path = "../rate_limiter" } seccompiler = "0.3.0" -serde = { version = "1.0.147", features = ["derive"] } -serde_json = "1.0.87" +serde = { version = "1.0.150", features = ["derive"] } +serde_json = "1.0.89" serial_buffer = { path = "../serial_buffer" } thiserror = "1.0.37" -versionize = "0.1.6" +versionize = "0.1.9" versionize_derive = "0.1.4" -vhost = { version = "0.5.0", features = ["vhost-user-master", "vhost-user-slave", "vhost-kern", "vhost-vdpa"] } +vhost = { version = "0.6.0", features = ["vhost-user-master", "vhost-user-slave", "vhost-kern", "vhost-vdpa"] } virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] } -virtio-queue = "0.6.1" +virtio-queue = "0.7.0" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-migration = { path = "../vm-migration" } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" diff --git a/vm-allocator/Cargo.toml b/vm-allocator/Cargo.toml index a55539745..1ddeba140 100644 --- a/vm-allocator/Cargo.toml +++ b/vm-allocator/Cargo.toml @@ -5,8 +5,8 @@ authors = ["The Chromium OS Authors"] edition = "2021" [dependencies] -libc = "0.2.137" -vm-memory = "0.9.0" +libc = "0.2.138" +vm-memory = "0.10.0" [target.'cfg(target_arch = "aarch64")'.dependencies] arch = { path = "../arch" } diff --git a/vm-device/Cargo.toml b/vm-device/Cargo.toml index 714c2e050..3dcc7e3e4 100644 --- a/vm-device/Cargo.toml +++ b/vm-device/Cargo.toml @@ -13,8 +13,8 @@ mshv = ["vfio-ioctls/mshv"] anyhow = "1.0.66" hypervisor = { path = "../hypervisor" } thiserror = "1.0.37" -serde = { version = "1.0.147", features = ["rc", "derive"] } +serde = { version = "1.0.150", features = ["rc", "derive"] } vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } -vm-memory = { version = "0.9.0", features = ["backend-mmap"] } -vmm-sys-util = "0.10.0" +vm-memory = { version = "0.10.0", features = ["backend-mmap"] } +vmm-sys-util = "0.11.0" diff --git a/vm-migration/Cargo.toml b/vm-migration/Cargo.toml index 35bcabede..1de42206b 100644 --- a/vm-migration/Cargo.toml +++ b/vm-migration/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" [dependencies] anyhow = "1.0.66" thiserror = "1.0.37" -serde = { version = "1.0.147", features = ["rc", "derive"] } -serde_json = "1.0.87" -versionize = "0.1.6" +serde = { version = "1.0.150", features = ["rc", "derive"] } +serde_json = "1.0.89" +versionize = "0.1.9" versionize_derive = "0.1.4" -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic"] } +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] } diff --git a/vm-virtio/Cargo.toml b/vm-virtio/Cargo.toml index 07fb2e616..fab101fc1 100644 --- a/vm-virtio/Cargo.toml +++ b/vm-virtio/Cargo.toml @@ -9,5 +9,5 @@ default = [] [dependencies] log = "0.4.17" -virtio-queue = "0.6.1" -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +virtio-queue = "0.7.0" +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index 8f4d435ff..94fba5304 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -19,15 +19,15 @@ arc-swap = "1.5.1" arch = { path = "../arch" } bitflags = "1.3.2" block_util = { path = "../block_util" } -clap = "4.0.18" +clap = "4.0.29" devices = { path = "../devices" } epoll = "4.3.1" event_monitor = { path = "../event_monitor" } gdbstub = { version = "0.6.3", optional = true } gdbstub_arch = { version = "0.2.4", optional = true } hypervisor = { path = "../hypervisor" } -libc = "0.2.137" -linux-loader = { version = "0.7.0", features = ["elf", "bzimage", "pe"] } +libc = "0.2.138" +linux-loader = { version = "0.8.1", features = ["elf", "bzimage", "pe"] } log = "0.4.17" micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" } net_util = { path = "../net_util" } @@ -36,23 +36,23 @@ option_parser = { path = "../option_parser" } pci = { path = "../pci" } qcow = { path = "../qcow" } seccompiler = "0.3.0" -serde = { version = "1.0.147", features = ["rc", "derive"] } -serde_json = "1.0.87" +serde = { version = "1.0.150", features = ["rc", "derive"] } +serde_json = "1.0.89" serial_buffer = { path = "../serial_buffer" } signal-hook = "0.3.14" thiserror = "1.0.37" tracer = { path = "../tracer" } -uuid = "1.2.1" -versionize = "0.1.6" +uuid = "1.2.2" +versionize = "0.1.9" versionize_derive = "0.1.4" vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } vfio_user = { path = "../vfio_user" } vhdx = { path = "../vhdx" } virtio-devices = { path = "../virtio-devices" } -virtio-queue = "0.6.1" +virtio-queue = "0.7.0" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-migration = { path = "../vm-migration" } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = { version = "0.10.0", features = ["with-serde"] } +vmm-sys-util = { version = "0.11.0", features = ["with-serde"] } diff --git a/vmm/src/api/http.rs b/vmm/src/api/http.rs index f9c5694d4..343223a87 100644 --- a/vmm/src/api/http.rs +++ b/vmm/src/api/http.rs @@ -342,8 +342,10 @@ pub fn start_http_path_thread( ) -> Result>> { let socket_path = PathBuf::from(path); let socket_fd = UnixListener::bind(socket_path).map_err(VmmError::CreateApiServerSocket)?; - let server = - HttpServer::new_from_fd(socket_fd.into_raw_fd()).map_err(VmmError::CreateApiServer)?; + // SAFETY: Valid FD just opened + let server = unsafe { + HttpServer::new_from_fd(socket_fd.into_raw_fd()).map_err(VmmError::CreateApiServer)? + }; start_http_thread( server, api_notifier, @@ -362,7 +364,8 @@ pub fn start_http_fd_thread( exit_evt: EventFd, hypervisor_type: HypervisorType, ) -> Result>> { - let server = HttpServer::new_from_fd(fd).map_err(VmmError::CreateApiServer)?; + // SAFETY: Valid FD + let server = unsafe { HttpServer::new_from_fd(fd).map_err(VmmError::CreateApiServer)? }; start_http_thread( server, api_notifier,