diff --git a/Cargo.lock b/Cargo.lock index c04e21cde..3b584d5ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,7 +39,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -68,7 +68,7 @@ dependencies = [ "hypervisor", "libc", "linux-loader", - "log 0.4.14", + "log", "serde", "serde_derive", "serde_json", @@ -86,7 +86,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -119,12 +119,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bitflags" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" - [[package]] name = "bitflags" version = "1.2.1" @@ -137,7 +131,7 @@ version = "0.1.0" dependencies = [ "io-uring", "libc", - "log 0.4.14", + "log", "qcow", "serde", "serde_derive", @@ -183,7 +177,7 @@ checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", - "bitflags 1.2.1", + "bitflags", "strsim", "term_size", "textwrap", @@ -205,7 +199,7 @@ dependencies = [ "hypervisor", "lazy_static", "libc", - "log 0.4.14", + "log", "net_util", "option_parser", "seccomp", @@ -225,7 +219,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags 1.2.1", + "bitflags", ] [[package]] @@ -250,11 +244,11 @@ version = "0.1.0" dependencies = [ "acpi_tables", "anyhow", - "bitflags 1.2.1", + "bitflags", "byteorder", "epoll", "libc", - "log 0.4.14", + "log", "versionize", "versionize_derive", "vm-device", @@ -280,7 +274,7 @@ checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -291,7 +285,7 @@ checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", "humantime", - "log 0.4.14", + "log", "regex", "termcolor", ] @@ -302,7 +296,7 @@ version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" dependencies = [ - "bitflags 1.2.1", + "bitflags", "libc", ] @@ -357,9 +351,9 @@ checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" [[package]] name = "glob" -version = "0.2.11" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hermit-abi" @@ -387,7 +381,7 @@ dependencies = [ "kvm-bindings", "kvm-ioctls", "libc", - "log 0.4.14", + "log", "mshv-bindings", "mshv-ioctls", "serde", @@ -414,15 +408,15 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb82832e05cc4ca298f198a8db108837b4f7b7b1248e3cba8e48f151aece80cf" dependencies = [ - "bitflags 1.2.1", + "bitflags", "libc", ] [[package]] name = "ipnetwork" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c3eaab3ac0ede60ffa41add21970a7df7d91772c03383aac6c2c3d53cc716b" +checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355" dependencies = [ "serde", ] @@ -433,16 +427,6 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "kvm-bindings" version = "0.4.0" @@ -520,15 +504,6 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.14", -] - [[package]] name = "log" version = "0.4.14" @@ -599,7 +574,7 @@ dependencies = [ "epoll", "lazy_static", "libc", - "log 0.4.14", + "log", "net_gen", "pnet", "rate_limiter", @@ -655,7 +630,7 @@ dependencies = [ "libc", "redox_syscall 0.1.57", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -666,7 +641,7 @@ dependencies = [ "byteorder", "hypervisor", "libc", - "log 0.4.14", + "log", "serde", "serde_derive", "serde_json", @@ -687,9 +662,9 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "pnet" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b657d5b9a98a2c81b82549922b8b15984e49f8120cd130b11a09f81b9b55d633" +checksum = "4b6d2a0409666964722368ef5fb74b9f93fac11c18bef3308693c16c6733f103" dependencies = [ "ipnetwork", "pnet_base", @@ -701,71 +676,71 @@ dependencies = [ [[package]] name = "pnet_base" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4688aa497ef62129f302a5800ebde67825f8ff129f43690ca84099f6620bed" +checksum = "25488cd551a753dcaaa6fffc9f69a7610a412dd8954425bf7ffad5f7d1156fb8" [[package]] name = "pnet_datalink" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59001c9c4d9d23bf2f61afaaf134a766fd6932ba2557c606b9112157053b9ac7" +checksum = "d4d1f8ab1ef6c914cf51dc5dfe0be64088ea5f3b08bbf5a31abc70356d271198" dependencies = [ "ipnetwork", "libc", "pnet_base", "pnet_sys", - "winapi 0.3.9", + "winapi", ] [[package]] name = "pnet_macros" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d894a90dbdbe976e624453fc31b1912f658083778329442dda1cca94f76a3e76" +checksum = "30490e0852e58402b8fae0d39897b08a24f493023a4d6cf56b2e30f31ed57548" dependencies = [ + "proc-macro2", + "quote", "regex", - "syntex", - "syntex_syntax", + "syn", ] [[package]] name = "pnet_macros_support" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b99269a458570bc06a9132254349f6543d9abc92e88b68d8de934aac9481f6c" +checksum = "d4714e10f30cab023005adce048f2d30dd4ac4f093662abf2220855655ef8f90" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33f8238f4eb897a55ca06510cd71afb5b5ca7b4ff2d7188f1ca855fc1710133e" +checksum = "8588067671d03c9f4254b2e66fecb4d8b93b5d3e703195b84f311cd137e32130" dependencies = [ "glob", "pnet_base", "pnet_macros", "pnet_macros_support", - "syntex", ] [[package]] name = "pnet_sys" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7589e4c4e7ed72a3ffdff8a65d3bea84e8c3a23e19d0a10e8f45efdf632fff15" +checksum = "d9a3f32b0df45515befd19eed04616f6b56a488da92afc61164ef455e955f07f" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] name = "pnet_transport" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "326abdfd2e70e8e943bd58087b59686de170cac050a3b19c9fcc84db01690af5" +checksum = "932b2916d693bcc5fa18443dc99142e0a6fd31a6ce75a511868f7174c17e2bce" dependencies = [ "libc", "pnet_base", @@ -779,7 +754,7 @@ version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" dependencies = [ - "unicode-xid 0.2.2", + "unicode-xid", ] [[package]] @@ -788,7 +763,7 @@ version = "0.1.0" dependencies = [ "byteorder", "libc", - "log 0.4.14", + "log", "remain", "vmm-sys-util", ] @@ -807,7 +782,7 @@ name = "rate_limiter" version = "0.1.0" dependencies = [ "libc", - "log 0.4.14", + "log", "vmm-sys-util", ] @@ -823,7 +798,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" dependencies = [ - "bitflags 1.2.1", + "bitflags", ] [[package]] @@ -870,12 +845,6 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - [[package]] name = "ryu" version = "1.0.5" @@ -955,7 +924,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d876d4d57f6bbf2245d43f7ec53759461f801a446d3693704aa6d27b257844d7" dependencies = [ - "bitflags 1.2.1", + "bitflags", "libc", "libssh2-sys", "parking_lot", @@ -981,7 +950,7 @@ checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", - "unicode-xid 0.2.2", + "unicode-xid", ] [[package]] @@ -993,66 +962,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "unicode-xid 0.2.2", -] - -[[package]] -name = "syntex" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317" -dependencies = [ - "syntex_errors", - "syntex_syntax", -] - -[[package]] -name = "syntex_errors" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646" -dependencies = [ - "libc", - "log 0.3.9", - "rustc-serialize", - "syntex_pos", - "term", - "unicode-xid 0.0.3", -] - -[[package]] -name = "syntex_pos" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6" -dependencies = [ - "rustc-serialize", -] - -[[package]] -name = "syntex_syntax" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d" -dependencies = [ - "bitflags 0.5.0", - "libc", - "log 0.3.9", - "rustc-serialize", - "syntex_errors", - "syntex_pos", - "term", - "unicode-xid 0.0.3", -] - -[[package]] -name = "term" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" -dependencies = [ - "kernel32-sys", - "winapi 0.2.8", + "unicode-xid", ] [[package]] @@ -1062,7 +972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1122,12 +1032,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -[[package]] -name = "unicode-xid" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" - [[package]] name = "unicode-xid" version = "0.2.2" @@ -1190,7 +1094,7 @@ dependencies = [ "byteorder", "kvm-bindings", "kvm-ioctls", - "log 0.4.14", + "log", "vfio-bindings", "vm-memory", "vmm-sys-util", @@ -1201,7 +1105,7 @@ name = "vhost" version = "0.1.0" source = "git+https://github.com/rust-vmm/vhost?branch=master#e5b930b73a47cbdd79858e2e68bcb57123d1c1f3" dependencies = [ - "bitflags 1.2.1", + "bitflags", "libc", "vmm-sys-util", ] @@ -1212,7 +1116,7 @@ version = "0.1.0" dependencies = [ "epoll", "libc", - "log 0.4.14", + "log", "vhost", "virtio-bindings", "vm-memory", @@ -1228,7 +1132,7 @@ dependencies = [ "clap", "epoll", "libc", - "log 0.4.14", + "log", "option_parser", "qcow", "vhost", @@ -1245,7 +1149,7 @@ dependencies = [ "clap", "epoll", "libc", - "log 0.4.14", + "log", "net_util", "option_parser", "vhost", @@ -1273,7 +1177,7 @@ dependencies = [ "event_monitor", "io-uring", "libc", - "log 0.4.14", + "log", "net_gen", "net_util", "pci", @@ -1330,7 +1234,7 @@ checksum = "625f401b1b8b3ac3d43f53903cd138cfe840bd985f8581e553027b31d2bb8ae8" dependencies = [ "arc-swap", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1351,7 +1255,7 @@ dependencies = [ name = "vm-virtio" version = "0.1.0" dependencies = [ - "log 0.4.14", + "log", "serde", "serde_derive", "serde_json", @@ -1367,7 +1271,7 @@ dependencies = [ "anyhow", "arc-swap", "arch", - "bitflags 1.2.1", + "bitflags", "block_util", "clap", "credibility", @@ -1378,7 +1282,7 @@ dependencies = [ "lazy_static", "libc", "linux-loader", - "log 0.4.14", + "log", "micro_http", "net_util", "option_parser", @@ -1406,7 +1310,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cf11afbc4ebc0d5c7a7748a77d19e2042677fc15faa2f4ccccb27c18a60605" dependencies = [ - "bitflags 1.2.1", + "bitflags", "libc", "serde", "serde_derive", @@ -1427,12 +1331,6 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -1443,12 +1341,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -1461,7 +1353,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index 7573ded33..5cebd9c17 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -18,5 +18,5 @@ vmm-sys-util = ">=0.3.1" [dev-dependencies] lazy_static = "1.3.0" -pnet = "0.27.2" +pnet = "0.28.0" serde_json = "1.0.64"