feat: upgrade kvm-bindings to Rust edition 2024

SteelCrab · SteelCrab · commit ab102b3fbcf2 · 2025-06-19T03:01:11.000+09:00
This commit upgrades kvm-bindings from the default Rust edition 2015 to edition 2024, addressing the need for explicit unsafe blocks and proper module path resolution. Changes: - Add \`edition = \"2024\"\` to kvm-bindings/Cargo.toml - Wrap unsafe function calls in explicit unsafe blocks in bindings.rs - from_raw_parts, from_raw_parts_mut, transmute calls - Fix import paths in fam_wrappers.rs and nested.rs: - \`use x86_64::bindings::*\` → \`use crate::x86_64::bindings::*\` - Add explicit \`crate::\` prefix for module imports - Remove \`extern crate core;\` (automatic in edition 2024) All tests pass with no warnings. Fixes #329 Signed-off-by: SteelCrab <pyh5523@gmail.com>
diff --git a/kvm-bindings/Cargo.toml b/kvm-bindings/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kvm-bindings"
 version = "0.12.0"
+edition = "2024"
 authors = ["Amazon firecracker team <firecracker-devel@amazon.com>"]
 description = "Rust FFI bindings to KVM generated using bindgen."
 repository = "https://github.com/rust-vmm/kvm"
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 crate::arm64::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/lib.rs b/kvm-bindings/src/lib.rs
@@ -18,8 +18,6 @@ extern crate serde;
 #[cfg(feature = "serde")]
 extern crate zerocopy;
 
-extern crate core;
-
 #[cfg(feature = "serde")]
 #[macro_use]
 mod serialize;
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 crate::riscv64::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,7 +2,7 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use bindings::{
+use crate::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,
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> {
@@ -3408,7 +3408,7 @@ impl ::std::fmt::Debug for kvm_irq_level {
 #[derive(Copy, Clone)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable)
 )]
 pub struct kvm_irqchip {
     pub chip_id: __u32,
@@ -3417,7 +3417,7 @@ pub struct kvm_irqchip {
 }
 #[repr(C)]
 #[derive(Copy, Clone)]
-#[cfg_attr(feature = "serde", derive(zerocopy::TryFromBytes))]
+#[cfg_attr(feature = "serde", derive(zerocopy::TryFromBytes, zerocopy::FromBytes))]
 pub union kvm_irqchip__bindgen_ty_1 {
     pub dummy: [::std::os::raw::c_char; 512usize],
     pub pic: kvm_pic_state,
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 crate::x86_64::bindings::*;
 
 /// Maximum number of CPUID entries that can be returned by a call to KVM ioctls.
 ///
@@ -202,7 +202,7 @@ mod tests {
     use crate::KvmIrqRouting;
 
     use super::{CpuId, MsrList, Msrs, Xsave};
-    use x86_64::bindings::kvm_cpuid_entry2;
+    use crate::x86_64::bindings::kvm_cpuid_entry2;
 
     use vmm_sys_util::fam::FamStruct;
 
diff --git a/kvm-bindings/src/x86_64/nested.rs b/kvm-bindings/src/x86_64/nested.rs
@@ -5,8 +5,8 @@
 //! state save/resume. See [`KvmNestedStateBuffer`].
 
 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_SVM_VMCB_SIZE;
+use crate::{kvm_nested_state__bindgen_ty_1, KVM_STATE_NESTED_VMX_VMCS_SIZE};
 
 /// 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
@@ -9,9 +9,9 @@ use bindings::{
     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 crate::fam_wrappers::kvm_xsave2;
+use crate::kvm_nested_state__bindgen_ty_1;
+use crate::nested::{kvm_nested_state__data, KvmNestedStateBuffer};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use zerocopy::{transmute, FromBytes, FromZeros, Immutable, IntoBytes};
 
@@ -152,7 +152,7 @@ unsafe impl IntoBytes for kvm_nested_state__data {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use bindings::*;
+    use crate::bindings::*;
 
     fn is_serde<T: Serialize + for<'de> Deserialize<'de> + Default>() {
         let config = bincode::config::standard();
diff --git a/kvm-ioctls/Cargo.toml b/kvm-ioctls/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/rust-vmm/kvm"
 readme = "README.md"
 keywords = ["kvm"]
 license = "Apache-2.0 OR MIT"
-edition = "2021"
+edition = "2024"
 
 [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,7 @@ 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),
+            fd: unsafe {File::from_raw_fd(fd)},
         }
     }
 }
diff --git a/kvm-ioctls/src/ioctls/system.rs b/kvm-ioctls/src/ioctls/system.rs
@@ -680,7 +680,7 @@ impl Kvm {
     /// ```
     pub unsafe fn create_vmfd_from_rawfd(&self, fd: RawFd) -> Result<VmFd> {
         let run_mmap_size = self.get_vcpu_mmap_size()?;
-        Ok(new_vmfd(File::from_raw_fd(fd), run_mmap_size))
+        Ok(new_vmfd(unsafe {File::from_raw_fd(fd)}, run_mmap_size))
     }
 }
 
