From d19669dc7c65ad22356314f48aa6339367c34884 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Mar 2022 05:53:46 +0000
Subject: [PATCH 1/2] build(deps): bump vhost from 0.3.0 to 0.4.0

Bumps [vhost](https://github.com/rust-vmm/vhost) from 0.3.0 to 0.4.0.
- [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.3.0...v0.4.0)

---
updated-dependencies:
- dependency-name: vhost
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock     | 18 +++++++++++++++---
 i2c/Cargo.toml |  2 +-
 rng/Cargo.toml |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4516b6b..b7dad0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -404,6 +404,18 @@ dependencies = [
  "vmm-sys-util",
 ]
 
+[[package]]
+name = "vhost"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53567fd9ab820e4f3cc156f24146882fee3c365194c3e1dea74723265f27fc88"
+dependencies = [
+ "bitflags",
+ "libc",
+ "vm-memory",
+ "vmm-sys-util",
+]
+
 [[package]]
 name = "vhost-device-i2c"
 version = "0.1.0"
@@ -413,7 +425,7 @@ dependencies = [
  "libc",
  "log",
  "thiserror",
- "vhost",
+ "vhost 0.4.0",
  "vhost-user-backend",
  "virtio-bindings",
  "virtio-queue",
@@ -433,7 +445,7 @@ dependencies = [
  "rand",
  "tempfile",
  "thiserror",
- "vhost",
+ "vhost 0.4.0",
  "vhost-user-backend",
  "virtio-bindings",
  "virtio-queue",
@@ -449,7 +461,7 @@ checksum = "6bf4c8d6fc1560ac01051bd09b744887665b25adeb390bb7de6bbfb4d2ad8b12"
 dependencies = [
  "libc",
  "log",
- "vhost",
+ "vhost 0.3.0",
  "virtio-bindings",
  "virtio-queue",
  "vm-memory",
diff --git a/i2c/Cargo.toml b/i2c/Cargo.toml
index 6e3784d..45284ef 100644
--- a/i2c/Cargo.toml
+++ b/i2c/Cargo.toml
@@ -17,7 +17,7 @@ env_logger = ">=0.9"
 libc = ">=0.2.95"
 log = ">=0.4.6"
 thiserror = "1.0"
-vhost = { version = "0.3", features = ["vhost-user-slave"] }
+vhost = { version = "0.4", features = ["vhost-user-slave"] }
 vhost-user-backend = "0.2"
 virtio-bindings = ">=0.1"
 virtio-queue = "0.2"
diff --git a/rng/Cargo.toml b/rng/Cargo.toml
index d13f545..0f440cb 100644
--- a/rng/Cargo.toml
+++ b/rng/Cargo.toml
@@ -18,7 +18,7 @@ log = ">=0.4.6"
 rand = ">=0.8.5"
 tempfile = "3.2.0"
 thiserror = "1.0"
-vhost = { version = "0.3", features = ["vhost-user-slave"] }
+vhost = { version = "0.4", features = ["vhost-user-slave"] }
 vhost-user-backend = "0.2"
 virtio-bindings = ">=0.1"
 virtio-queue = "0.2"

From 0542190d73d62abedef6886faac76c12da5a0f06 Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Mon, 28 Mar 2022 10:05:01 +0530
Subject: [PATCH 2/2] Update vhost-user-backend

Update vhost-user-backend to avoid vhost version conflicts.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 Cargo.lock     | 22 +++++-----------------
 i2c/Cargo.toml |  2 +-
 rng/Cargo.toml |  2 +-
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b7dad0d..166ecc6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -392,18 +392,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "vhost"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b56bf8f178fc500fe14505fca8b00dec76fc38f2304f461c8d9d7547982311d"
-dependencies = [
- "bitflags",
- "libc",
- "vm-memory",
- "vmm-sys-util",
-]
-
 [[package]]
 name = "vhost"
 version = "0.4.0"
@@ -425,7 +413,7 @@ dependencies = [
  "libc",
  "log",
  "thiserror",
- "vhost 0.4.0",
+ "vhost",
  "vhost-user-backend",
  "virtio-bindings",
  "virtio-queue",
@@ -445,7 +433,7 @@ dependencies = [
  "rand",
  "tempfile",
  "thiserror",
- "vhost 0.4.0",
+ "vhost",
  "vhost-user-backend",
  "virtio-bindings",
  "virtio-queue",
@@ -455,13 +443,13 @@ dependencies = [
 
 [[package]]
 name = "vhost-user-backend"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf4c8d6fc1560ac01051bd09b744887665b25adeb390bb7de6bbfb4d2ad8b12"
+checksum = "1490f2028d4f119b2292efe218b5f8cfc6471f039b53b6a6eb5d9513e964facc"
 dependencies = [
  "libc",
  "log",
- "vhost 0.3.0",
+ "vhost",
  "virtio-bindings",
  "virtio-queue",
  "vm-memory",
diff --git a/i2c/Cargo.toml b/i2c/Cargo.toml
index 45284ef..64fac53 100644
--- a/i2c/Cargo.toml
+++ b/i2c/Cargo.toml
@@ -18,7 +18,7 @@ libc = ">=0.2.95"
 log = ">=0.4.6"
 thiserror = "1.0"
 vhost = { version = "0.4", features = ["vhost-user-slave"] }
-vhost-user-backend = "0.2"
+vhost-user-backend = "0.3"
 virtio-bindings = ">=0.1"
 virtio-queue = "0.2"
 vm-memory = "0.7"
diff --git a/rng/Cargo.toml b/rng/Cargo.toml
index 0f440cb..5adf3ff 100644
--- a/rng/Cargo.toml
+++ b/rng/Cargo.toml
@@ -19,7 +19,7 @@ rand = ">=0.8.5"
 tempfile = "3.2.0"
 thiserror = "1.0"
 vhost = { version = "0.4", features = ["vhost-user-slave"] }
-vhost-user-backend = "0.2"
+vhost-user-backend = "0.3"
 virtio-bindings = ">=0.1"
 virtio-queue = "0.2"
 vm-memory = ">=0.7"