Merge branch 'main' into virtio-video

rust-vmm · Oct 23, 2023 · c7cd582 · c7cd582
2 parents 4164375 + c6f586d
commit c7cd582
Show file tree

Hide file tree

Showing 11 changed files with 729 additions and 130 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust-vmm-ci b/rust-vmm-ci
diff --git a/staging/Cargo.lock b/staging/Cargo.lock
diff --git a/staging/coverage_config_x86_64.json b/staging/coverage_config_x86_64.json
@@ -1,5 +1,5 @@
 {
-  "coverage_score": 7.94,
+  "coverage_score": 50.43,
   "exclude_path": "",
   "crate_features": ""
 }
diff --git a/staging/vhost-device-sound/Cargo.toml b/staging/vhost-device-sound/Cargo.toml
@@ -10,6 +10,7 @@ license = "Apache-2.0 OR BSD-3-Clause"
 edition = "2018"
 
 [features]
+xen = ["vm-memory/xen", "vhost/xen", "vhost-user-backend/xen"]
 default = ["alsa-backend", "pw-backend"]
 alsa-backend = ["dep:alsa"]
 pw-backend = ["pw"]
@@ -21,13 +22,15 @@ env_logger = "0.10"
 log = "0.4"
 pw = { package = "pipewire", git = "https://gitlab.freedesktop.org/pipewire/pipewire-rs.git", rev = "5fe090b3ac8f6fed756c4871ac18f26edda3ac89", optional = true }
 thiserror = "1.0"
-vhost = { version = "0.6", features = ["vhost-user-slave"] }
-vhost-user-backend = "0.8"
+vhost = { version = "0.8", features = ["vhost-user-slave"] }
+vhost-user-backend = "0.10"
 virtio-bindings = "0.2.1"
-virtio-queue = "0.7"
-vm-memory = "0.10"
+virtio-queue = "0.9"
+vm-memory = "0.12"
 vmm-sys-util = "0.11"
 
 [dev-dependencies]
-serial_test = "1.0"
 rstest = "0.18.2"
+tempfile = "3.5"
+virtio-queue = { version = "0.9", features = ["test-utils"] }
+vm-memory = { version = "0.12", features = ["backend-mmap", "backend-atomic"] }
+1 −1		.buildkite/test_description.json
+5 −4		README.md
+1 −1		coverage_config_aarch64.json.sample
+1 −1		coverage_config_x86_64.json.sample
+8 −4		integration_tests/test_coverage.py