@@ -720,7 +720,7 @@ impl FromRawFd for Kvm {
     /// ```
     unsafe fn from_raw_fd(fd: RawFd) -> Self {
         Kvm {
-            kvm: File::from_raw_fd(fd),
+            kvm: unsafe {File::from_raw_fd(fd)},
         }
     }
 }
diff --git a/kvm-ioctls/src/ioctls/vcpu.rs b/kvm-ioctls/src/ioctls/vcpu.rs
@@ -1024,7 +1024,7 @@ impl VcpuFd {
     /// ```
     #[cfg(target_arch = "x86_64")]
     pub unsafe fn set_xsave2(&self, xsave: &Xsave) -> Result<()> {
-        self.set_xsave(&xsave.as_fam_struct_ref().xsave)
+        unsafe {self.set_xsave(&xsave.as_fam_struct_ref().xsave)}
     }
 
     /// X86 specific call that returns the vcpu's current "xcrs".
diff --git a/kvm-ioctls/src/ioctls/vm.rs b/kvm-ioctls/src/ioctls/vm.rs
@@ -107,7 +107,7 @@ impl VmFd {
         &self,
         user_memory_region: kvm_userspace_memory_region,
     ) -> Result<()> {
-        let ret = ioctl_with_ref(self, KVM_SET_USER_MEMORY_REGION(), &user_memory_region);
+        let ret = unsafe {ioctl_with_ref(self, KVM_SET_USER_MEMORY_REGION(), &user_memory_region)};
         if ret == 0 {
             Ok(())
         } else {
@@ -193,7 +193,7 @@ impl VmFd {
         &self,
         user_memory_region2: kvm_userspace_memory_region2,
     ) -> Result<()> {
-        let ret = ioctl_with_ref(self, KVM_SET_USER_MEMORY_REGION2(), &user_memory_region2);
+        let ret = unsafe {ioctl_with_ref(self, KVM_SET_USER_MEMORY_REGION2(), &user_memory_region2)};
         if ret == 0 {
             Ok(())
         } else {
@@ -692,8 +692,8 @@ impl VmFd {
             datamatch: datamatch.into(),
             len: std::mem::size_of::<T>() as u32,
             addr: match addr {
-                IoEventAddress::Pio(ref p) => *p,
-                IoEventAddress::Mmio(ref m) => *m,
+                IoEventAddress::Pio(p) => *p,
+                IoEventAddress::Mmio(m) => *m,
             },
             fd: fd.as_raw_fd(),
             flags,
@@ -768,8 +768,8 @@ impl VmFd {
             datamatch: datamatch.into(),
             len: std::mem::size_of::<T>() as u32,
             addr: match addr {
-                IoEventAddress::Pio(ref p) => *p,
-                IoEventAddress::Mmio(ref m) => *m,
+                IoEventAddress::Pio(p) => *p,
+                IoEventAddress::Mmio(m) => *m,
             },
             fd: fd.as_raw_fd(),
             flags,
@@ -1243,7 +1243,7 @@ impl VmFd {
     /// let vcpu = unsafe { vm.create_vcpu_from_rawfd(rawfd).unwrap() };
     /// ```
     pub unsafe fn create_vcpu_from_rawfd(&self, fd: RawFd) -> Result<VcpuFd> {
-        let vcpu = File::from_raw_fd(fd);
+        let vcpu = unsafe {File::from_raw_fd(fd)};
         let kvm_run_ptr = KvmRunWrapper::mmap_from_fd(&vcpu, self.run_size)?;
         Ok(new_vcpu(vcpu, kvm_run_ptr))
     }
@@ -1648,7 +1648,7 @@ impl VmFd {
     /// ```
     #[cfg(target_arch = "x86_64")]
     pub unsafe fn encrypt_op<T>(&self, op: *mut T) -> Result<()> {
-        let ret = ioctl_with_mut_ptr(self, KVM_MEMORY_ENCRYPT_OP(), op);
+        let ret = unsafe {ioctl_with_mut_ptr(self, KVM_MEMORY_ENCRYPT_OP(), op)};
         if ret == 0 {
             Ok(())
         } else {

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> {`
Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,11 @@ impl<T> __IncompleteArrayField<T> {`
`106`	`106`	`}`
`107`	`107`	`#[inline]`
`108`	`108`	`pub unsafe fn as_slice(&self, len: usize) -> &[T] {`
`109`		`- ::std::slice::from_raw_parts(self.as_ptr(), len)`
	`109`	`+ unsafe {::std::slice::from_raw_parts(self.as_ptr(), len)}`
`110`	`110`	`}`
`111`	`111`	`#[inline]`
`112`	`112`	`pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] {`
`113`		`- ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len)`
	`113`	`+ unsafe {::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len)}`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`impl<T> ::std::fmt::Debug for __IncompleteArrayField<T> {`
`@@ -127,11 +127,11 @@ impl<T> __BindgenUnionField<T> {`
`127`	`127`	`}`
`128`	`128`	`#[inline]`
`129`	`129`	`pub unsafe fn as_ref(&self) -> &T {`
`130`		`- ::std::mem::transmute(self)`
	`130`	`+ unsafe {::std::mem::transmute(self)}`
`131`	`131`	`}`
`132`	`132`	`#[inline]`
`133`	`133`	`pub unsafe fn as_mut(&mut self) -> &mut T {`
`134`		`- ::std::mem::transmute(self)`
	`134`	`+ unsafe {::std::mem::transmute(self)}`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`impl<T> ::std::default::Default for __BindgenUnionField<T> {`
`@@ -3408,7 +3408,7 @@ impl ::std::fmt::Debug for kvm_irq_level {`
`3408`	`3408`	`#[derive(Copy, Clone)]`
`3409`	`3409`	`#[cfg_attr(`
`3410`	`3410`	`feature = "serde",`
`3411`		`- derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)`
	`3411`	`+ derive(zerocopy::IntoBytes, zerocopy::Immutable)`
`3412`	`3412`	`)]`
`3413`	`3413`	`pub struct kvm_irqchip {`
`3414`	`3414`	`pub chip_id: __u32,`
`@@ -3417,7 +3417,7 @@ pub struct kvm_irqchip {`
`3417`	`3417`	`}`
`3418`	`3418`	`#[repr(C)]`
`3419`	`3419`	`#[derive(Copy, Clone)]`
`3420`		`-#[cfg_attr(feature = "serde", derive(zerocopy::TryFromBytes))]`
	`3420`	`+#[cfg_attr(feature = "serde", derive(zerocopy::TryFromBytes, zerocopy::FromBytes))]`
`3421`	`3421`	`pub union kvm_irqchip__bindgen_ty_1 {`
`3422`	`3422`	`pub dummy: [::std::os::raw::c_char; 512usize],`
`3423`	`3423`	`pub pic: kvm_pic_state,`