workspace: update to Rust edition 2024

phip1611 · phip1611 · commit 6f48f7af195c · 2025-08-12T13:23:13.000+02:00
Signed-off-by: Philipp Schuster &lt;philipp.schuster@cyberus-technology.de&gt;
On-behalf-of: SAP philipp.schuster@sap.com
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,7 @@
 [workspace]
-resolver = "2"
+package.edition = "2024"
+package.rust-version = "1.85"
+resolver = "3"
 members = [
     "kvm-bindings",
     "kvm-ioctls",
diff --git a/kvm-bindings/CHANGELOG.md b/kvm-bindings/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Upcoming Release
 
+### Changed
+- Rust edition 2024
+
 ## v0.13.0
 
 ### Added
diff --git a/kvm-bindings/CONTRIBUTING.md b/kvm-bindings/CONTRIBUTING.md
@@ -4,14 +4,14 @@
 
 ### Bindgen
 The bindings are currently generated using
-[bindgen](https://crates.io/crates/bindgen) version 0.70.1:
+[bindgen](https://crates.io/crates/bindgen) version 0.72.0:
 ```bash
-cargo install bindgen-cli --vers 0.70.1
+cargo install bindgen-cli --vers 0.72.0
 ```
 
 ### Linux Kernel
 Generating bindings depends on the Linux kernel, so you need to have the
-repository on your machine. Replace `v6.9` with the kernel release for
+repository on your machine. Replace `v6.16` with the kernel release for
 which you wish to generate bindings:
 
 ```bash
@@ -23,7 +23,7 @@ git clone https://github.com/torvalds/linux.git --branch v6.9 --depth 1
 When adding a new architecture, the bindings must be generated for all existing
 versions for consistency reasons.
 
-### Example for arm64 and kernel version 6.9
+### Example for arm64 and kernel version 6.16
 
 For this example we assume that you have both linux and kvm-bindings
 repositories in your root.
@@ -44,7 +44,7 @@ export ARCH=arm64
 make headers_install ARCH=$ARCH INSTALL_HDR_PATH="$ARCH"_headers
 pushd "$ARCH"_headers
 bindgen include/linux/kvm.h -o bindings.rs  \
-     --impl-debug --with-derive-default  \
+     --impl-debug --with-derive-default --rust-edition 2024  \
      --with-derive-partialeq  --impl-partialeq \
      -- -Iinclude
 popd
diff --git a/kvm-bindings/Cargo.toml b/kvm-bindings/Cargo.toml
@@ -7,6 +7,8 @@ repository = "https://github.com/rust-vmm/kvm"
 readme = "README.md"
 keywords = ["kvm"]
 license = "Apache-2.0"
+edition.workspace = true
+rust-version.workspace = true
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/kvm-bindings/src/arm64/bindings.rs b/kvm-bindings/src/arm64/bindings.rs
@@ -22,11 +22,11 @@ impl<T> __IncompleteArrayField<T> {
     }
     #[inline]
     pub unsafe fn as_slice(&self, len: usize) -> &[T] {
-        ::std::slice::from_raw_parts(self.as_ptr(), len)
+        unsafe { ::std::slice::from_raw_parts(self.as_ptr(), len) }
     }
     #[inline]
     pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] {
-        ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len)
+        unsafe { ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len) }
     }
 }
 impl<T> ::std::fmt::Debug for __IncompleteArrayField<T> {
diff --git a/kvm-bindings/src/arm64/fam_wrappers.rs b/kvm-bindings/src/arm64/fam_wrappers.rs
@@ -3,7 +3,7 @@
 
 use vmm_sys_util::fam::{FamStruct, FamStructWrapper};
 
-use arm64::bindings::*;
+use super::bindings::*;
 
 // There is no constant in the kernel as far as the maximum number
 // of registers on arm, but KVM_GET_REG_LIST usually returns around 450.
diff --git a/kvm-bindings/src/arm64/serialize.rs b/kvm-bindings/src/arm64/serialize.rs
@@ -1,10 +1,10 @@
-use bindings::{
+use super::bindings::{
     kvm_irq_routing, kvm_irq_routing_entry, kvm_irq_routing_entry__bindgen_ty_1,
     kvm_irq_routing_msi__bindgen_ty_1, kvm_mp_state, kvm_one_reg, kvm_regs, kvm_vcpu_init,
     user_fpsimd_state, user_pt_regs,
 };
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use zerocopy::{transmute, IntoBytes};
+use zerocopy::{IntoBytes, transmute};
 
 serde_impls! {
     user_pt_regs,
@@ -43,7 +43,7 @@ unsafe impl IntoBytes for kvm_irq_routing_entry__bindgen_ty_1 {
 
 #[cfg(test)]
 mod tests {
-    use bindings::*;
+    use super::*;
     use serde::{Deserialize, Serialize};
 
     fn is_serde<T: Serialize + for<'de> Deserialize<'de> + Default>() {
diff --git a/kvm-bindings/src/lib.rs b/kvm-bindings/src/lib.rs
@@ -6,6 +6,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
+#![deny(clippy::undocumented_unsafe_blocks)]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
 #[cfg(feature = "fam-wrappers")]
diff --git a/kvm-bindings/src/riscv64/bindings.rs b/kvm-bindings/src/riscv64/bindings.rs
@@ -22,11 +22,11 @@ impl<T> __IncompleteArrayField<T> {
     }
     #[inline]
     pub unsafe fn as_slice(&self, len: usize) -> &[T] {
-        ::std::slice::from_raw_parts(self.as_ptr(), len)
+        unsafe { ::std::slice::from_raw_parts(self.as_ptr(), len) }
     }
     #[inline]
     pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] {
-        ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len)
+        unsafe { ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len) }
     }
 }
 impl<T> ::std::fmt::Debug for __IncompleteArrayField<T> {
diff --git a/kvm-bindings/src/riscv64/fam_wrappers.rs b/kvm-bindings/src/riscv64/fam_wrappers.rs
@@ -4,7 +4,7 @@
 
 use vmm_sys_util::fam::{FamStruct, FamStructWrapper};
 
-use riscv64::bindings::*;
+use super::bindings::*;
 
 // There is no constant in the kernel as far as the maximum number
 // of registers on RISC-V, but KVM_GET_REG_LIST usually returns around 160.
diff --git a/kvm-bindings/src/riscv64/serialize.rs b/kvm-bindings/src/riscv64/serialize.rs
@@ -2,14 +2,14 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use bindings::{
+use super::bindings::{
     kvm_irq_routing, kvm_irq_routing_entry, kvm_irq_routing_entry__bindgen_ty_1,
     kvm_irq_routing_msi__bindgen_ty_1, kvm_mp_state, kvm_one_reg, kvm_riscv_aia_csr,
     kvm_riscv_config, kvm_riscv_core, kvm_riscv_csr, kvm_riscv_sbi_sta, kvm_riscv_smstateen_csr,
     kvm_riscv_timer, user_regs_struct,
 };
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use zerocopy::{transmute, IntoBytes};
+use zerocopy::{IntoBytes, transmute};
 
 serde_impls! {
     kvm_mp_state,
@@ -52,7 +52,7 @@ unsafe impl IntoBytes for kvm_irq_routing_entry__bindgen_ty_1 {
 
 #[cfg(test)]
 mod tests {
-    use bindings::*;
+    use super::*;
     use serde::{Deserialize, Serialize};
 
     fn is_serde<T: Serialize + for<'de> Deserialize<'de> + Default>() {
diff --git a/kvm-bindings/src/x86_64/bindings.rs b/kvm-bindings/src/x86_64/bindings.rs
@@ -106,11 +106,11 @@ impl<T> __IncompleteArrayField<T> {
     }
     #[inline]
     pub unsafe fn as_slice(&self, len: usize) -> &[T] {
-        ::std::slice::from_raw_parts(self.as_ptr(), len)
+        unsafe { ::std::slice::from_raw_parts(self.as_ptr(), len) }
     }
     #[inline]
     pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] {
-        ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len)
+        unsafe { ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len) }
     }
 }
 impl<T> ::std::fmt::Debug for __IncompleteArrayField<T> {
@@ -127,11 +127,11 @@ impl<T> __BindgenUnionField<T> {
     }
     #[inline]
     pub unsafe fn as_ref(&self) -> &T {
-        ::std::mem::transmute(self)
+        unsafe { ::std::mem::transmute(self) }
     }
     #[inline]
     pub unsafe fn as_mut(&mut self) -> &mut T {
-        ::std::mem::transmute(self)
+        unsafe { ::std::mem::transmute(self) }
     }
 }
 impl<T> ::std::default::Default for __BindgenUnionField<T> {
diff --git a/kvm-bindings/src/x86_64/fam_wrappers.rs b/kvm-bindings/src/x86_64/fam_wrappers.rs
@@ -3,7 +3,7 @@
 
 use vmm_sys_util::fam::{FamStruct, FamStructWrapper};
 
-use x86_64::bindings::*;
+use super::bindings::*;
 
 /// Maximum number of CPUID entries that can be returned by a call to KVM ioctls.
 ///
@@ -199,11 +199,8 @@ pub type Xsave = FamStructWrapper<kvm_xsave2>;
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use crate::KvmIrqRouting;
-
-    use super::{CpuId, MsrList, Msrs, Xsave};
-    use x86_64::bindings::kvm_cpuid_entry2;
-
     use vmm_sys_util::fam::FamStruct;
 
     #[test]
diff --git a/kvm-bindings/src/x86_64/nested.rs b/kvm-bindings/src/x86_64/nested.rs
@@ -4,9 +4,9 @@
 //! is used and the state needs to be serialized, e.g., for live-migration or
 //! state save/resume. See [`KvmNestedStateBuffer`].
 
+use crate::KVM_STATE_NESTED_SVM_VMCB_SIZE;
 use core::mem;
-use KVM_STATE_NESTED_SVM_VMCB_SIZE;
-use {kvm_nested_state__bindgen_ty_1, KVM_STATE_NESTED_VMX_VMCS_SIZE};
+use crate::{KVM_STATE_NESTED_VMX_VMCS_SIZE, kvm_nested_state__bindgen_ty_1};
 
 /// Non-zero variant of the bindgen data union.
 ///
diff --git a/kvm-bindings/src/x86_64/serialize.rs b/kvm-bindings/src/x86_64/serialize.rs
@@ -1,19 +1,18 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use bindings::{
-    kvm_clock_data, kvm_cpuid2, kvm_cpuid_entry2, kvm_debugregs, kvm_dtable,
+use super::bindings::{
+    kvm_clock_data, kvm_cpuid_entry2, kvm_cpuid2, kvm_debugregs, kvm_dtable,
     kvm_ioapic_state__bindgen_ty_1, kvm_irq_routing, kvm_irq_routing_entry,
     kvm_irq_routing_entry__bindgen_ty_1, kvm_irq_routing_msi__bindgen_ty_1, kvm_irqchip,
     kvm_irqchip__bindgen_ty_1, kvm_lapic_state, kvm_mp_state, kvm_msr_entry, kvm_msrs,
-    kvm_pit_channel_state, kvm_pit_state2, kvm_regs, kvm_segment, kvm_sregs, kvm_vcpu_events,
-    kvm_xcr, kvm_xcrs, kvm_xsave,
+    kvm_nested_state__bindgen_ty_1, kvm_pit_channel_state, kvm_pit_state2, kvm_regs, kvm_segment,
+    kvm_sregs, kvm_vcpu_events, kvm_xcr, kvm_xcrs, kvm_xsave,
 };
-use fam_wrappers::kvm_xsave2;
-use kvm_nested_state__bindgen_ty_1;
-use nested::{kvm_nested_state__data, KvmNestedStateBuffer};
+use super::fam_wrappers::kvm_xsave2;
+use super::nested::{KvmNestedStateBuffer, kvm_nested_state__data};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use zerocopy::{transmute, FromBytes, FromZeros, Immutable, IntoBytes};
+use zerocopy::{FromBytes, FromZeros, Immutable, IntoBytes, transmute};
 
 serde_impls!(
     kvm_regs,
@@ -152,7 +151,6 @@ unsafe impl IntoBytes for kvm_nested_state__data {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use bindings::*;
 
     fn is_serde<T: Serialize + for<'de> Deserialize<'de> + Default>() {
         let config = bincode::config::standard();
diff --git a/kvm-ioctls/CHANGELOG.md b/kvm-ioctls/CHANGELOG.md
@@ -8,6 +8,10 @@
 - [[#334]](https://github.com/rust-vmm/kvm/pull/334) Added support for
   `KVM_HAS_DEVICE_ATTR` and `KVM_SET_DEVICE_ATTR` vm ioctl on aarch64.
 
+## Changed
+
+- Rust edition 2024
+
 ## v0.23.0
 
 ### Added
diff --git a/kvm-ioctls/Cargo.toml b/kvm-ioctls/Cargo.toml
@@ -7,7 +7,8 @@ repository = "https://github.com/rust-vmm/kvm"
 readme = "README.md"
 keywords = ["kvm"]
 license = "Apache-2.0 OR MIT"
-edition = "2021"
+edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 libc = "0.2.39"
diff --git a/kvm-ioctls/src/ioctls/device.rs b/kvm-ioctls/src/ioctls/device.rs
@@ -164,7 +164,7 @@ impl DeviceFd {
     pub unsafe fn get_device_attr(&self, device_attr: &mut kvm_device_attr) -> Result<()> {
         // SAFETY: Caller has ensured device_attr.addr is safe to write to.
         // We are calling this function with a Device fd,  we trust the kernel.
-        let ret = ioctl_with_mut_ref(self, KVM_GET_DEVICE_ATTR(), device_attr);
+        let ret = unsafe { ioctl_with_mut_ref(self, KVM_GET_DEVICE_ATTR(), device_attr) };
         if ret != 0 {
             return Err(errno::Error::last());
         }
@@ -192,7 +192,8 @@ impl FromRawFd for DeviceFd {
     /// that relies on it being true.
     unsafe fn from_raw_fd(fd: RawFd) -> Self {
         DeviceFd {
-            fd: File::from_raw_fd(fd),
+            // SAFETY: we trust the kernel and verified parameters
+            fd: unsafe { File::from_raw_fd(fd) },
         }
     }
 }
@@ -202,13 +203,13 @@ mod tests {
     #![allow(clippy::undocumented_unsafe_blocks)]
     use super::*;
     use crate::ioctls::system::Kvm;
+    #[cfg(target_arch = "aarch64")]
+    use kvm_bindings::{KVM_DEV_VFIO_GROUP, KVM_DEV_VFIO_GROUP_ADD};
     #[cfg(target_arch = "x86_64")]
     use kvm_bindings::{
-        kvm_device_type_KVM_DEV_TYPE_ARM_VGIC_V3, kvm_device_type_KVM_DEV_TYPE_VFIO,
-        KVM_DEV_VFIO_GROUP, KVM_DEV_VFIO_GROUP_ADD,
+        KVM_DEV_VFIO_GROUP, KVM_DEV_VFIO_GROUP_ADD, kvm_device_type_KVM_DEV_TYPE_ARM_VGIC_V3,
+        kvm_device_type_KVM_DEV_TYPE_VFIO,
     };
-    #[cfg(target_arch = "aarch64")]
-    use kvm_bindings::{KVM_DEV_VFIO_GROUP, KVM_DEV_VFIO_GROUP_ADD};
 
     use kvm_bindings::KVM_CREATE_DEVICE_TEST;
 
@@ -260,7 +261,7 @@ mod tests {
     fn test_create_device() {
         use crate::ioctls::vm::{create_gic_device, request_gic_init, set_supported_nr_irqs};
         use kvm_bindings::{
-            kvm_device_type_KVM_DEV_TYPE_FSL_MPIC_20, KVM_DEV_ARM_VGIC_GRP_NR_IRQS,
+            KVM_DEV_ARM_VGIC_GRP_NR_IRQS, kvm_device_type_KVM_DEV_TYPE_FSL_MPIC_20,
         };
         use vmm_sys_util::errno::Error;
 
@@ -330,9 +331,9 @@ mod tests {
     fn test_create_device() {
         use crate::ioctls::vm::{create_aia_device, request_aia_init, set_supported_nr_irqs};
         use kvm_bindings::{
-            kvm_device_attr, kvm_device_type_KVM_DEV_TYPE_FSL_MPIC_20,
             KVM_DEV_RISCV_AIA_ADDR_APLIC, KVM_DEV_RISCV_AIA_CONFIG_SRCS,
-            KVM_DEV_RISCV_AIA_GRP_ADDR, KVM_DEV_RISCV_AIA_GRP_CONFIG,
+            KVM_DEV_RISCV_AIA_GRP_ADDR, KVM_DEV_RISCV_AIA_GRP_CONFIG, kvm_device_attr,
+            kvm_device_type_KVM_DEV_TYPE_FSL_MPIC_20,
         };
         use vmm_sys_util::errno::Error;
 
diff --git a/kvm-ioctls/src/ioctls/mod.rs b/kvm-ioctls/src/ioctls/mod.rs
@@ -7,10 +7,10 @@
 
 use std::mem::size_of;
 use std::os::unix::io::AsRawFd;
-use std::ptr::{null_mut, NonNull};
+use std::ptr::{NonNull, null_mut};
 
 use kvm_bindings::{
-    kvm_coalesced_mmio, kvm_coalesced_mmio_ring, kvm_run, KVM_COALESCED_MMIO_PAGE_OFFSET,
+    KVM_COALESCED_MMIO_PAGE_OFFSET, kvm_coalesced_mmio, kvm_coalesced_mmio_ring, kvm_run,
 };
 use vmm_sys_util::errno;
 
diff --git a/kvm-ioctls/src/ioctls/system.rs b/kvm-ioctls/src/ioctls/system.rs
diff --git a/kvm-ioctls/src/ioctls/vcpu.rs b/kvm-ioctls/src/ioctls/vcpu.rs
diff --git a/kvm-ioctls/src/ioctls/vm.rs b/kvm-ioctls/src/ioctls/vm.rs
diff --git a/kvm-ioctls/src/kvm_ioctls.rs b/kvm-ioctls/src/kvm_ioctls.rs
diff --git a/kvm-ioctls/src/lib.rs b/kvm-ioctls/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ impl<T> __IncompleteArrayField<T> {`
`22`	`22`	`}`
`23`	`23`	`#[inline]`
`24`	`24`	`pub unsafe fn as_slice(&self, len: usize) -> &[T] {`
`25`		`- ::std::slice::from_raw_parts(self.as_ptr(), len)`
	`25`	`+ unsafe { ::std::slice::from_raw_parts(self.as_ptr(), len) }`
`26`	`26`	`}`
`27`	`27`	`#[inline]`
`28`	`28`	`pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] {`
`29`		`- ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len)`
	`29`	`+ unsafe { ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len) }`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`impl<T> ::std::fmt::Debug for __IncompleteArrayField<T> {`