From 6f8bd27cf7629733582d930519e98d19e90afb16 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 28 Nov 2022 13:08:13 +0000 Subject: [PATCH] build: Bulk update dependencies Signed-off-by: Rob Bradford --- Cargo.lock | 220 +++++++++++++++++---------------- Cargo.toml | 15 ++- acpi_tables/Cargo.toml | 2 +- api_client/Cargo.toml | 2 +- arch/Cargo.toml | 6 +- block_util/Cargo.toml | 6 +- devices/Cargo.toml | 4 +- fuzz/Cargo.lock | 59 ++++----- fuzz/Cargo.toml | 9 +- hypervisor/Cargo.toml | 8 +- net_gen/Cargo.toml | 2 +- net_util/Cargo.toml | 6 +- pci/Cargo.toml | 4 +- performance-metrics/Cargo.toml | 4 +- qcow/Cargo.toml | 2 +- rate_limiter/Cargo.toml | 2 +- test_infra/Cargo.toml | 2 +- tpm/Cargo.toml | 2 +- vfio_user/Cargo.toml | 4 +- vhost_user_block/Cargo.toml | 12 +- vhost_user_net/Cargo.toml | 10 +- virtio-devices/Cargo.toml | 6 +- vm-allocator/Cargo.toml | 2 +- vm-device/Cargo.toml | 4 +- vm-migration/Cargo.toml | 2 +- vm-virtio/Cargo.toml | 4 +- vmm/Cargo.toml | 10 +- vmm/src/api/http.rs | 8 +- 28 files changed, 213 insertions(+), 204 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5ec45ffa..33a273881 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", ] @@ -65,7 +65,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", ] @@ -130,13 +130,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.0.18" +version = "4.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b" +checksum = "0acbd8d28a0a60d7108d7ae850af6ba34cf2d1257fc646980e5f97ce14275966" dependencies = [ - "atty", "bitflags", "clap_lex", + "is-terminal", "once_cell", "strsim", "termcolor", @@ -382,9 +382,18 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hermit-abi" -version = "0.1.20" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a30908dbce072eca83216eab939d2290080e00ca71611b96a09e5cdce5f3fa" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] @@ -444,15 +453,25 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e481ccbe3dea62107216d0d1138bb8ad8e5e5c43009a098bd1990272c497b0" +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" + +[[package]] +name = "io-lifetimes" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e394faa0efb47f9f227f1cd89978f854542b318a6f64fa695489c9c993056656" +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 +486,18 @@ dependencies = [ "serde", ] +[[package]] +name = "is-terminal" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae5bc6e2eb41c9def29a3e0f1306382807764b9b53112030eff57435667352d" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes 1.0.2", + "rustix 0.36.3", + "windows-sys", +] + [[package]] name = "itoa" version = "1.0.4" @@ -475,8 +506,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 +516,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", @@ -533,9 +565,9 @@ dependencies = [ [[package]] name = "linux-loader" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8242360c7d79a7713a28043c994b815e9820b0e97e44b228ec9bd913c16bdfe" +checksum = "1c30882b410003a8e7c288ede492d6b8ddfb2ea13a5e9c2d27356954067d81cb" dependencies = [ "vm-memory", ] @@ -546,6 +578,12 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +[[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" @@ -580,7 +618,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 +627,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#529d45a8a8ae2e6316571fab059908a8627dadb7" dependencies = [ "libc", "serde", @@ -601,7 +639,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#529d45a8a8ae2e6316571fab059908a8627dadb7" dependencies = [ "libc", "mshv-bindings", @@ -672,9 +710,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.77" +version = "0.9.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +checksum = "07d5c8cb6e57b3a3612064d7b18b117912b4ce70955c2504d4b741c9e244b132" dependencies = [ "autocfg", "cc", @@ -690,9 +728,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" @@ -1010,16 +1048,30 @@ dependencies = [ [[package]] name = "rustix" -version = "0.35.12" +version = "0.35.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985947f9b6423159c4726323f373be0a21bdb514c5af06a849cb3d2dce2d01e8" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.7.5", "libc", - "linux-raw-sys", - "windows-sys 0.36.1", + "linux-raw-sys 0.0.46", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.36.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.2", + "libc", + "linux-raw-sys 0.1.3", + "windows-sys", ] [[package]] @@ -1051,18 +1103,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" dependencies = [ "proc-macro2", "quote", @@ -1071,9 +1123,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 +1134,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 +1144,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 +1215,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", @@ -1187,8 +1239,8 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" dependencies = [ - "rustix", - "windows-sys 0.42.0", + "rustix 0.35.13", + "windows-sys", ] [[package]] @@ -1257,9 +1309,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 +1324,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", @@ -1355,7 +1407,7 @@ dependencies = [ [[package]] name = "vhost" version = "0.5.0" -source = "git+https://github.com/rust-vmm/vhost?branch=main#f87156b77662af63b9fc9f116a213dd69e16007b" +source = "git+https://github.com/rust-vmm/vhost?branch=main#240fc2966cca9ec181cacbec2b7e589eda5aadee" dependencies = [ "bitflags", "libc", @@ -1366,8 +1418,7 @@ dependencies = [ [[package]] name = "vhost-user-backend" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0fc7d5f8e2943cd9f2ecd58be3f2078add863a49573d14dd9d64e1ab26544c" +source = "git+https://github.com/rust-vmm/vhost?branch=main#240fc2966cca9ec181cacbec2b7e589eda5aadee" dependencies = [ "libc", "log", @@ -1459,9 +1510,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 +1545,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#153b7700416cbe9ff1d2b491dd00ede047baf96b" [[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 +1631,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 +1687,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 +1694,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 +1708,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 +1738,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 e4a21abd5..4d8b093d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ strip = true [dependencies] anyhow = "1.0.66" api_client = { path = "api_client" } -clap = { version = "4.0.18", features = ["wrap_help","cargo","string"] } +clap = { version = "4.0.27", features = ["wrap_help","cargo","string"] } epoll = "4.3.1" event_monitor = { path = "event_monitor" } hypervisor = { path = "hypervisor" } @@ -29,22 +29,21 @@ libc = "0.2.137" 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.27", 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" } @@ -52,7 +51,7 @@ vhost = { git = "https://github.com/rust-vmm/vhost", branch = "main" } 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..8436602a3 100644 --- a/arch/Cargo.toml +++ b/arch/Cargo.toml @@ -13,16 +13,16 @@ 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"] } +linux-loader = { version = "0.8.0", features = ["elf", "bzimage", "pe"] } log = "0.4.17" serde = { version = "1.0.147", features = ["rc", "derive"] } thiserror = "1.0.37" uuid = "1.2.1" versionize = "0.1.6" 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..6c14221db 100644 --- a/block_util/Cargo.toml +++ b/block_util/Cargo.toml @@ -17,8 +17,8 @@ versionize = "0.1.6" 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..045227ff0 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -19,9 +19,9 @@ tpm = { path = "../tpm" } versionize = "0.1.6" 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/fuzz/Cargo.lock b/fuzz/Cargo.lock index a0ad97c78..6ae8f20e8 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -371,9 +371,9 @@ checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "io-lifetimes" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d367024b3f3414d8e01f437f704f41a9f64ab36f9067fa73e526ad4c763c87" +checksum = "e394faa0efb47f9f227f1cd89978f854542b318a6f64fa695489c9c993056656" dependencies = [ "libc", "windows-sys", @@ -396,7 +396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aae5bc6e2eb41c9def29a3e0f1306382807764b9b53112030eff57435667352d" dependencies = [ "hermit-abi", - "io-lifetimes 1.0.1", + "io-lifetimes 1.0.2", "rustix 0.36.3", "windows-sys", ] @@ -418,8 +418,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", @@ -428,8 +428,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", @@ -461,9 +462,9 @@ dependencies = [ [[package]] name = "linux-loader" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8242360c7d79a7713a28043c994b815e9820b0e97e44b228ec9bd913c16bdfe" +checksum = "1c30882b410003a8e7c288ede492d6b8ddfb2ea13a5e9c2d27356954067d81cb" dependencies = [ "vm-memory", ] @@ -492,7 +493,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", @@ -702,7 +703,7 @@ checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e" dependencies = [ "bitflags", "errno", - "io-lifetimes 1.0.1", + "io-lifetimes 1.0.2", "libc", "linux-raw-sys 0.1.3", "windows-sys", @@ -731,18 +732,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" dependencies = [ "proc-macro2", "quote", @@ -825,9 +826,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", @@ -913,9 +914,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", @@ -950,7 +951,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#bf7c9b997b4ad0ca1ab4bfe96dc1b10d4bc5be24" +source = "git+https://github.com/rust-vmm/vfio?branch=main#ad86d843a22fbf98efa9c02a5689fe2bf17ed54a" dependencies = [ "byteorder", "kvm-bindings", @@ -994,7 +995,7 @@ dependencies = [ [[package]] name = "vhost" version = "0.5.0" -source = "git+https://github.com/rust-vmm/vhost?branch=main#f87156b77662af63b9fc9f116a213dd69e16007b" +source = "git+https://github.com/rust-vmm/vhost?branch=main#240fc2966cca9ec181cacbec2b7e589eda5aadee" dependencies = [ "bitflags", "libc", @@ -1045,9 +1046,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", @@ -1079,14 +1080,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#153b7700416cbe9ff1d2b491dd00ede047baf96b" [[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", @@ -1164,9 +1165,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..a96d40336 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,8 +31,7 @@ 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" } diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index 3f8a14290..5965a6a9e 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -16,15 +16,15 @@ byteorder = "1.4.3" thiserror = "1.0.37" libc = "0.2.137" 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"] } 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" 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 03b43b05f..de6c9ed3e 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -16,10 +16,10 @@ thiserror = "1.0.37" versionize = "0.1.6" 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" diff --git a/pci/Cargo.toml b/pci/Cargo.toml index 30e7b55d7..3c9c07fb9 100644 --- a/pci/Cargo.toml +++ b/pci/Cargo.toml @@ -15,7 +15,7 @@ byteorder = "1.4.3" hypervisor = { path = "../hypervisor" } 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" +vmm-sys-util = "0.11.0" libc = "0.2.137" log = "0.4.17" serde = { version = "1.0.147", features = ["derive"] } @@ -24,7 +24,7 @@ versionize = "0.1.6" versionize_derive = "0.1.4" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = "0.9.0" +vm-memory = "0.10.0" vm-migration = { path = "../vm-migration" } [dependencies.vfio-bindings] diff --git a/performance-metrics/Cargo.toml b/performance-metrics/Cargo.toml index 8a88c8be6..b1c41a8c3 100644 --- a/performance-metrics/Cargo.toml +++ b/performance-metrics/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" build = "build.rs" [dependencies] -clap = { version = "4.0.18", features = ["wrap_help","cargo"] } +clap = { version = "4.0.27", features = ["wrap_help","cargo"] } dirs = "4.0.0" serde = { version = "1.0.147", features = ["rc", "derive"] } serde_json = "1.0.87" @@ -15,4 +15,4 @@ thiserror = "1.0.37" wait-timeout = "0.2.0" [build-dependencies] -clap = { version = "4.0.18", features = ["cargo"] } +clap = { version = "4.0.27", features = ["cargo"] } diff --git a/qcow/Cargo.toml b/qcow/Cargo.toml index 99d157471..b5c2f2f4c 100644 --- a/qcow/Cargo.toml +++ b/qcow/Cargo.toml @@ -13,4 +13,4 @@ byteorder = "1.4.3" libc = "0.2.137" 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..9bb888622 100644 --- a/rate_limiter/Cargo.toml +++ b/rate_limiter/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" [dependencies] libc = "0.2.137" 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..ca1545a8d 100644 --- a/test_infra/Cargo.toml +++ b/test_infra/Cargo.toml @@ -12,5 +12,5 @@ once_cell = "1.16.0" serde = { version = "1.0.147", features = ["rc", "derive"] } serde_json = "1.0.87" 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..bdf9fb490 100644 --- a/tpm/Cargo.toml +++ b/tpm/Cargo.toml @@ -11,4 +11,4 @@ byteorder = "1.4.3" libc = "0.2.133" log = "0.4.14" thiserror = "1.0.30" -vmm-sys-util = "0.10.0" +vmm-sys-util = "0.11.0" diff --git a/vfio_user/Cargo.toml b/vfio_user/Cargo.toml index 259cca97d..9d7b5369e 100644 --- a/vfio_user/Cargo.toml +++ b/vfio_user/Cargo.toml @@ -11,8 +11,8 @@ serde = { version = "1.0.147", features = ["rc"] } serde_derive = "1.0.142" serde_json = "1.0.87" thiserror = "1.0.37" -vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic"] } -vmm-sys-util = "0.10.0" +vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] } +vmm-sys-util = "0.11.0" [dependencies.vfio-bindings] version = "0.3.1" diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index f2265d185..e21d768bc 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] block_util = { path = "../block_util" } -clap = { version = "4.0.18", features = ["wrap_help","cargo"] } +clap = { version = "4.0.27", features = ["wrap_help","cargo"] } env_logger = "0.9.3" epoll = "4.3.1" libc = "0.2.137" @@ -14,11 +14,11 @@ 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-user-backend = { git = "https://github.com/rust-vmm/vhost", branch = "main" } 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.27", features = ["cargo"] } diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index 7edf2305f..f42335a07 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2021" [dependencies] -clap = { version = "4.0.18", features = ["wrap_help","cargo"] } +clap = { version = "4.0.27", features = ["wrap_help","cargo"] } env_logger = "0.9.3" epoll = "4.3.1" libc = "0.2.137" @@ -13,10 +13,10 @@ 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-user-backend = { git = "https://github.com/rust-vmm/vhost", branch = "main" } 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.27", features = ["cargo"] } diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml index eba434bd8..9afab78e8 100644 --- a/virtio-devices/Cargo.toml +++ b/virtio-devices/Cargo.toml @@ -30,10 +30,10 @@ versionize = "0.1.6" versionize_derive = "0.1.4" vhost = { version = "0.5.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..db326eda8 100644 --- a/vm-allocator/Cargo.toml +++ b/vm-allocator/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] libc = "0.2.137" -vm-memory = "0.9.0" +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..96db98c8e 100644 --- a/vm-device/Cargo.toml +++ b/vm-device/Cargo.toml @@ -15,6 +15,6 @@ hypervisor = { path = "../hypervisor" } thiserror = "1.0.37" serde = { version = "1.0.147", 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..d2e152e7d 100644 --- a/vm-migration/Cargo.toml +++ b/vm-migration/Cargo.toml @@ -11,4 +11,4 @@ serde = { version = "1.0.147", features = ["rc", "derive"] } serde_json = "1.0.87" versionize = "0.1.6" 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..ecc5aa565 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -19,7 +19,7 @@ arc-swap = "1.5.1" arch = { path = "../arch" } bitflags = "1.3.2" block_util = { path = "../block_util" } -clap = "4.0.18" +clap = "4.0.27" devices = { path = "../devices" } epoll = "4.3.1" event_monitor = { path = "../event_monitor" } @@ -27,7 +27,7 @@ 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"] } +linux-loader = { version = "0.8.0", 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" } @@ -49,10 +49,10 @@ vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", defau 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..3ec08bbf8 100644 --- a/vmm/src/api/http.rs +++ b/vmm/src/api/http.rs @@ -342,8 +342,9 @@ 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 +363,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,