From 2ebba0910cafc1db730cca3d470011302c9dbe5c Mon Sep 17 00:00:00 2001 From: Erik Schilling Date: Tue, 4 Jul 2023 07:17:34 +0200 Subject: [PATCH] build(deps): switch to released virtio-bindings This version brings the SCSI bindings and allows us to drop the git dependency (which was complicating the packaging situation). Thanks-to: Jiang Liu Signed-off-by: Erik Schilling --- Cargo.lock | 25 ++++++++++--------------- crates/gpio/Cargo.toml | 2 +- crates/i2c/Cargo.toml | 2 +- crates/rng/Cargo.toml | 2 +- crates/scsi/Cargo.toml | 3 +-- crates/vsock/Cargo.toml | 2 +- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a95fec2..8c240e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1287,7 +1287,7 @@ dependencies = [ "thiserror", "vhost", "vhost-user-backend", - "virtio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "virtio-bindings", "virtio-queue", "vm-memory", "vmm-sys-util", @@ -1304,7 +1304,7 @@ dependencies = [ "thiserror", "vhost", "vhost-user-backend", - "virtio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "virtio-bindings", "virtio-queue", "vm-memory", "vmm-sys-util", @@ -1324,7 +1324,7 @@ dependencies = [ "thiserror", "vhost", "vhost-user-backend", - "virtio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "virtio-bindings", "virtio-queue", "vm-memory", "vmm-sys-util", @@ -1343,7 +1343,7 @@ dependencies = [ "thiserror", "vhost", "vhost-user-backend", - "virtio-bindings 0.2.0 (git+https://github.com/rust-vmm/vm-virtio?rev=467c8ec99375a5f4e08b85b18257cd7e0bac1dc0)", + "virtio-bindings", "virtio-queue", "vm-memory", "vmm-sys-util", @@ -1358,7 +1358,7 @@ dependencies = [ "libc", "log", "vhost", - "virtio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "virtio-bindings", "virtio-queue", "vm-memory", "vmm-sys-util", @@ -1381,7 +1381,7 @@ dependencies = [ "thiserror", "vhost", "vhost-user-backend", - "virtio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "virtio-bindings", "virtio-queue", "virtio-vsock", "vm-memory", @@ -1390,14 +1390,9 @@ dependencies = [ [[package]] name = "virtio-bindings" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9084faf91b9aa9676ae2cac8f1432df2839d9566e6f19f29dbc13a8b831dff" - -[[package]] -name = "virtio-bindings" -version = "0.2.0" -source = "git+https://github.com/rust-vmm/vm-virtio?rev=467c8ec99375a5f4e08b85b18257cd7e0bac1dc0#467c8ec99375a5f4e08b85b18257cd7e0bac1dc0" +checksum = "c18d7b74098a946470ea265b5bacbbf877abc3373021388454de0d47735a5b98" [[package]] name = "virtio-queue" @@ -1406,7 +1401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91aebb1df33db33cbf04d4c2445e4f78d0b0c8e65acfd16a4ee95ef63ca252f8" dependencies = [ "log", - "virtio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "virtio-bindings", "vm-memory", "vmm-sys-util", ] @@ -1417,7 +1412,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb198c4dd87bf0b4f6b5d8cb41284fca13763a5a1a7e5b8a7ccce45e46d4cf73" dependencies = [ - "virtio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "virtio-bindings", "virtio-queue", "vm-memory", ] diff --git a/crates/gpio/Cargo.toml b/crates/gpio/Cargo.toml index edd3049..d3f85a2 100644 --- a/crates/gpio/Cargo.toml +++ b/crates/gpio/Cargo.toml @@ -19,7 +19,7 @@ log = "0.4" thiserror = "1.0" vhost = { version = "0.7", features = ["vhost-user-slave"] } vhost-user-backend = "0.9" -virtio-bindings = "0.2" +virtio-bindings = "0.2.1" virtio-queue = "0.8" vm-memory = "0.11" vmm-sys-util = "0.11" diff --git a/crates/i2c/Cargo.toml b/crates/i2c/Cargo.toml index 0505d88..a610d8a 100644 --- a/crates/i2c/Cargo.toml +++ b/crates/i2c/Cargo.toml @@ -19,7 +19,7 @@ log = "0.4" thiserror = "1.0" vhost = { version = "0.7", features = ["vhost-user-slave"] } vhost-user-backend = "0.9" -virtio-bindings = "0.2" +virtio-bindings = "0.2.1" virtio-queue = "0.8" vm-memory = "0.11" vmm-sys-util = "0.11" diff --git a/crates/rng/Cargo.toml b/crates/rng/Cargo.toml index b39d8f9..043a98b 100644 --- a/crates/rng/Cargo.toml +++ b/crates/rng/Cargo.toml @@ -20,7 +20,7 @@ tempfile = "3.5" thiserror = "1.0" vhost = { version = "0.7", features = ["vhost-user-slave"] } vhost-user-backend = "0.9" -virtio-bindings = "0.2" +virtio-bindings = "0.2.1" virtio-queue = "0.8" vm-memory = "0.11" vmm-sys-util = "0.11" diff --git a/crates/scsi/Cargo.toml b/crates/scsi/Cargo.toml index b1b9d9d..a2194fa 100644 --- a/crates/scsi/Cargo.toml +++ b/crates/scsi/Cargo.toml @@ -20,8 +20,7 @@ num_enum = "0.5" thiserror = "1.0" vhost = { version = "0.7", features = ["vhost-user-slave"] } vhost-user-backend = "0.9" -# until the scsi bindings hit a release, we have to use the commit that adds them as rev. -virtio-bindings = { git = "https://github.com/rust-vmm/vm-virtio", rev = "467c8ec99375a5f4e08b85b18257cd7e0bac1dc0" } +virtio-bindings = "0.2.1" virtio-queue = "0.8" vm-memory = "0.11" vmm-sys-util = "0.11" diff --git a/crates/vsock/Cargo.toml b/crates/vsock/Cargo.toml index 6b149e6..04240b1 100644 --- a/crates/vsock/Cargo.toml +++ b/crates/vsock/Cargo.toml @@ -19,7 +19,7 @@ log = "0.4" thiserror = "1.0" vhost = { version = "0.7", features = ["vhost-user-slave"] } vhost-user-backend = "0.9" -virtio-bindings = "0.2" +virtio-bindings = "0.2.1" virtio-queue = "0.8" virtio-vsock = "0.3.0" vm-memory = "0.11"