Merge branch 'rust-vmm:main' into virtio-actions

rust-vmm · Oct 9, 2024 · bf3f970 · bf3f970
2 parents 1140db0 + d6c8938
commit bf3f970
Show file tree

Hide file tree

Showing 28 changed files with 1,602 additions and 4,844 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "virtio-bindings",
     "virtio-blk",

diff --git a/coverage_config_x86_64.json b/coverage_config_x86_64.json
@@ -1,5 +1,5 @@
 {
-  "coverage_score": 86.05,
+  "coverage_score": 94.33,
   "exclude_path": "virtio-bindings|virtio-queue/src/mock\\.rs",
   "crate_features": "virtio-blk/backend-stdio"
 }
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
@@ -20,7 +20,7 @@ memfd = "0.6.3"
 virtio-queue = { path = "../virtio-queue", features = ["test-utils"] }
 virtio-vsock = { path = "../virtio-vsock" }
 virtio-queue-ser = { path = "../virtio-queue-ser" }
-vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic"] }
+vm-memory = { version = "0.15.0", features = ["backend-mmap", "backend-atomic"] }
 common = { path = "common" }
 virtio-blk = { path = "../virtio-blk", features = ["backend-stdio"] }
 

diff --git a/fuzz/common/Cargo.toml b/fuzz/common/Cargo.toml
@@ -13,4 +13,4 @@ virtio-queue = { path = "../../virtio-queue", features = ["test-utils"] }
 virtio-vsock = { path = "../../virtio-vsock" }
 virtio-queue-ser = { path = "../../virtio-queue-ser" }
 virtio-blk = { path = "../../virtio-blk" }
-vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic"] }
+vm-memory = { version = "0.15.0", features = ["backend-mmap", "backend-atomic"] }
diff --git a/rust-vmm-ci b/rust-vmm-ci
diff --git a/virtio-bindings/CHANGELOG.md b/virtio-bindings/CHANGELOG.md
@@ -1,9 +1,15 @@
 # Upcoming Release
 
+## Changed
+
+- Regenerate bindings with bindgen 0.70.1.
+
+# v0.2.3
+
 ## Added
 
 - Exposed virtio_ids.h bindings as a public module.
-- Regnerate bindings with Linux 6.7.
+- Regenerate bindings with Linux 6.10.
 - Added virtio_input.h bindings.
 
 # v0.2.2

diff --git a/virtio-bindings/CONTRIBUTING.md b/virtio-bindings/CONTRIBUTING.md
@@ -4,9 +4,9 @@
 
 ### Bindgen
 The bindings are currently generated using
-[bindgen](https://rust-lang.github.io/rust-bindgen/) version 0.63.0:
+[bindgen](https://rust-lang.github.io/rust-bindgen/) version 0.70.1:
 ```bash
-cargo install bindgen-cli --vers 0.63.0
+cargo install bindgen-cli --vers 0.70.1
 ```
 
 ### Linux Kernel

diff --git a/virtio-bindings/Cargo.toml b/virtio-bindings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "virtio-bindings"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Sergio Lopez <[email protected]>"]
 description = "Rust FFI bindings to virtio generated using bindgen."
 repository = "https://github.com/rust-vmm/vm-virtio"
+55 −7		.buildkite/autogenerate_pipeline.py
+8 −4		.buildkite/test_description.json
+2 −1		.github/workflows/black.yaml
+3 −0		.platform
+1 −1		CODEOWNERS
+18 −1		README.md