commit 893738e5702b1f065826d9a31cef2122a502da66
author Frederick Mayle <fmayle@google.com> Sun Oct 15 03:50:34 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Oct 15 03:50:51 2023 +0000
tree ab68e6b1e88f7d382dec6fe0626dee4652712a0c
parent a9d6acfab48a5f5befd902b7ea2071a309fb00e4

Revert "Upgrade zerocopy to 0.7.5"

Revert submission 2786927-fmayle-zerocopy-update

Reason for revert: broke build

Reverted changes: /q/submissionid:2786927-fmayle-zerocopy-update

Change-Id: I761aec0fd52826d0ee5fdadc5b99b3df474bd827

virtualizationservice/vfio_handler/src/aidl.rs

diff --git a/virtualizationservice/vfio_handler/src/aidl.rs b/virtualizationservice/vfio_handler/src/aidl.rs
index 618c165..1c3c5d9 100644
--- a/virtualizationservice/vfio_handler/src/aidl.rs
+++ b/virtualizationservice/vfio_handler/src/aidl.rs
@@ -26,7 +26,6 @@
 use rustutils::system_properties;
 use zerocopy::{
     byteorder::{BigEndian, U32},
-    FromZeroes,
     FromBytes,
 };
 
@@ -83,7 +82,7 @@
 /// The structure of DT table header in dtbo.img.
 /// https://source.android.com/docs/core/architecture/dto/partitions
 #[repr(C)]
-#[derive(Debug, FromZeroes, FromBytes)]
+#[derive(Debug, FromBytes)]
 struct DtTableHeader {
     /// DT_TABLE_MAGIC
     magic: U32<BigEndian>,
@@ -107,7 +106,7 @@
 /// The structure of each DT table entry (v0) in dtbo.img.
 /// https://source.android.com/docs/core/architecture/dto/partitions
 #[repr(C)]
-#[derive(Debug, FromZeroes, FromBytes)]
+#[derive(Debug, FromBytes)]
 struct DtTableEntry {
     /// size of each DT
     dt_size: U32<BigEndian>,