build: Bump zerocopy to 0.8.23

RuoqingHe · ShadowCurse · commit 52f9cf078ac8 · 2025-05-07T15:08:41.000+01:00
Signed-off-by: Ruoqing He &lt;heruoqing@iscas.ac.cn&gt;
diff --git a/kvm-bindings/CONTRIBUTING.md b/kvm-bindings/CONTRIBUTING.md
@@ -78,7 +78,7 @@ derive should be present:
 ```rs
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 ```
 
diff --git a/kvm-bindings/Cargo.toml b/kvm-bindings/Cargo.toml
@@ -22,7 +22,7 @@ serde = ["dep:serde", "serde/derive", "dep:zerocopy"]
 [dependencies]
 vmm-sys-util = { version = "0.12.1", optional = true }
 serde = { version = "1.0.0", optional = true, features = ["derive"] }
-zerocopy = { version = "0.7.32", optional = true, features = ["derive"] }
+zerocopy = { version = "0.8.23", optional = true, features = ["derive"] }
 
 [dev-dependencies]
 bincode = "1.3.3"
diff --git a/kvm-bindings/src/arm64/bindings.rs b/kvm-bindings/src/arm64/bindings.rs
@@ -866,7 +866,7 @@ pub type __poll_t = ::std::os::raw::c_uint;
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct user_pt_regs {
     pub regs: [__u64; 31usize],
@@ -889,7 +889,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct user_fpsimd_state {
     pub vregs: [__uint128_t; 32usize],
@@ -1057,7 +1057,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_regs {
     pub regs: user_pt_regs,
@@ -1081,7 +1081,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_vcpu_init {
     pub target: __u32,
@@ -3042,7 +3042,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_mp_state {
     pub mp_state: __u32,
@@ -3500,7 +3500,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_one_reg {
     pub id: __u64,
diff --git a/kvm-bindings/src/arm64/serialize.rs b/kvm-bindings/src/arm64/serialize.rs
@@ -2,7 +2,7 @@ use bindings::{
     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, AsBytes};
+use zerocopy::{transmute, IntoBytes};
 
 serde_impls! {
     user_pt_regs,
@@ -36,12 +36,12 @@ mod tests {
         //
         // #[cfg_attr(
         //     feature = "serde",
-        //     derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+        //     derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
         // )]
         //
         // to all structures causing compilation errors (we need the zerocopy traits, as the
         // `Serialize` and `Deserialize` implementations are provided by the `serde_impls!` macro
-        // above, which implements serialization based on zerocopy's `FromBytes` and `AsBytes`
+        // above, which implements serialization based on zerocopy's `FromBytes` and `IntoBytes`
         // traits that it expects to be derived).
         //
         // NOTE: This only include "top-level" items, and does not list out bindgen-anonymous types
diff --git a/kvm-bindings/src/riscv64/bindings.rs b/kvm-bindings/src/riscv64/bindings.rs
@@ -596,7 +596,7 @@ pub type __poll_t = ::std::os::raw::c_uint;
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct user_regs_struct {
     pub pc: ::std::os::raw::c_ulong,
@@ -950,7 +950,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_riscv_config {
     pub isa: ::std::os::raw::c_ulong,
@@ -984,7 +984,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_riscv_core {
     pub regs: user_regs_struct,
@@ -1003,7 +1003,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_riscv_csr {
     pub sstatus: ::std::os::raw::c_ulong,
@@ -1045,7 +1045,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_riscv_aia_csr {
     pub siselect: ::std::os::raw::c_ulong,
@@ -1079,7 +1079,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_riscv_smstateen_csr {
     pub sstateen0: ::std::os::raw::c_ulong,
@@ -1096,7 +1096,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_riscv_timer {
     pub frequency: __u64,
@@ -1190,7 +1190,7 @@ pub type KVM_RISCV_SBI_EXT_ID = ::std::os::raw::c_uint;
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_riscv_sbi_sta {
     pub shmem_lo: ::std::os::raw::c_ulong,
@@ -2922,7 +2922,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_mp_state {
     pub mp_state: __u32,
@@ -3380,7 +3380,7 @@ const _: () = {
 #[derive(Debug, Default, Copy, Clone, PartialEq)]
 #[cfg_attr(
     feature = "serde",
-    derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+    derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
 )]
 pub struct kvm_one_reg {
     pub id: __u64,
diff --git a/kvm-bindings/src/riscv64/serialize.rs b/kvm-bindings/src/riscv64/serialize.rs
@@ -7,7 +7,7 @@ use bindings::{
     kvm_riscv_sbi_sta, kvm_riscv_smstateen_csr, kvm_riscv_timer, user_regs_struct,
 };
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use zerocopy::{transmute, AsBytes};
+use zerocopy::{transmute, IntoBytes};
 
 serde_impls! {
     kvm_mp_state,
@@ -45,12 +45,12 @@ mod tests {
         //
         // #[cfg_attr(
         //     feature = "serde",
-        //     derive(zerocopy::AsBytes, zerocopy::FromBytes, zerocopy::FromZeroes)
+        //     derive(zerocopy::IntoBytes, zerocopy::Immutable, zerocopy::FromBytes)
         // )]
         //
         // to all structures causing compilation errors (we need the zerocopy traits, as the
         // `Serialize` and `Deserialize` implementations are provided by the `serde_impls!` macro
-        // above, which implements serialization based on zerocopy's `FromBytes` and `AsBytes`
+        // above, which implements serialization based on zerocopy's `FromBytes` and `IntoBytes`
         // traits that it expects to be derived).
         //
         // NOTE: This only include "top-level" items, and does not list out bindgen-anonymous types
diff --git a/kvm-bindings/src/serialize.rs b/kvm-bindings/src/serialize.rs
@@ -3,7 +3,7 @@
 //! Module containing serialization utilities
 
 /// Macro that generates serde::Serialize and serde::Deserialize implementations for the given types.
-/// This macro assumes that the types implement zerocopy::FromBytes and zerocopy::AsBytes, and uses
+/// This macro assumes that the types implement zerocopy::FromBytes and zerocopy::IntoBytes, and uses
 /// these implementations to serialize as opaque byte arrays. During deserialization, it will
 /// try to deserialize as a `Vec`. If this deserialized `Vec` has a length that equals `size_of::<T>`,
 /// it will transmute to `T` (using zerocopy), otherwise the `Vec` will either be zero-padded, or truncated.
diff --git a/kvm-bindings/src/x86_64/bindings.rs b/kvm-bindings/src/x86_64/bindings.rs
diff --git a/kvm-bindings/src/x86_64/fam_wrappers.rs b/kvm-bindings/src/x86_64/fam_wrappers.rs
diff --git a/kvm-bindings/src/x86_64/serialize.rs b/kvm-bindings/src/x86_64/serialize.rs
