Skip to content

Commit c7cd582

Browse files
authored
Merge branch 'main' into virtio-video
2 parents 4164375 + c6f586d commit c7cd582

File tree

11 files changed

+729
-130
lines changed

11 files changed

+729
-130
lines changed

Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/Cargo.lock

Lines changed: 22 additions & 100 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/coverage_config_x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"coverage_score": 7.94,
2+
"coverage_score": 50.43,
33
"exclude_path": "",
44
"crate_features": ""
55
}

staging/vhost-device-sound/Cargo.toml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ license = "Apache-2.0 OR BSD-3-Clause"
1010
edition = "2018"
1111

1212
[features]
13+
xen = ["vm-memory/xen", "vhost/xen", "vhost-user-backend/xen"]
1314
default = ["alsa-backend", "pw-backend"]
1415
alsa-backend = ["dep:alsa"]
1516
pw-backend = ["pw"]
@@ -21,13 +22,15 @@ env_logger = "0.10"
2122
log = "0.4"
2223
pw = { package = "pipewire", git = "https://gitlab.freedesktop.org/pipewire/pipewire-rs.git", rev = "5fe090b3ac8f6fed756c4871ac18f26edda3ac89", optional = true }
2324
thiserror = "1.0"
24-
vhost = { version = "0.6", features = ["vhost-user-slave"] }
25-
vhost-user-backend = "0.8"
25+
vhost = { version = "0.8", features = ["vhost-user-slave"] }
26+
vhost-user-backend = "0.10"
2627
virtio-bindings = "0.2.1"
27-
virtio-queue = "0.7"
28-
vm-memory = "0.10"
28+
virtio-queue = "0.9"
29+
vm-memory = "0.12"
2930
vmm-sys-util = "0.11"
3031

3132
[dev-dependencies]
32-
serial_test = "1.0"
3333
rstest = "0.18.2"
34+
tempfile = "3.5"
35+
virtio-queue = { version = "0.9", features = ["test-utils"] }
36+
vm-memory = { version = "0.12", features = ["backend-mmap", "backend-atomic"] }

0 commit comments

Comments
 (0)