From 6e6f66de2e010ea03343c3d8c541de1abe810a87 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Wed, 12 May 2021 13:06:01 +0100 Subject: [PATCH] build: Bulk upgrade dependencies including fuzz Signed-off-by: Rob Bradford --- Cargo.lock | 22 ++++++------- Cargo.toml | 2 +- fuzz/Cargo.lock | 66 ++++++++++++++++++++++++++++++++++----- fuzz/Cargo.toml | 10 +++--- virtio-devices/Cargo.toml | 2 +- vmm/Cargo.toml | 2 +- 6 files changed, 77 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 54afc02f7..68430e31c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -778,7 +778,7 @@ version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" dependencies = [ - "unicode-xid 0.2.1", + "unicode-xid 0.2.2", ] [[package]] @@ -818,9 +818,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" dependencies = [ "bitflags 1.2.1", ] @@ -832,7 +832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ "getrandom", - "redox_syscall 0.2.6", + "redox_syscall 0.2.8", ] [[package]] @@ -890,7 +890,7 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "seccomp" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/firecracker?tag=v0.24.2#5ba819d7b7a684107f5434bcbd1617bc94565478" +source = "git+https://github.com/firecracker-microvm/firecracker?tag=v0.24.3#9f447fe65c1c549ef7b0abe863428fa33ffe5f79" dependencies = [ "libc", ] @@ -980,7 +980,7 @@ checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", - "unicode-xid 0.2.1", + "unicode-xid 0.2.2", ] [[package]] @@ -992,7 +992,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "unicode-xid 0.2.1", + "unicode-xid 0.2.2", ] [[package]] @@ -1129,9 +1129,9 @@ checksum = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "vcpkg" @@ -1481,9 +1481,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.2.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9c39e6d503229ffa00cc2954af4a751e6bbedf2a2c18e856eb3ece93d32495" +checksum = "d498dbd1fd7beb83c86709ae1c33ca50942889473473d287d56ce4770a18edfb" dependencies = [ "proc-macro2", "syn", diff --git a/Cargo.toml b/Cargo.toml index 78bc286f5..265738c14 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ hypervisor = { path = "hypervisor" } libc = "0.2.94" log = { version = "0.4.14", features = ["std"] } option_parser = { path = "option_parser" } -seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v0.24.2" } +seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v0.24.3" } serde_json = "1.0.64" signal-hook = "0.3.8" thiserror = "1.0.24" diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index faadb58b7..746decff6 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -46,7 +46,6 @@ version = "0.1.0" dependencies = [ "acpi_tables", "anyhow", - "arch_gen", "byteorder", "hypervisor", "libc", @@ -56,14 +55,11 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", + "vm-fdt", "vm-memory", "vm-migration", ] -[[package]] -name = "arch_gen" -version = "0.1.0" - [[package]] name = "atty" version = "0.2.14" @@ -75,6 +71,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bitflags" version = "1.2.1" @@ -93,6 +98,8 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", + "versionize", + "versionize_derive", "virtio-bindings", "vm-memory", "vm-virtio", @@ -171,6 +178,12 @@ dependencies = [ "vmm-sys-util", ] +[[package]] +name = "crc64" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55626594feae15d266d52440b26ff77de0e22230cf0c113abe619084c1ddc910" + [[package]] name = "devices" version = "0.1.0" @@ -441,7 +454,7 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "seccomp" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/firecracker?tag=v0.24.2#5ba819d7b7a684107f5434bcbd1617bc94565478" +source = "git+https://github.com/firecracker-microvm/firecracker?tag=v0.24.3#9f447fe65c1c549ef7b0abe863428fa33ffe5f79" dependencies = [ "libc", ] @@ -574,6 +587,34 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +[[package]] +name = "versionize" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7429cf68de8f091b667d27323ed323afd39584a56d533995b12ddd748e5e6ca9" +dependencies = [ + "bincode", + "crc64", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn", + "versionize_derive", + "vmm-sys-util", +] + +[[package]] +name = "versionize_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140aa9fd298f667ea50fa1cb0d8530076924079285c623b18b8f8a1c28386b4a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "vfio-bindings" version = "0.2.0" @@ -586,7 +627,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio-ioctls?branch=master#a87b13bdec026e8144b91f30f35451a966d8c1ca" +source = "git+https://github.com/rust-vmm/vfio-ioctls?branch=master#5cb8550556620546e74b9fe6d1174e0d1fc83888" dependencies = [ "byteorder", "kvm-bindings", @@ -600,7 +641,7 @@ dependencies = [ [[package]] name = "vhost" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vhost?branch=master#ee3e8722706c984b3dfe12d3a130e92101b78e8f" +source = "git+https://github.com/rust-vmm/vhost?branch=master#e5b930b73a47cbdd79858e2e68bcb57123d1c1f3" dependencies = [ "bitflags", "libc", @@ -634,6 +675,8 @@ dependencies = [ "serde", "serde_derive", "serde_json", + "versionize", + "versionize_derive", "vhost", "virtio-bindings", "vm-allocator", @@ -667,6 +710,11 @@ dependencies = [ "vmm-sys-util", ] +[[package]] +name = "vm-fdt" +version = "0.1.0" +source = "git+https://github.com/rust-vmm/vm-fdt?branch=master#13ab882e2f8387753064351c69fbe35c422b448b" + [[package]] name = "vm-memory" version = "0.5.0" @@ -687,6 +735,8 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", + "versionize", + "versionize_derive", "vm-memory", ] diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index d09613d8a..d2981ec22 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -11,20 +11,20 @@ cargo-fuzz = true [dependencies] block_util = { path = "../block_util" } libc = "0.2.94" -libfuzzer-sys = "0.4" +libfuzzer-sys = "0.4.0" qcow = { path = "../qcow" } -seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v0.24.2" } +seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v0.24.3" } virtio-devices = { path = "../virtio-devices" } vmm-sys-util = "0.8.0" vm-virtio = { path = "../vm-virtio" } vm-memory = "0.5.0" -[patch.crates-io] -kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.4.0", features = ["with-serde", "fam-wrappers"] } - [dependencies.cloud-hypervisor] path = ".." +[patch.crates-io] +kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.4.0", features = ["with-serde", "fam-wrappers"] } + # Prevent this from interfering with workspaces [workspace] members = ["."] diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml index 78ae2735c..ff6fa2a5c 100644 --- a/virtio-devices/Cargo.toml +++ b/virtio-devices/Cargo.toml @@ -22,7 +22,7 @@ net_gen = { path = "../net_gen" } net_util = { path = "../net_util" } pci = { path = "../pci" } rate_limiter = { path = "../rate_limiter" } -seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v0.24.2" } +seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v0.24.3" } serde = ">=1.0.27" serde_derive = ">=1.0.27" serde_json = ">=1.0.9" diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index 3fdd48e0a..ef3961ef6 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -35,7 +35,7 @@ net_util = { path = "../net_util" } option_parser = { path = "../option_parser" } pci = { path = "../pci" } qcow = { path = "../qcow" } -seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v0.24.2" } +seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v0.24.3" } serde = {version = ">=1.0.27", features = ["rc"] } serde_derive = ">=1.0.27" serde_json = ">=1.0.9"