Skip to content

chore: move rust-vmm deps to workspace dependencies #942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hanbings wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: move rust-vmm deps to workspace dependencies #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ members = [
"xtask",
]

[workspace.dependencies]
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
virtio-vsock = "0.11"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"

[workspace.lints.rust]
unsafe_op_in_unsafe_fn = "deny"

Expand Down
11 changes: 10 additions & 1 deletion staging/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
[workspace]
resolver = "2"

members = [
"vhost-device-video",
"vhost-device-video",
]

[workspace.dependencies]
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
16 changes: 8 additions & 8 deletions staging/vhost-device-video/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ log = "0.4"
libc = "0.2.182"
thiserror = "2.0"
futures-executor = { version = "0.3", features = ["thread-pool"] }
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true, features = ["vhost-user-backend"] }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }
v4l2r = { git = "https://github.com/Gnurou/v4l2r", rev = "110fd77", optional = true }

[dev-dependencies]
assert_matches = "1.5"
rstest = "0.26.1"
tempfile = "3.26.0"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }
16 changes: 8 additions & 8 deletions vhost-device-can/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ log = "0.4"
thiserror = "2.0"
queues = "1.0.2"
socketcan = "3.5.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }

[dev-dependencies]
assert_matches = "1.5"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }
16 changes: 8 additions & 8 deletions vhost-device-console/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ env_logger = "0.11"
epoll = "4.4"
log = "0.4"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }

[dev-dependencies]
assert_matches = "1.5"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }

[lints]
workspace = true
16 changes: 8 additions & 8 deletions vhost-device-gpio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ env_logger = "0.11"
libc = "0.2"
log = "0.4"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }

[target.'cfg(target_env = "gnu")'.dependencies]
libgpiod = "1.0"

[dev-dependencies]
assert_matches = "1.5"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }
16 changes: 8 additions & 8 deletions vhost-device-gpu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ log = "0.4"
rutabaga_gfx = "0.1.75"
thiserror = "2.0.18"
virglrenderer = {version = "0.1.3", optional = true }
vhost = { version = "0.15.0", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17.0"
vm-memory = "0.17.1"
vmm-sys-util = "0.15.0"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }
bitflags = "2.11.0"
uuid = { version = "1.19", features = ["v4"] }

Expand All @@ -43,5 +43,5 @@ assert_matches = "1.5"
mockall = "0.14.0"
rusty-fork = "0.3.1"
tempfile = "3.26"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }
16 changes: 8 additions & 8 deletions vhost-device-i2c/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ env_logger = "0.11"
libc = "0.2"
log = "0.4"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }

[dev-dependencies]
assert_matches = "1.5"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }

[lints]
workspace = true
16 changes: 8 additions & 8 deletions vhost-device-input/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ log = "0.4"
rand = "0.10.0"
tempfile = "3.26"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }
evdev = "0.13"
nix = { version = "0.31", features = ["ioctl"] }

[dev-dependencies]
assert_matches = "1.5"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }

[lints]
workspace = true
16 changes: 8 additions & 8 deletions vhost-device-rng/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ log = "0.4"
rand = "0.10.0"
tempfile = "3.26"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }

[dev-dependencies]
assert_matches = "1.5"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }

[lints]
workspace = true
14 changes: 7 additions & 7 deletions vhost-device-scmi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ env_logger = "0.11"
itertools = "0.14"
log = "0.4"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }

[dev-dependencies]
assert_matches = "1.5"
virtio-queue = { version = "0.17", features = ["test-utils"] }
virtio-queue = { workspace = true, features = ["test-utils"] }

[lints]
workspace = true
14 changes: 7 additions & 7 deletions vhost-device-scsi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ env_logger = "0.11"
epoll = "4.4"
log = "0.4"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }

[dev-dependencies]
assert_matches = "1.5"
tempfile = "3.26.0"
virtio-queue = { version = "0.17", features = ["test-utils"] }
virtio-queue = { workspace = true, features = ["test-utils"] }

[lints]
workspace = true
16 changes: 8 additions & 8 deletions vhost-device-sound/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ clap = { version = "4.5", features = ["derive"] }
env_logger = "0.11"
log = "0.4"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }

# Make alsa and pipewire backends available only on gnu
[target.'cfg(target_env = "gnu")'.dependencies]
Expand All @@ -40,8 +40,8 @@ gst-audio = {package = "gstreamer-audio", version = "0.24.2", optional = true, f
[dev-dependencies]
rstest = "0.26.1"
tempfile = "3.26"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }

[target.'cfg(target_env = "gnu")'.dev-dependencies]
rand = { version = "0.10.0" }
Expand Down
16 changes: 8 additions & 8 deletions vhost-device-spi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ env_logger = "0.11"
libc = "0.2"
log = "0.4"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }
bitflags = "2.11.0"

[dev-dependencies]
assert_matches = "1.5"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }

[lints]
workspace = true
16 changes: 8 additions & 8 deletions vhost-device-template/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ env_logger = "0.11"
libc = "0.2"
log = "0.4"
thiserror = "2.0"
vhost = { version = "0.15", features = ["vhost-user-backend"] }
vhost-user-backend = "0.21"
virtio-bindings = "0.2.5"
virtio-queue = "0.17"
vm-memory = "0.17.1"
vmm-sys-util = "0.15"
vhost = { workspace = true }
vhost-user-backend = { workspace = true }
virtio-bindings = { workspace = true }
virtio-queue = { workspace = true }
vm-memory = { workspace = true }
vmm-sys-util = { workspace = true }

[dev-dependencies]
assert_matches = "1.5"
virtio-queue = { version = "0.17", features = ["test-utils"] }
vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
virtio-queue = { workspace = true, features = ["test-utils"] }
vm-memory = { workspace = true, features = ["backend-mmap", "backend-atomic"] }

[lints]
workspace = true
Loading