Skip to content

Commit bf3f970

Browse files
Merge branch 'rust-vmm:main' into virtio-actions
2 parents 1140db0 + d6c8938 commit bf3f970

28 files changed

+1602
-4844
lines changed
File renamed without changes.

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[workspace]
2+
resolver = "2"
23
members = [
34
"virtio-bindings",
45
"virtio-blk",

coverage_config_x86_64.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"coverage_score": 86.05,
2+
"coverage_score": 94.33,
33
"exclude_path": "virtio-bindings|virtio-queue/src/mock\\.rs",
44
"crate_features": "virtio-blk/backend-stdio"
55
}

fuzz/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ memfd = "0.6.3"
2020
virtio-queue = { path = "../virtio-queue", features = ["test-utils"] }
2121
virtio-vsock = { path = "../virtio-vsock" }
2222
virtio-queue-ser = { path = "../virtio-queue-ser" }
23-
vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic"] }
23+
vm-memory = { version = "0.15.0", features = ["backend-mmap", "backend-atomic"] }
2424
common = { path = "common" }
2525
virtio-blk = { path = "../virtio-blk", features = ["backend-stdio"] }
2626

fuzz/common/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ virtio-queue = { path = "../../virtio-queue", features = ["test-utils"] }
1313
virtio-vsock = { path = "../../virtio-vsock" }
1414
virtio-queue-ser = { path = "../../virtio-queue-ser" }
1515
virtio-blk = { path = "../../virtio-blk" }
16-
vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic"] }
16+
vm-memory = { version = "0.15.0", features = ["backend-mmap", "backend-atomic"] }

virtio-bindings/CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
# Upcoming Release
22

3+
## Changed
4+
5+
- Regenerate bindings with bindgen 0.70.1.
6+
7+
# v0.2.3
8+
39
## Added
410

511
- Exposed virtio_ids.h bindings as a public module.
6-
- Regnerate bindings with Linux 6.7.
12+
- Regenerate bindings with Linux 6.10.
713
- Added virtio_input.h bindings.
814

915
# v0.2.2

virtio-bindings/CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
### Bindgen
66
The bindings are currently generated using
7-
[bindgen](https://rust-lang.github.io/rust-bindgen/) version 0.63.0:
7+
[bindgen](https://rust-lang.github.io/rust-bindgen/) version 0.70.1:
88
```bash
9-
cargo install bindgen-cli --vers 0.63.0
9+
cargo install bindgen-cli --vers 0.70.1
1010
```
1111

1212
### Linux Kernel

virtio-bindings/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "virtio-bindings"
3-
version = "0.2.2"
3+
version = "0.2.3"
44
authors = ["Sergio Lopez <[email protected]>"]
55
description = "Rust FFI bindings to virtio generated using bindgen."
66
repository = "https://github.com/rust-vmm/vm-virtio"

0 commit comments

Comments
 (0)