From 1d55de9c74031569fa6115510df11f6a6587384a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 23:58:46 +0000 Subject: [PATCH] build: Bump virtio-bindings from 0.1.0 to 0.2.0 Bumps [virtio-bindings](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-bindings-v0.2.0) --- updated-dependencies: - dependency-name: virtio-bindings dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 20 +++++++++++++------- block_util/Cargo.toml | 2 +- block_util/src/lib.rs | 2 +- net_util/Cargo.toml | 2 +- net_util/src/ctrl_queue.rs | 2 +- net_util/src/lib.rs | 2 +- vhost_user_block/Cargo.toml | 2 +- vhost_user_block/src/lib.rs | 5 +++-- vhost_user_net/Cargo.toml | 2 +- vhost_user_net/src/lib.rs | 3 ++- virtio-devices/Cargo.toml | 2 +- virtio-devices/src/block.rs | 3 ++- virtio-devices/src/net.rs | 5 +++-- virtio-devices/src/vhost_user/blk.rs | 2 +- virtio-devices/src/vhost_user/net.rs | 4 ++-- virtio-devices/src/vsock/mod.rs | 2 +- virtio-devices/src/vsock/packet.rs | 2 +- 17 files changed, 36 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6eebbe3ee..cd925647e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,7 +152,7 @@ dependencies = [ "versionize", "versionize_derive", "vhdx", - "virtio-bindings", + "virtio-bindings 0.2.0", "virtio-queue", "vm-memory", "vm-virtio", @@ -712,7 +712,7 @@ dependencies = [ "thiserror", "versionize", "versionize_derive", - "virtio-bindings", + "virtio-bindings 0.2.0", "virtio-queue", "vm-memory", "vm-virtio", @@ -1431,7 +1431,7 @@ dependencies = [ "libc", "log", "vhost", - "virtio-bindings", + "virtio-bindings 0.1.0", "virtio-queue", "vm-memory", "vmm-sys-util", @@ -1451,7 +1451,7 @@ dependencies = [ "qcow", "vhost", "vhost-user-backend", - "virtio-bindings", + "virtio-bindings 0.2.0", "virtio-queue", "vm-memory", "vmm-sys-util", @@ -1470,7 +1470,7 @@ dependencies = [ "option_parser", "vhost", "vhost-user-backend", - "virtio-bindings", + "virtio-bindings 0.2.0", "vm-memory", "vmm-sys-util", ] @@ -1481,6 +1481,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b" +[[package]] +name = "virtio-bindings" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9084faf91b9aa9676ae2cac8f1432df2839d9566e6f19f29dbc13a8b831dff" + [[package]] name = "virtio-devices" version = "0.1.0" @@ -1506,7 +1512,7 @@ dependencies = [ "versionize", "versionize_derive", "vhost", - "virtio-bindings", + "virtio-bindings 0.2.0", "virtio-queue", "vm-allocator", "vm-device", @@ -1523,7 +1529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e927d93d54c365034fd7f31a5f458a1f540de4a37c52e892670dad9692173c" dependencies = [ "log", - "virtio-bindings", + "virtio-bindings 0.1.0", "vm-memory", "vmm-sys-util", ] diff --git a/block_util/Cargo.toml b/block_util/Cargo.toml index 4299663ac..711021476 100644 --- a/block_util/Cargo.toml +++ b/block_util/Cargo.toml @@ -17,7 +17,7 @@ thiserror = "1.0.38" versionize = "0.1.9" versionize_derive = "0.1.4" vhdx = { path = "../vhdx" } -virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] } +virtio-bindings = { version = "0.2.0", features = ["virtio-v5_0_0"] } virtio-queue = "0.7.0" vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-virtio = { path = "../vm-virtio" } diff --git a/block_util/src/lib.rs b/block_util/src/lib.rs index 1a1f48c45..1bd16f9b4 100644 --- a/block_util/src/lib.rs +++ b/block_util/src/lib.rs @@ -38,7 +38,7 @@ use std::time::Instant; use thiserror::Error; use versionize::{VersionMap, Versionize, VersionizeResult}; use versionize_derive::Versionize; -use virtio_bindings::bindings::virtio_blk::*; +use virtio_bindings::virtio_blk::*; use virtio_queue::DescriptorChain; use vm_memory::{ bitmap::AtomicBitmap, bitmap::Bitmap, ByteValued, Bytes, GuestAddress, GuestMemory, diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index d91052a62..c00f65f10 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -15,7 +15,7 @@ serde = "1.0.151" thiserror = "1.0.38" versionize = "0.1.9" versionize_derive = "0.1.4" -virtio-bindings = "0.1.0" +virtio-bindings = "0.2.0" virtio-queue = "0.7.0" vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-virtio = { path = "../vm-virtio" } diff --git a/net_util/src/ctrl_queue.rs b/net_util/src/ctrl_queue.rs index 76477d565..dac23c63c 100644 --- a/net_util/src/ctrl_queue.rs +++ b/net_util/src/ctrl_queue.rs @@ -6,7 +6,7 @@ use crate::GuestMemoryMmap; use crate::Tap; use libc::c_uint; use std::sync::Arc; -use virtio_bindings::bindings::virtio_net::{ +use virtio_bindings::virtio_net::{ VIRTIO_NET_CTRL_GUEST_OFFLOADS, VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, VIRTIO_NET_CTRL_MQ, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET, VIRTIO_NET_ERR, VIRTIO_NET_F_GUEST_CSUM, diff --git a/net_util/src/lib.rs b/net_util/src/lib.rs index 37d4d6239..69e34658c 100644 --- a/net_util/src/lib.rs +++ b/net_util/src/lib.rs @@ -21,7 +21,7 @@ use std::{io, mem, net}; use thiserror::Error; use versionize::{VersionMap, Versionize, VersionizeResult}; use versionize_derive::Versionize; -use virtio_bindings::bindings::virtio_net::{ +use virtio_bindings::virtio_net::{ virtio_net_hdr_v1, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX, VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN, VIRTIO_NET_F_GUEST_CSUM, VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6, VIRTIO_NET_F_GUEST_UFO, VIRTIO_NET_F_MAC, VIRTIO_NET_F_MQ, diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index 98453f84a..c2cb68dc9 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -16,7 +16,7 @@ option_parser = { path = "../option_parser" } qcow = { path = "../qcow" } vhost = { version = "0.6.0", features = ["vhost-user-slave"] } vhost-user-backend = "0.8.0" -virtio-bindings = "0.1.0" +virtio-bindings = "0.2.0" virtio-queue = "0.7.0" vm-memory = "0.10.0" vmm-sys-util = "0.11.0" diff --git a/vhost_user_block/src/lib.rs b/vhost_user_block/src/lib.rs index 738b681dc..3323a3193 100644 --- a/vhost_user_block/src/lib.rs +++ b/vhost_user_block/src/lib.rs @@ -31,8 +31,9 @@ use std::{convert, error, fmt, io}; use vhost::vhost_user::message::*; use vhost::vhost_user::Listener; use vhost_user_backend::{VhostUserBackendMut, VhostUserDaemon, VringRwLock, VringState, VringT}; -use virtio_bindings::bindings::virtio_blk::*; -use virtio_bindings::bindings::virtio_ring::VIRTIO_RING_F_EVENT_IDX; +use virtio_bindings::virtio_blk::*; +use virtio_bindings::virtio_config::VIRTIO_F_VERSION_1; +use virtio_bindings::virtio_ring::VIRTIO_RING_F_EVENT_IDX; use virtio_queue::QueueT; use vm_memory::GuestAddressSpace; use vm_memory::{bitmap::AtomicBitmap, ByteValued, Bytes, GuestMemoryAtomic}; diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index 1c621e0b7..75ace8b4b 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -15,7 +15,7 @@ net_util = { path = "../net_util" } option_parser = { path = "../option_parser" } vhost = { version = "0.6.0", features = ["vhost-user-slave"] } vhost-user-backend = "0.8.0" -virtio-bindings = "0.1.0" +virtio-bindings = "0.2.0" vm-memory = "0.10.0" vmm-sys-util = "0.11.0" diff --git a/vhost_user_net/src/lib.rs b/vhost_user_net/src/lib.rs index 975e03bd7..6ed332d76 100644 --- a/vhost_user_net/src/lib.rs +++ b/vhost_user_net/src/lib.rs @@ -24,7 +24,8 @@ use std::vec::Vec; use vhost::vhost_user::message::*; use vhost::vhost_user::Listener; use vhost_user_backend::{VhostUserBackendMut, VhostUserDaemon, VringRwLock, VringT}; -use virtio_bindings::bindings::virtio_net::*; +use virtio_bindings::virtio_config::{VIRTIO_F_NOTIFY_ON_EMPTY, VIRTIO_F_VERSION_1}; +use virtio_bindings::virtio_net::*; use vm_memory::GuestAddressSpace; use vm_memory::{bitmap::AtomicBitmap, GuestMemoryAtomic}; use vmm_sys_util::{epoll::EventSet, eventfd::EventFd}; diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml index c15fdbd47..2a1699382 100644 --- a/virtio-devices/Cargo.toml +++ b/virtio-devices/Cargo.toml @@ -29,7 +29,7 @@ thiserror = "1.0.38" versionize = "0.1.9" versionize_derive = "0.1.4" vhost = { version = "0.6.0", features = ["vhost-user-master", "vhost-user-slave", "vhost-kern", "vhost-vdpa"] } -virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] } +virtio-bindings = { version = "0.2.0", features = ["virtio-v5_0_0"] } virtio-queue = "0.7.0" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } diff --git a/virtio-devices/src/block.rs b/virtio-devices/src/block.rs index 7df75b4b9..0862cdac4 100644 --- a/virtio-devices/src/block.rs +++ b/virtio-devices/src/block.rs @@ -38,7 +38,8 @@ use std::{collections::HashMap, convert::TryInto}; use thiserror::Error; use versionize::{VersionMap, Versionize, VersionizeResult}; use versionize_derive::Versionize; -use virtio_bindings::bindings::virtio_blk::*; +use virtio_bindings::virtio_blk::*; +use virtio_bindings::virtio_config::*; use virtio_queue::{Queue, QueueOwnedT, QueueT}; use vm_memory::{ByteValued, Bytes, GuestAddressSpace, GuestMemoryAtomic, GuestMemoryError}; use vm_migration::VersionMapped; diff --git a/virtio-devices/src/net.rs b/virtio-devices/src/net.rs index f92c5bb26..c57bcb8d1 100644 --- a/virtio-devices/src/net.rs +++ b/virtio-devices/src/net.rs @@ -36,8 +36,9 @@ use std::{collections::HashMap, convert::TryInto}; use thiserror::Error; use versionize::{VersionMap, Versionize, VersionizeResult}; use versionize_derive::Versionize; -use virtio_bindings::bindings::virtio_net::*; -use virtio_bindings::bindings::virtio_ring::VIRTIO_RING_F_EVENT_IDX; +use virtio_bindings::virtio_config::*; +use virtio_bindings::virtio_net::*; +use virtio_bindings::virtio_ring::VIRTIO_RING_F_EVENT_IDX; use virtio_queue::{Queue, QueueT}; use vm_memory::{ByteValued, GuestAddressSpace, GuestMemoryAtomic}; use vm_migration::VersionMapped; diff --git a/virtio-devices/src/vhost_user/blk.rs b/virtio-devices/src/vhost_user/blk.rs index 43608f3e1..8dcd915d4 100644 --- a/virtio-devices/src/vhost_user/blk.rs +++ b/virtio-devices/src/vhost_user/blk.rs @@ -24,7 +24,7 @@ use vhost::vhost_user::message::{ VHOST_USER_CONFIG_OFFSET, }; use vhost::vhost_user::{MasterReqHandler, VhostUserMaster, VhostUserMasterReqHandler}; -use virtio_bindings::bindings::virtio_blk::{ +use virtio_bindings::virtio_blk::{ VIRTIO_BLK_F_BLK_SIZE, VIRTIO_BLK_F_CONFIG_WCE, VIRTIO_BLK_F_DISCARD, VIRTIO_BLK_F_FLUSH, VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_MQ, VIRTIO_BLK_F_RO, VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX, VIRTIO_BLK_F_TOPOLOGY, VIRTIO_BLK_F_WRITE_ZEROES, diff --git a/virtio-devices/src/vhost_user/net.rs b/virtio-devices/src/vhost_user/net.rs index 74d687b93..f51ec4399 100644 --- a/virtio-devices/src/vhost_user/net.rs +++ b/virtio-devices/src/vhost_user/net.rs @@ -21,13 +21,13 @@ use versionize::{VersionMap, Versionize, VersionizeResult}; use versionize_derive::Versionize; use vhost::vhost_user::message::{VhostUserProtocolFeatures, VhostUserVirtioFeatures}; use vhost::vhost_user::{MasterReqHandler, VhostUserMaster, VhostUserMasterReqHandler}; -use virtio_bindings::bindings::virtio_net::{ +use virtio_bindings::virtio_net::{ VIRTIO_NET_F_CSUM, VIRTIO_NET_F_CTRL_VQ, VIRTIO_NET_F_GUEST_CSUM, VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6, VIRTIO_NET_F_GUEST_UFO, VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_TSO6, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_MAC, VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_MTU, }; -use virtio_bindings::bindings::virtio_ring::VIRTIO_RING_F_EVENT_IDX; +use virtio_bindings::virtio_ring::VIRTIO_RING_F_EVENT_IDX; use virtio_queue::{Queue, QueueT}; use vm_memory::{ByteValued, GuestMemoryAtomic}; use vm_migration::{ diff --git a/virtio-devices/src/vsock/mod.rs b/virtio-devices/src/vsock/mod.rs index 742980612..b5c63a15b 100644 --- a/virtio-devices/src/vsock/mod.rs +++ b/virtio-devices/src/vsock/mod.rs @@ -170,7 +170,7 @@ mod tests { use std::os::unix::io::AsRawFd; use std::path::PathBuf; use std::sync::{Arc, RwLock}; - use virtio_bindings::bindings::virtio_ring::{VRING_DESC_F_NEXT, VRING_DESC_F_WRITE}; + use virtio_bindings::virtio_ring::{VRING_DESC_F_NEXT, VRING_DESC_F_WRITE}; use vm_memory::{GuestAddress, GuestMemoryAtomic}; use vm_virtio::queue::testing::VirtQueue as GuestQ; use vmm_sys_util::eventfd::EventFd; diff --git a/virtio-devices/src/vsock/packet.rs b/virtio-devices/src/vsock/packet.rs index 1f728ae13..fcc14ef05 100644 --- a/virtio-devices/src/vsock/packet.rs +++ b/virtio-devices/src/vsock/packet.rs @@ -389,7 +389,7 @@ mod tests { use super::*; use crate::vsock::defs::MAX_PKT_BUF_SIZE; use crate::GuestMemoryMmap; - use virtio_bindings::bindings::virtio_ring::VRING_DESC_F_WRITE; + use virtio_bindings::virtio_ring::VRING_DESC_F_WRITE; use virtio_queue::QueueOwnedT; use vm_memory::GuestAddress; use vm_virtio::queue::testing::VirtqDesc as GuestQDesc;