From c27d308f56307840d6de112fdc6658d36e2c4432 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 04:05:35 +0000 Subject: [PATCH 1/2] build(deps): update vhost requirement from 0.1 to 0.2 Updates the requirements on [vhost](https://github.com/rust-vmm/vhost) to permit the latest version. - [Release notes](https://github.com/rust-vmm/vhost/releases) - [Changelog](https://github.com/rust-vmm/vhost/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-vmm/vhost/compare/v0.1.0...v0.2.0) --- updated-dependencies: - dependency-name: vhost dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- src/i2c/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i2c/Cargo.toml b/src/i2c/Cargo.toml index 399440b..27ac9c9 100644 --- a/src/i2c/Cargo.toml +++ b/src/i2c/Cargo.toml @@ -16,7 +16,7 @@ clap = { version = "=3.0.0-beta.2", features = ["yaml"] } epoll = "4.3" libc = ">=0.2.95" log = ">=0.4.6" -vhost = { version = "0.1", features = ["vhost-user-slave"] } +vhost = { version = "0.2", features = ["vhost-user-slave"] } vhost-user-backend = { git = "https://github.com/rust-vmm/vhost-user-backend", rev = "70f668a699d865f13ba40498897ad181a409bd41" } virtio-bindings = ">=0.1" vm-memory = "0.6" From ed3315afc58d106ddc958797114c78914e6498a2 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Mon, 11 Oct 2021 12:07:01 +0530 Subject: [PATCH 2/2] [i2c] Fix build errors Update version of vhost-user-backend and vmm-sys-util to fix the build errors. Signed-off-by: Viresh Kumar --- Cargo.lock | 27 ++++++++++++++++++++------- src/i2c/Cargo.toml | 4 ++-- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07772ad..b9aab6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "arc-swap" version = "1.4.0" @@ -254,13 +256,14 @@ checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "vhost" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6b90237e10f1a61b35fba73885c3567e1a5a8c40d44daae335f7710210a7dc" +checksum = "2d23ddeb452fb4f837526c6298cc8a2f4948e5595b0328a3d61b5eebe51874d7" dependencies = [ "bitflags", "libc", - "vmm-sys-util", + "vm-memory", + "vmm-sys-util 0.8.0", ] [[package]] @@ -275,13 +278,13 @@ dependencies = [ "vhost-user-backend", "virtio-bindings", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.9.0", ] [[package]] name = "vhost-user-backend" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vhost-user-backend?rev=70f668a699d865f13ba40498897ad181a409bd41#70f668a699d865f13ba40498897ad181a409bd41" +source = "git+https://github.com/rust-vmm/vhost-user-backend?rev=bd6b53348f06055abcb2b7254168d716b742f383#bd6b53348f06055abcb2b7254168d716b742f383" dependencies = [ "epoll", "libc", @@ -290,7 +293,7 @@ dependencies = [ "virtio-bindings", "virtio-queue", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.9.0", ] [[package]] @@ -306,7 +309,7 @@ source = "git+https://github.com/rust-vmm/vm-virtio?rev=6013dd9#6013dd91b2e6eb77 dependencies = [ "log", "vm-memory", - "vmm-sys-util", + "vmm-sys-util 0.8.0", ] [[package]] @@ -330,6 +333,16 @@ dependencies = [ "libc", ] +[[package]] +name = "vmm-sys-util" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733537bded03aaa93543f785ae997727b30d1d9f4a03b7861d23290474242e11" +dependencies = [ + "bitflags", + "libc", +] + [[package]] name = "winapi" version = "0.3.9" diff --git a/src/i2c/Cargo.toml b/src/i2c/Cargo.toml index a1336ac..914d53f 100644 --- a/src/i2c/Cargo.toml +++ b/src/i2c/Cargo.toml @@ -17,7 +17,7 @@ epoll = "4.3" libc = ">=0.2.95" log = ">=0.4.6" vhost = { version = "0.2", features = ["vhost-user-slave"] } -vhost-user-backend = { git = "https://github.com/rust-vmm/vhost-user-backend", rev = "70f668a699d865f13ba40498897ad181a409bd41" } +vhost-user-backend = { git = "https://github.com/rust-vmm/vhost-user-backend", rev = "bd6b53348f06055abcb2b7254168d716b742f383" } virtio-bindings = ">=0.1" vm-memory = "0.6" -vmm-sys-util = "=0.8.0" +vmm-sys-util = "=0.9.0"