From b2092fb501b61c33e89f7582afe5721dbbdf0d0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Mar 2022 04:39:37 +0000 Subject: [PATCH 1/3] build(deps): bump virtio-queue from 0.1.0 to 0.2.0 Bumps [virtio-queue](https://github.com/rust-vmm/vm-virtio) from 0.1.0 to 0.2.0. - [Release notes](https://github.com/rust-vmm/vm-virtio/releases) - [Commits](https://github.com/rust-vmm/vm-virtio/compare/virtio-queue-v0.1.0...virtio-queue-v0.2.0) --- updated-dependencies: - dependency-name: virtio-queue dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 17 ++++++++++++++--- i2c/Cargo.toml | 4 ++-- rng/Cargo.toml | 4 ++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6328ef7..617b50d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -416,7 +416,7 @@ dependencies = [ "vhost", "vhost-user-backend", "virtio-bindings", - "virtio-queue", + "virtio-queue 0.2.0", "vm-memory", "vmm-sys-util", ] @@ -436,7 +436,7 @@ dependencies = [ "vhost", "vhost-user-backend", "virtio-bindings", - "virtio-queue", + "virtio-queue 0.2.0", "vm-memory", "vmm-sys-util", ] @@ -451,7 +451,7 @@ dependencies = [ "log", "vhost", "virtio-bindings", - "virtio-queue", + "virtio-queue 0.1.0", "vm-memory", "vmm-sys-util", ] @@ -473,6 +473,17 @@ dependencies = [ "vmm-sys-util", ] +[[package]] +name = "virtio-queue" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3785325315e6496fa88673842ee6cd198b9658e88e8b0e1ad48a5dc818b221dc" +dependencies = [ + "log", + "vm-memory", + "vmm-sys-util", +] + [[package]] name = "vm-memory" version = "0.7.0" diff --git a/i2c/Cargo.toml b/i2c/Cargo.toml index 3b96cd5..212c043 100644 --- a/i2c/Cargo.toml +++ b/i2c/Cargo.toml @@ -20,10 +20,10 @@ thiserror = "1.0" vhost = { version = "0.3", features = ["vhost-user-slave"] } vhost-user-backend = "0.1" virtio-bindings = ">=0.1" -virtio-queue = "0.1" +virtio-queue = "0.2" vm-memory = "0.7" vmm-sys-util = "=0.9.0" [dev-dependencies] -virtio-queue = { version = "0.1", features = ["test-utils"] } +virtio-queue = { version = "0.2", features = ["test-utils"] } vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic"] } diff --git a/rng/Cargo.toml b/rng/Cargo.toml index 8578ec5..092b9bb 100644 --- a/rng/Cargo.toml +++ b/rng/Cargo.toml @@ -21,10 +21,10 @@ thiserror = "1.0" vhost = { version = "0.3", features = ["vhost-user-slave"] } vhost-user-backend = "0.1" virtio-bindings = ">=0.1" -virtio-queue = "0.1" +virtio-queue = "0.2" vm-memory = ">=0.7" vmm-sys-util = ">=0.9.0" [dev-dependencies] -virtio-queue = { version = "0.1", features = ["test-utils"] } +virtio-queue = { version = "0.2", features = ["test-utils"] } vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic"] } From f7f0361d76f67a04cc715ebdc4922f255ce80fef Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Tue, 8 Mar 2022 10:33:16 +0530 Subject: [PATCH 2/3] vhost-device: Update vhost-user-backend to 0.2.0 The versions of virtio-queue conflicts as both vhost-device and vhost-user-backend are trying to fetch different versions of it. Fix it by updating vhost-user-backend as well. Signed-off-by: Viresh Kumar --- Cargo.lock | 21 +++++---------------- i2c/Cargo.toml | 2 +- rng/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 617b50d..c7f4af7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -416,7 +416,7 @@ dependencies = [ "vhost", "vhost-user-backend", "virtio-bindings", - "virtio-queue 0.2.0", + "virtio-queue", "vm-memory", "vmm-sys-util", ] @@ -436,22 +436,22 @@ dependencies = [ "vhost", "vhost-user-backend", "virtio-bindings", - "virtio-queue 0.2.0", + "virtio-queue", "vm-memory", "vmm-sys-util", ] [[package]] name = "vhost-user-backend" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8db00e93514caa8987bb8b536fe962c9b66b4068583abc4c531eb97988477cd" +checksum = "6bf4c8d6fc1560ac01051bd09b744887665b25adeb390bb7de6bbfb4d2ad8b12" dependencies = [ "libc", "log", "vhost", "virtio-bindings", - "virtio-queue 0.1.0", + "virtio-queue", "vm-memory", "vmm-sys-util", ] @@ -462,17 +462,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b" -[[package]] -name = "virtio-queue" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90da9e627f6aaf667cc7b6548a28be332d3e1f058f4ceeb46ab6bcee5c4b74d" -dependencies = [ - "log", - "vm-memory", - "vmm-sys-util", -] - [[package]] name = "virtio-queue" version = "0.2.0" diff --git a/i2c/Cargo.toml b/i2c/Cargo.toml index 212c043..6e3784d 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.3", features = ["vhost-user-slave"] } -vhost-user-backend = "0.1" +vhost-user-backend = "0.2" virtio-bindings = ">=0.1" virtio-queue = "0.2" vm-memory = "0.7" diff --git a/rng/Cargo.toml b/rng/Cargo.toml index 092b9bb..d13f545 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.3", features = ["vhost-user-slave"] } -vhost-user-backend = "0.1" +vhost-user-backend = "0.2" virtio-bindings = ">=0.1" virtio-queue = "0.2" vm-memory = ">=0.7" From b876aa75e977e7c6d64e4a3006d674d9053819d8 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Wed, 9 Mar 2022 10:49:30 +0530 Subject: [PATCH 3/3] Cargo.lock: Update regex version to fix error Move regex to 1.5.5 to fix the build issues. Signed-off-by: Viresh Kumar --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92faf75..a7188fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -290,9 +290,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr",