diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f43bd83..d43081e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog -## Upcoming version +## Unreleased + +### Added +### Changed +### Fixed +### Removed + +## \[v0.17.0\] ### Added diff --git a/Cargo.toml b/Cargo.toml index 4c884563..f378c315 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vm-memory" -version = "0.16.1" +version = "0.17.0" description = "Safe abstractions for accessing the VM physical memory" keywords = ["memory"] categories = ["memory-management"] @@ -23,17 +23,17 @@ xen = ["backend-mmap", "bitflags", "vmm-sys-util"] libc = { version = "0.2.39", optional = true } arc-swap = { version = "1.0.0", optional = true } bitflags = { version = "2.4.0", optional = true } -thiserror = "1.0.40" -vmm-sys-util = { version = "0.12.1", optional = true } +thiserror = "2.0.12" +vmm-sys-util = { version = "0.14.0", optional = true } [target.'cfg(target_family = "windows")'.dependencies.winapi] version = "0.3" features = ["errhandlingapi", "sysinfoapi"] [dev-dependencies] -criterion = "0.5.0" +criterion = "0.6.0" matches = "0.1.0" -vmm-sys-util = "0.12.1" +vmm-sys-util = "0.14.0" [[bench]] name = "main" diff --git a/benches/guest_memory.rs b/benches/guest_memory.rs index f2372e3c..7f3dc4db 100644 --- a/benches/guest_memory.rs +++ b/benches/guest_memory.rs @@ -3,7 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause #![cfg(feature = "backend-mmap")] -pub use criterion::{black_box, Criterion}; +use std::hint::black_box; + +pub use criterion::Criterion; use vm_memory::bitmap::Bitmap; use vm_memory::{GuestAddress, GuestMemory, GuestMemoryMmap}; diff --git a/benches/main.rs b/benches/main.rs index 98dc0a5b..83d50f2a 100644 --- a/benches/main.rs +++ b/benches/main.rs @@ -4,7 +4,7 @@ extern crate criterion; -pub use criterion::{black_box, criterion_group, criterion_main, Criterion}; +pub use criterion::{criterion_group, criterion_main, Criterion}; #[cfg(feature = "backend-mmap")] use vm_memory::{GuestAddress, GuestMemoryMmap}; diff --git a/benches/mmap/mod.rs b/benches/mmap/mod.rs index bbf3ab31..083ad7f2 100644 --- a/benches/mmap/mod.rs +++ b/benches/mmap/mod.rs @@ -8,10 +8,11 @@ extern crate criterion; extern crate vm_memory; use std::fs::{File, OpenOptions}; +use std::hint::black_box; use std::mem::size_of; use std::path::Path; -use criterion::{black_box, Criterion}; +use criterion::Criterion; use vm_memory::{ByteValued, Bytes, GuestAddress, GuestMemory}; diff --git a/benches/volatile.rs b/benches/volatile.rs index 341e28fa..34a532d1 100644 --- a/benches/volatile.rs +++ b/benches/volatile.rs @@ -2,7 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause -pub use criterion::{black_box, Criterion}; +use std::hint::black_box; + +pub use criterion::Criterion; use vm_memory::volatile_memory::VolatileMemory; use vm_memory::VolatileSlice;