From 7db741092091ce76466fe75fee02113be9e2b079 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 02:08:42 +0000 Subject: [PATCH] build: bump virtio-queue from 0.2.0 to 0.3.0 Bumps [virtio-queue](https://github.com/rust-vmm/vm-virtio) from 0.2.0 to 0.3.0. - [Release notes](https://github.com/rust-vmm/vm-virtio/releases) - [Commits](https://github.com/rust-vmm/vm-virtio/compare/virtio-queue-v0.2.0...virtio-queue-v0.3.0) Also relies on main branch from vhost-user-backend since it moved to virtio-queue 0.3.0 as well, and without this change it wouldn't compile. --- updated-dependencies: - dependency-name: virtio-queue dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: Sebastien Boeuf --- Cargo.lock | 11 +++++------ Cargo.toml | 2 +- acpi_tables/Cargo.toml | 2 +- arch/Cargo.toml | 2 +- block_util/Cargo.toml | 4 ++-- devices/Cargo.toml | 2 +- fuzz/Cargo.lock | 8 ++++---- fuzz/Cargo.toml | 4 ++-- hypervisor/Cargo.toml | 2 +- net_util/Cargo.toml | 4 ++-- pci/Cargo.toml | 2 +- vfio_user/Cargo.toml | 2 +- vhost_user_block/Cargo.toml | 4 ++-- vhost_user_net/Cargo.toml | 4 ++-- virtio-devices/Cargo.toml | 4 ++-- vm-allocator/Cargo.toml | 2 +- vm-device/Cargo.toml | 2 +- vm-migration/Cargo.toml | 2 +- vm-virtio/Cargo.toml | 4 ++-- vm-virtio/src/lib.rs | 2 +- vmm/Cargo.toml | 4 ++-- 21 files changed, 36 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05569ce8d..6a7d1166d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1181,8 +1181,7 @@ dependencies = [ [[package]] name = "vhost-user-backend" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1490f2028d4f119b2292efe218b5f8cfc6471f039b53b6a6eb5d9513e964facc" +source = "git+https://github.com/rust-vmm/vhost-user-backend?rev=14f58eda14076e973704d4f904850be1146fbb05#14f58eda14076e973704d4f904850be1146fbb05" dependencies = [ "libc", "log", @@ -1273,9 +1272,9 @@ dependencies = [ [[package]] name = "virtio-queue" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3785325315e6496fa88673842ee6cd198b9658e88e8b0e1ad48a5dc818b221dc" +checksum = "88f2d73c184c18f8acc32dab77fcb6e3af92d53262538d3a68aa474810d6863c" dependencies = [ "log", "vm-memory", @@ -1313,9 +1312,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#ca35d96191f8232bd7a [[package]] name = "vm-memory" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339d4349c126fdcd87e034631d7274370cf19eb0e87b33166bcd956589fc72c5" +checksum = "767ed8aaebbff902e02e6d3749dc2baef55e46565f8a6414a065e5baee4b4a81" dependencies = [ "arc-swap", "libc", diff --git a/Cargo.toml b/Cargo.toml index c3ed4ee2c..3802c0425 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ signal-hook = "0.3.13" thiserror = "1.0.31" vmm = { path = "vmm" } vmm-sys-util = "0.9.0" -vm-memory = "0.7.0" +vm-memory = "0.8.0" [build-dependencies] clap = { version = "3.1.18", features = ["cargo"] } diff --git a/acpi_tables/Cargo.toml b/acpi_tables/Cargo.toml index 930ed9ca3..25ddb41e9 100644 --- a/acpi_tables/Cargo.toml +++ b/acpi_tables/Cargo.toml @@ -5,4 +5,4 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2021" [dependencies] -vm-memory = "0.7.0" +vm-memory = "0.8.0" diff --git a/arch/Cargo.toml b/arch/Cargo.toml index 53512fad2..80282fe79 100644 --- a/arch/Cargo.toml +++ b/arch/Cargo.toml @@ -21,7 +21,7 @@ serde_derive = "1.0.137" thiserror = "1.0.31" versionize = "0.1.6" versionize_derive = "0.1.4" -vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-bitmap"] } +vm-memory = { version = "0.8.0", features = ["backend-mmap", "backend-bitmap"] } vm-migration = { path = "../vm-migration" } vmm-sys-util = { version = "0.9.0", features = ["with-serde"] } diff --git a/block_util/Cargo.toml b/block_util/Cargo.toml index c1ea9c150..2cd5ce386 100644 --- a/block_util/Cargo.toml +++ b/block_util/Cargo.toml @@ -17,8 +17,8 @@ versionize = "0.1.6" versionize_derive = "0.1.4" vhdx = { path = "../vhdx" } virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] } -virtio-queue = "0.2.0" -vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +virtio-queue = "0.3.0" +vm-memory = { version = "0.8.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-virtio = { path = "../vm-virtio" } vmm-sys-util = "0.9.0" diff --git a/devices/Cargo.toml b/devices/Cargo.toml index c6b9e522d..06b5a36e8 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -16,7 +16,7 @@ log = "0.4.17" versionize = "0.1.6" versionize_derive = "0.1.4" vm-device = { path = "../vm-device" } -vm-memory = "0.7.0" +vm-memory = "0.8.0" vm-migration = { path = "../vm-migration" } vmm-sys-util = "0.9.0" diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 6afc6ae70..669f89246 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -865,9 +865,9 @@ dependencies = [ [[package]] name = "virtio-queue" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3785325315e6496fa88673842ee6cd198b9658e88e8b0e1ad48a5dc818b221dc" +checksum = "88f2d73c184c18f8acc32dab77fcb6e3af92d53262538d3a68aa474810d6863c" dependencies = [ "log", "vm-memory", @@ -905,9 +905,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#720e48e435b791ec6cb [[package]] name = "vm-memory" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339d4349c126fdcd87e034631d7274370cf19eb0e87b33166bcd956589fc72c5" +checksum = "767ed8aaebbff902e02e6d3749dc2baef55e46565f8a6414a065e5baee4b4a81" dependencies = [ "arc-swap", "libc", diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index ccd96d521..663530934 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -16,10 +16,10 @@ qcow = { path = "../qcow" } seccompiler = "0.2.0" vhdx = { path = "../vhdx" } virtio-devices = { path = "../virtio-devices" } -virtio-queue = "0.2.0" +virtio-queue = "0.3.0" vmm-sys-util = "0.9.0" vm-virtio = { path = "../vm-virtio" } -vm-memory = "0.7.0" +vm-memory = "0.8.0" [dependencies.cloud-hypervisor] path = ".." diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index eebb5f6cc..49a41d147 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -23,7 +23,7 @@ mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optio serde = { version = "1.0.137", features = ["rc"] } serde_derive = "1.0.137" serde_json = "1.0.81" -vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic"] } +vm-memory = { version = "0.8.0", features = ["backend-mmap", "backend-atomic"] } vmm-sys-util = { version = "0.9.0", features = ["with-serde"] } [target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86] diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index a2b8a1202..d98ed8b70 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -15,8 +15,8 @@ serde = "1.0.137" versionize = "0.1.6" versionize_derive = "0.1.4" virtio-bindings = "0.1.0" -virtio-queue = "0.2.0" -vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +virtio-queue = "0.3.0" +vm-memory = { version = "0.8.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-virtio = { path = "../vm-virtio" } vmm-sys-util = "0.9.0" diff --git a/pci/Cargo.toml b/pci/Cargo.toml index 4b276ee18..3192c0b4f 100644 --- a/pci/Cargo.toml +++ b/pci/Cargo.toml @@ -25,7 +25,7 @@ versionize = "0.1.6" versionize_derive = "0.1.4" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = "0.7.0" +vm-memory = "0.8.0" vm-migration = { path = "../vm-migration" } [dependencies.vfio-bindings] diff --git a/vfio_user/Cargo.toml b/vfio_user/Cargo.toml index 73a2b7d23..a9c9ea0b4 100644 --- a/vfio_user/Cargo.toml +++ b/vfio_user/Cargo.toml @@ -12,7 +12,7 @@ serde = {version = ">=1.0.27", features = ["rc"] } serde_derive = ">=1.0.27" serde_json = ">=1.0.9" thiserror = "1.0.31" -vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic"] } +vm-memory = { version = "0.8.0", features = ["backend-mmap", "backend-atomic"] } vmm-sys-util = ">=0.3.1" [dependencies.vfio-bindings] diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index d6ceb4e7d..5bd4c8e26 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -14,9 +14,9 @@ log = "0.4.17" option_parser = { path = "../option_parser" } qcow = { path = "../qcow" } vhost = { version = "0.4.0", features = ["vhost-user-slave"] } -vhost-user-backend = "0.3.0" +vhost-user-backend = { git = "https://github.com/rust-vmm/vhost-user-backend", rev = "14f58eda14076e973704d4f904850be1146fbb05" } virtio-bindings = "0.1.0" -vm-memory = "0.7.0" +vm-memory = "0.8.0" vmm-sys-util = "0.9.0" [build-dependencies] diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index 54eea0c98..dd553e246 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -13,9 +13,9 @@ log = "0.4.17" net_util = { path = "../net_util" } option_parser = { path = "../option_parser" } vhost = { version = "0.4.0", features = ["vhost-user-slave"] } -vhost-user-backend = "0.3.0" +vhost-user-backend = { git = "https://github.com/rust-vmm/vhost-user-backend", rev = "14f58eda14076e973704d4f904850be1146fbb05" } virtio-bindings = "0.1.0" -vm-memory = "0.7.0" +vm-memory = "0.8.0" vmm-sys-util = "0.9.0" [build-dependencies] diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml index c6a210987..c938ff73c 100644 --- a/virtio-devices/Cargo.toml +++ b/virtio-devices/Cargo.toml @@ -31,10 +31,10 @@ versionize = "0.1.6" versionize_derive = "0.1.4" vhost = { version = "0.4.0", features = ["vhost-user-master", "vhost-user-slave", "vhost-kern", "vhost-vdpa"] } virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] } -virtio-queue = "0.2.0" +virtio-queue = "0.3.0" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.8.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-migration = { path = "../vm-migration" } vm-virtio = { path = "../vm-virtio" } vmm-sys-util = "0.9.0" diff --git a/vm-allocator/Cargo.toml b/vm-allocator/Cargo.toml index a7e9f5ce7..650dcc38f 100644 --- a/vm-allocator/Cargo.toml +++ b/vm-allocator/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] libc = "0.2.125" -vm-memory = "0.7.0" +vm-memory = "0.8.0" arch = { path = "../arch" } diff --git a/vm-device/Cargo.toml b/vm-device/Cargo.toml index 1a020bee7..a51e77bde 100644 --- a/vm-device/Cargo.toml +++ b/vm-device/Cargo.toml @@ -17,6 +17,6 @@ serde = { version = "1.0.137", features = ["rc"] } serde_derive = "1.0.137" serde_json = "1.0.81" vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false } -vm-memory = { version = "0.7.0", features = ["backend-mmap"] } +vm-memory = { version = "0.8.0", features = ["backend-mmap"] } vmm-sys-util = "0.9.0" diff --git a/vm-migration/Cargo.toml b/vm-migration/Cargo.toml index b62b2d8ad..afea0b7e1 100644 --- a/vm-migration/Cargo.toml +++ b/vm-migration/Cargo.toml @@ -12,4 +12,4 @@ serde_derive = "1.0.137" serde_json = "1.0.81" versionize = "0.1.6" versionize_derive = "0.1.4" -vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic"] } +vm-memory = { version = "0.8.0", features = ["backend-mmap", "backend-atomic"] } diff --git a/vm-virtio/Cargo.toml b/vm-virtio/Cargo.toml index a164405dd..65b044d96 100644 --- a/vm-virtio/Cargo.toml +++ b/vm-virtio/Cargo.toml @@ -10,5 +10,5 @@ default = [] [dependencies] log = "0.4.17" virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] } -virtio-queue = "0.2.0" -vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +virtio-queue = "0.3.0" +vm-memory = { version = "0.8.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } diff --git a/vm-virtio/src/lib.rs b/vm-virtio/src/lib.rs index a84959168..d6e0ebf79 100644 --- a/vm-virtio/src/lib.rs +++ b/vm-virtio/src/lib.rs @@ -135,7 +135,7 @@ pub fn clone_queue( next_avail: queue.state.next_avail, next_used: queue.state.next_used, event_idx_enabled: queue.state.event_idx_enabled, - signalled_used: queue.state.signalled_used, + num_added: queue.state.num_added, size: queue.state.size, ready: queue.state.ready, desc_table: queue.state.desc_table, diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index 7da198dcb..7be53882a 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -50,10 +50,10 @@ vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", defau vfio_user = { path = "../vfio_user" } vhdx = { path = "../vhdx" } virtio-devices = { path = "../virtio-devices" } -virtio-queue = "0.2.0" +virtio-queue = "0.3.0" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } +vm-memory = { version = "0.8.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-migration = { path = "../vm-migration" } vm-virtio = { path = "../vm-virtio" } vmm-sys-util = { version = "0.9.0", features = ["with-serde"] }